RomanNum3ral
/
open_toontown_panda3d
mirror of https://github.com/open-toontown/panda3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

deploy-ng: Support copying panda3d files from wheels instead of the current environment 

Note: Extension modules are still coming from the current environment.
We'll need to sort this out before we get true cross-platform building.

Also, we need a proper interface for specifying platforms/wheels. At the
moment, a wheels parameter is supplied to setup() and platforms are
determined based on the wheels in this list.
This commit is contained in:
Mitchell Stokes 2017-01-02 19:19:00 -08:00
parent 6251a1cfc7
commit 5af7136aa2
2 changed files with 65 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
direct/src/showutil/FreezeTool.py
View File

@ -1545,7 +1545,7 @@ class Freezer:
return target
def generateRuntimeFromStub(self, basename):
def generateRuntimeFromStub(self, basename, stub_file):
def make_module_list_entry(code, offset, modulename, module):
size = len(code)
if getattr(module, "__path__", None):
@ -1610,15 +1610,8 @@ class Freezer:
codeOffset += len(code)
# Build from pre-built binary stub
dtool_path = Filename(ExecutionEnvironment.get_dtool_name()).to_os_specific()
stub_path = os.path.join(os.path.dirname(dtool_path), '..', 'bin', 'deploy-stub')
if sys.platform in ('win32', 'cygwin'):
stub_path += '.exe'
with open(stub_path, 'rb') as f:
stubbin = f.read()
with open(target, 'wb') as f:
f.write(stubbin)
f.write(stub_file.read())
listoffset = f.tell()
for mod in moduleList:
f.write(mod)

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

@ -1,6 +1,7 @@
import collections
import os
import sys
import zipfile
import distutils.command.build
import distutils.core
@ -22,21 +23,54 @@ class Distribution(distutils.dist.Distribution):
self.files = []
self.exclude_paths = []
self.exclude_modules = []
self.wheels = []
distutils.dist.Distribution.__init__(self, attrs)
# TODO replace with Packager
def find_packages(whlfile):
if whlfile is None:
dtool_fn = p3d.Filename(p3d.ExecutionEnvironment.get_dtool_name())
libdir = os.path.dirname(dtool_fn.to_os_specific())
filelist = [os.path.join(libdir, i) for i in os.listdir(libdir)]
else:
filelist = whlfile.namelist()
return [i for i in filelist if '.so.' in i or i.endswith('.dll') or i.endswith('.dylib') or 'libpandagl' in i]
class build(distutils.command.build.build):
def run(self):
distutils.command.build.build.run(self)
platforms = [p3d.PandaSystem.get_platform()]
if not self.distribution.wheels:
platforms = {p3d.PandaSystem.get_platform(): None}
else:
platforms = {
whl.split('-')[-1].replace('.whl', ''): whl
for whl in self.distribution.wheels
}
for platform in platforms:
for platform, whl in platforms.items():
builddir = os.path.join(self.build_base, platform)
if os.path.exists(builddir):
distutils.dir_util.remove_tree(builddir)
distutils.dir_util.mkpath(builddir)
if whl is not None:
whlfile = zipfile.ZipFile(whl)
stub_path = 'panda3d_tools/deploy-stub'
if platform.startswith('win'):
stub_path += '.exe'
stub_file = whlfile.open(stub_path)
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
for app in self.distribution.applications:
freezer = FreezeTool.Freezer()
@ -44,7 +78,8 @@ class build(distutils.command.build.build):
for exmod in self.distribution.exclude_modules:
freezer.excludeModule(exmod)
freezer.done(addStartupModules=True)
freezer.generateRuntimeFromStub(os.path.join(builddir, app.runtimename))
freezer.generateRuntimeFromStub(os.path.join(builddir, app.runtimename), stub_file)
stub_file.close()
# Copy extension modules
for module, source_path in freezer.extras:
@ -63,21 +98,34 @@ class build(distutils.command.build.build):
target_path = os.path.join(builddir, basename)
distutils.file_util.copy_file(source_path, target_path)
# Copy Panda3D libs
dtool_fn = p3d.Filename(p3d.ExecutionEnvironment.get_dtool_name())
libdir = os.path.dirname(dtool_fn.to_os_specific())
# Find Panda3D libs
libs = find_packages(whlfile if whl is not None else None)
for item in os.listdir(libdir):
if '.so.' in item or item.endswith('.dll') or item.endswith('.dylib') or 'libpandagl' in item:
source_path = os.path.join(libdir, item)
target_path = os.path.join(builddir, item)
# Copy Panda3D files
etcdir = os.path.join(builddir, 'etc')
if whl is None:
# Libs
for lib in libs:
target_path = os.path.join(builddir, os.path.basename(lib))
if not os.path.islink(source_path):
distutils.file_util.copy_file(source_path, target_path)
distutils.file_util.copy_file(lib, target_path)
# Copy etc
src = os.path.join(libdir, '..', 'etc')
dst = os.path.join(builddir, 'etc')
distutils.dir_util.copy_tree(src, dst)
# etc
dtool_fn = p3d.Filename(p3d.ExecutionEnvironment.get_dtool_name())
libdir = os.path.dirname(dtool_fn.to_os_specific())
src = os.path.join(libdir, '..', 'etc')
distutils.dir_util.copy_tree(src, etcdir)
else:
distutils.dir_util.mkpath(etcdir)
# Combine prc files with libs and copy the whole list
panda_files = libs + [i for i in whlfile.namelist() if i.endswith('.prc')]
for pf in panda_files:
dstdir = etcdir if pf.endswith('.prc') else builddir
target_path = os.path.join(dstdir, os.path.basename(pf))
print("copying {} -> {}".format(os.path.join(whl, pf), target_path))
with open(target_path, 'wb') as f:
f.write(whlfile.read(pf))
# Copy Game Files
ignore_copy_list = [