From 9d814bf6538abfdd1e32d3b7dc83c849dfc45c7e Mon Sep 17 00:00:00 2001 From: Andrew Chin Date: Sun, 19 Feb 2012 18:06:43 -0500 Subject: [PATCH] Pack up js_src to fix issue with .exe builds --- overviewer_core/assetmanager.py | 2 ++ setup.py | 1 + 2 files changed, 3 insertions(+) diff --git a/overviewer_core/assetmanager.py b/overviewer_core/assetmanager.py index 7b231c3..5d60cae 100644 --- a/overviewer_core/assetmanager.py +++ b/overviewer_core/assetmanager.py @@ -141,6 +141,8 @@ directory. # create overviewer.js from the source js files js_src = os.path.join(util.get_program_path(), "overviewer_core", "data", "js_src") + if not os.path.isdir(js_src): + js_src = os.path.join(util.get_program_path(), "js_src") with open(os.path.join(self.outputdir, "overviewer.js"), "w") as fout: # first copy in js_src/overviewer.js with open(os.path.join(js_src, "overviewer.js")) as f: diff --git a/setup.py b/setup.py index c1743ab..e571fa9 100755 --- a/setup.py +++ b/setup.py @@ -100,6 +100,7 @@ if py2exe is not None: setup_kwargs['data_files'] = [('', doc_files)] setup_kwargs['data_files'] += recursive_data_files('overviewer_core/data/textures', 'textures') setup_kwargs['data_files'] += recursive_data_files('overviewer_core/data/web_assets', 'web_assets') + setup_kwargs['data_files'] += recursive_data_files('overviewer_core/data/js_src', 'js_src') setup_kwargs['data_files'] += recursive_data_files('contrib', 'contrib') setup_kwargs['zipfile'] = None if platform.system() == 'Windows' and '64bit' in platform.architecture():