TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-03 10:22:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

deploy-ng: Stop using freezer outside the scope of its for loop

Browse Source
This commit is contained in:
Mitchell Stokes 2017-01-05 18:38:35 -08:00
parent d6aba43492
commit fcbc71c91b
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
direct/src/showutil/dist.py
View File

@ -97,6 +97,8 @@ class build(distutils.command.build.build):
# Create runtime # Create runtime
freezer_extras = set()
freezer_modules = set()
for app in self.distribution.applications: for app in self.distribution.applications:
freezer = FreezeTool.Freezer() freezer = FreezeTool.Freezer()
freezer.addModule('__main__', filename=app.scriptname) freezer.addModule('__main__', filename=app.scriptname)
@ -106,8 +108,11 @@ class build(distutils.command.build.build):
freezer.generateRuntimeFromStub(os.path.join(builddir, app.runtimename), stub_file) freezer.generateRuntimeFromStub(os.path.join(builddir, app.runtimename), stub_file)
stub_file.close() stub_file.close()
freezer_extras.update(freezer.extras)
freezer_modules.update(freezer.getAllModuleNames())
# Copy extension modules # Copy extension modules
for module, source_path in freezer.extras: for module, source_path in freezer_extras:
if source_path is None: if source_path is None:
# Built-in module. # Built-in module.
continue continue
@ -165,7 +170,7 @@ class build(distutils.command.build.build):
# Copy Game Files # Copy Game Files
ignore_copy_list = [ ignore_copy_list = [
'__pycache__', '__pycache__',
] + freezer.getAllModuleNames() + self.distribution.exclude_paths + [i.scriptname for i in self.distribution.applications] ] + list(freezer_modules) + self.distribution.exclude_paths + [i.scriptname for i in self.distribution.applications]
for copydir in self.distribution.directories: for copydir in self.distribution.directories:
for item in os.listdir(copydir): for item in os.listdir(copydir):