From b1ebf8562a9628a9948ca5be25d04df9899405a1 Mon Sep 17 00:00:00 2001 From: blitzmann Date: Thu, 24 Sep 2015 12:27:29 -0400 Subject: [PATCH] Incorporate icon zipfile making into dist script --- scripts/dist.py | 11 ++++++++++- setup.py | 5 ++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/scripts/dist.py b/scripts/dist.py index 45ed7e4a0..237e4f5e9 100755 --- a/scripts/dist.py +++ b/scripts/dist.py @@ -184,11 +184,20 @@ if __name__ == "__main__": zipdir(dir, library) library.write('pyfa.py', 'pyfa__main__.py') library.write('config.py') + os.chdir(oldcwd) for dir in setup.include_files: copyanything(dir, os.path.join(base, dir)) - os.chdir(oldcwd) + # @todo: this is in win-wx3 for now, but it will have to be migrated to OS X release when wx3 is merged into master. This must be tested + imagesFile = os.path.join(base, "imgs.zip") + + with zipfile.ZipFile(imagesFile, 'w') as images: + oldcwd = os.getcwd() + os.chdir(source) + for dir in setup.icon_dirs: + zipdir(dir, images) + os.chdir(oldcwd) if options.zip: archive = zipfile.ZipFile(tmpFile, 'w', compression=zipfile.ZIP_DEFLATED) diff --git a/setup.py b/setup.py index cd2fa528b..240e688dd 100644 --- a/setup.py +++ b/setup.py @@ -6,7 +6,10 @@ Windows executable + installer: python setup.py bdist_msi """ packages = ['eos', 'gui', 'service', 'utils'] -include_files = ['icons', 'staticdata', 'gpl.txt'] +include_files = ['staticdata', 'gpl.txt'] +# this is read by dist.py to package the icons +icon_dirs = ['gui', 'icons', 'renders'] + includes = [] # collection.abc due to bug: # https://bitbucket.org/anthony_tuininga/cx_freeze/issues/127/collectionssys-error