From 09eb22b61e5ebed508a874eb90f19fef5df35261 Mon Sep 17 00:00:00 2001 From: Mitchell Stokes Date: Thu, 6 Jul 2017 19:33:16 -0700 Subject: [PATCH] deploy-ng: Add plugins option to specify which plugins to copy NOTE: pandagl is no longer automatically copied and a graphics plugin must be specified. TODO: Per-platform overrides --- direct/src/showutil/dist.py | 5 ++++- samples/asteroids/setup.py | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/direct/src/showutil/dist.py b/direct/src/showutil/dist.py index a6c6742dae..a2c9e869de 100644 --- a/direct/src/showutil/dist.py +++ b/direct/src/showutil/dist.py @@ -34,6 +34,7 @@ class build_apps(distutils.core.Command): self.include_modules = {} self.exclude_modules = {} self.deploy_platforms = [] + self.plugins = [] self.requirements_path = './requirements.txt' self.pypi_extra_indexes = [] self.build_scripts= { @@ -186,8 +187,10 @@ class build_apps(distutils.core.Command): freezer_extras.add((mod, None)) #FIXME: this is a temporary hack to pick up libpandagl. + plugin_list = ['panda3d/lib{}'.format(i) for i in self.plugins] for lib in p3dwhl.namelist(): - if lib.startswith('panda3d/libpandagl.'): + plugname = os.path.splitext(lib)[0] + if plugname in plugin_list: source_path = os.path.join(p3dwhlfn, lib) target_path = os.path.join(builddir, os.path.basename(lib)) search_path = [os.path.dirname(source_path)] diff --git a/samples/asteroids/setup.py b/samples/asteroids/setup.py index 7ee64d2b0b..973f12b381 100644 --- a/samples/asteroids/setup.py +++ b/samples/asteroids/setup.py @@ -9,6 +9,9 @@ setup( 'gui_apps': { 'asteroids': 'main.py', }, + 'plugins': [ + 'pandagl', + ], 'deploy_platforms': [ 'manylinux1_x86_64', 'macosx_10_6_x86_64',