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

deploy-ng: Add use_console option to Application

Browse Source 
This option only affects deploying to Windows. If set to False (the default),
deploy-stubw is used. If True, deploy-stub is used.

NOTE: This is mostly untested. The only check was that it didn't break
when deploying to Linux.
This commit is contained in:
Mitchell Stokes 2017-01-05 20:24:56 -08:00
parent 2fa4ef1c7e
commit 061a2745f9
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,7 +14,11 @@ from direct.showutil import FreezeTool
import panda3d.core as p3d import panda3d.core as p3d
Application = collections.namedtuple('Application', 'scriptname runtimename') class Application(object):
def __init__(self, scriptname, runtimename, use_console=False):
self.scriptname = scriptname
self.runtimename = runtimename
self.use_console = use_console
class Distribution(distutils.dist.Distribution): class Distribution(distutils.dist.Distribution):
@ -85,21 +89,10 @@ class build(distutils.command.build.build):
raise RuntimeError("Missing panda3d wheel") raise RuntimeError("Missing panda3d wheel")
whlfiles = {whl: zipfile.ZipFile(whl) for whl in wheelpaths} whlfiles = {whl: zipfile.ZipFile(whl) for whl in wheelpaths}
stub_path = 'panda3d_tools/deploy-stub'
if platform.startswith('win'):
stub_path += '.exe'
stub_file = p3dwhl.open(stub_path)
# Add whl files to the path so they are picked up by modulefinder # Add whl files to the path so they are picked up by modulefinder
for whl in wheelpaths: for whl in wheelpaths:
sys.path.insert(0, whl) sys.path.insert(0, whl)
else:
dtool_path = p3d.Filename(p3d.ExecutionEnvironment.get_dtool_name()).to_os_specific()
stub_path = os.path.join(os.path.dirname(dtool_path), '..', 'bin', 'deploy-stub')
if platform.startswith('win'):
stub_path += '.exe'
stub_file = open(stub_path, 'rb')
# Create runtime # Create runtime
freezer_extras = set() freezer_extras = set()
@ -110,6 +103,20 @@ class build(distutils.command.build.build):
for exmod in self.distribution.exclude_modules: for exmod in self.distribution.exclude_modules:
freezer.excludeModule(exmod) freezer.excludeModule(exmod)
freezer.done(addStartupModules=True) freezer.done(addStartupModules=True)
stub_name = 'deploy-stub'
if platform.startswith('win'):
if not app.use_console:
stub_name = 'deploy-stubw'
stub_name += '.exe'
if use_wheels:
stub_file = p3dwhl.open('panda3d_tools/{}'.format(stub_name))
else:
dtool_path = p3d.Filename(p3d.ExecutionEnvironment.get_dtool_name()).to_os_specific()
stub_path = os.path.join(os.path.dirname(dtool_path), '..', 'bin', stub_name)
stub_file = open(stub_path, 'rb')
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()