deploy-ng: Change default model-cache-dir on deployed applications

We replace panda3d in the model-cache-dir ConfigVariable with the name
from setup.py.
This commit is contained in:
Mitchell Stokes 2018-03-30 13:42:35 -07:00
parent d613523f14
commit 01ae235bfb

View File

@ -315,16 +315,17 @@ class build_apps(distutils.core.Command):
ln = ln.strip() ln = ln.strip()
useline = True useline = True
if ln.startswith('#') or not ln: if ln.startswith('#') or not ln:
useline = False continue
else: if 'model-cache-dir' in ln:
for plugin in check_plugins: ln = ln.replace('/panda3d', '/{}'.format(self.distribution.get_name()))
if plugin in ln and plugin not in self.plugins: for plugin in check_plugins:
useline = False if plugin in ln and plugin not in self.plugins:
if warn_on_missing_plugin: useline = False
self.warn( if warn_on_missing_plugin:
"Missing plugin ({0}) referenced in user PRC data".format(plugin) self.warn(
) "Missing plugin ({0}) referenced in user PRC data".format(plugin)
break )
break
if useline: if useline:
out.append(ln) out.append(ln)
return out return out