From 77e89a9df15ea76d02e728781ea64f4058352627 Mon Sep 17 00:00:00 2001 From: Athanasius <github@miggy.org> Date: Fri, 17 Dec 2021 12:00:49 +0000 Subject: [PATCH] setup.py: Properly include FDevIDs files I have my doubts about the darwin section, but we never package for it any more, so I'm not going to worry about it now. --- setup.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/setup.py b/setup.py index 4a9ed68d..f73dc370 100755 --- a/setup.py +++ b/setup.py @@ -146,12 +146,14 @@ if sys.platform == 'darwin': 'resources': [ '.gitversion', # Contains git short hash 'ChangeLog.md', - join('FDevIDs', 'commodity.csv'), - join('FDevIDs', 'rare_commodity.csv'), 'snd_good.wav', 'snd_bad.wav', 'modules.p', 'ships.p', + ('FDevIDs', [ + join('FDevIDs', 'commodity.csv'), + join('FDevIDs', 'rare_commodity.csv'), + ]), ], 'site_packages': False, 'plist': { @@ -215,8 +217,6 @@ elif sys.platform == 'win32': 'WinSparkle.pdb', # For debugging - don't include in package 'EUROCAPS.TTF', 'ChangeLog.md', - join('FDevIDs', 'commodity.csv'), - join('FDevIDs', 'rare_commodity.csv'), 'snd_good.wav', 'snd_bad.wav', 'modules.p', @@ -228,6 +228,10 @@ elif sys.platform == 'win32': 'EDMarketConnector - reset-ui.bat', ]), ('L10n', [join('L10n', x) for x in os.listdir('L10n') if x.endswith('.strings')]), + ('FDevIDs', [ + join('FDevIDs', 'commodity.csv'), + join('FDevIDs', 'rare_commodity.csv'), + ]), ('plugins', PLUGINS), ]