Browse Source

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.
Mitchell Stokes 7 years ago
parent
commit
01ae235bfb
1 changed files with 11 additions and 10 deletions
  1. 11 10
      direct/src/showutil/dist.py

+ 11 - 10
direct/src/showutil/dist.py

@@ -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
-                else:
-                    for plugin in check_plugins:
-                        if plugin in ln and plugin not in self.plugins:
-                            useline = False
-                            if warn_on_missing_plugin:
-                                self.warn(
-                                    "Missing plugin ({0}) referenced in user PRC data".format(plugin)
-                                )
-                            break
+                    continue
+                if 'model-cache-dir' in ln:
+                    ln = ln.replace('/panda3d', '/{}'.format(self.distribution.get_name()))
+                for plugin in check_plugins:
+                    if plugin in ln and plugin not in self.plugins:
+                        useline = False
+                        if warn_on_missing_plugin:
+                            self.warn(
+                                "Missing plugin ({0}) referenced in user PRC data".format(plugin)
+                            )
+                        break
                 if useline:
                 if useline:
                     out.append(ln)
                     out.append(ln)
             return out
             return out