- found a case where sys.path[0] isn't set to Contents/Resources,

  so search the entire path.
- only add modules if we're building a standalone application.

diff --git a/Mac/Lib/bundlebuilder.py b/Mac/Lib/bundlebuilder.py
index a4811f19805cecec363a13ec2291ba1277f07cef..d911292cbd2f0ca0afa83b8648243f16c87e5bb5 100755 (executable)
--- a/Mac/Lib/bundlebuilder.py
+++ b/Mac/Lib/bundlebuilder.py
@@ -230,7 +230,12 @@ SITE_CO = compile(SITE_PY, "<-bundlebuilder.py->", "exec")
 
 EXT_LOADER = """\
 import imp, sys, os
-path = os.path.join(sys.path[0], "%(filename)s")
+for p in sys.path:
+       path = os.path.join(p, "%(filename)s")
+       if os.path.exists(path):
+               break
+else:
+       assert 0, "file not found: %(filename)s"
 mod = imp.load_dynamic("%(name)s", path)
 sys.modules["%(name)s"] = mod
 """
@@ -361,7 +366,8 @@ class AppBuilder(BundleBuilder):
                        os.chmod(bootstrappath, 0775)
 
        def postProcess(self):
-               self.addPythonModules()
+               if self.standalone:
+                       self.addPythonModules()
                if self.strip and not self.symlink:
                        self.stripBinaries()