TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-30 16:58:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

deploy-ng: Add --skip-build and --dist-dir options to bdist_apps

Browse Source 
dist-dir defaults to 'dist' like sdist and bdist_wheel, which makes
bdist_apps more consistent with the rest of the Python ecosystem.
This commit is contained in:
Mitchell Stokes 2018-12-22 14:13:40 -08:00
parent ec3c2ad25a
commit 88fc3d4ca3
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
direct/src/dist/commands.py vendored
View File

@ -226,7 +226,7 @@ class build_apps(setuptools.Command):
self.default_prc_dir = None self.default_prc_dir = None
self.log_filename = None self.log_filename = None
self.log_append = False self.log_append = False
self.requirements_path = './requirements.txt' self.requirements_path = os.path.join(os.getcwd(), 'requirements.txt')
self.use_optimized_wheels = True self.use_optimized_wheels = True
self.optimized_wheel_index = '' self.optimized_wheel_index = ''
self.pypi_extra_indexes = [] self.pypi_extra_indexes = []
@ -1149,6 +1149,8 @@ class bdist_apps(setuptools.Command):
description = 'bundle built Panda3D applications into distributable forms' description = 'bundle built Panda3D applications into distributable forms'
user_options = build_apps.user_options + [ user_options = build_apps.user_options + [
('dist-dir=', 'd', 'directory to put final built distributions in'),
('skip-build', None, 'skip rebuilding everything (for testing/debugging)'),
] ]
def _build_apps_options(self): def _build_apps_options(self):
@ -1156,6 +1158,8 @@ class bdist_apps(setuptools.Command):
def initialize_options(self): def initialize_options(self):
self.installers = {} self.installers = {}
self.dist_dir = os.path.join(os.getcwd(), 'dist')
self.skip_build = False
for opt in self._build_apps_options(): for opt in self._build_apps_options():
setattr(self, opt, None) setattr(self, opt, None)
@ -1310,11 +1314,13 @@ class bdist_apps(setuptools.Command):
if optval is not None: if optval is not None:
setattr(build_cmd, opt, optval) setattr(build_cmd, opt, optval)
build_cmd.finalize_options() build_cmd.finalize_options()
self.run_command('build_apps') if not self.skip_build:
self.run_command('build_apps')
platforms = build_cmd.platforms platforms = build_cmd.platforms
build_base = build_cmd.build_base build_base = build_cmd.build_base
os.chdir(build_base) os.makedirs(self.dist_dir, exist_ok=True)
os.chdir(self.dist_dir)
for platform in platforms: for platform in platforms:
build_dir = os.path.join(build_base, platform) build_dir = os.path.join(build_base, platform)