Browse Source

Disable relocation on OSX to prevent issue with Panda3D.app being put in the wrong location

rdb 16 years ago
parent
commit
29966973a9
1 changed files with 2 additions and 2 deletions
  1. 2 2
      direct/src/plugin_installer/make_installer.py

+ 2 - 2
direct/src/plugin_installer/make_installer.py

@@ -400,19 +400,19 @@ def makeInstaller():
 
 
         package_id = 'org.panda3d.pkg.runtime' #TODO: maybe more customizable?
         package_id = 'org.panda3d.pkg.runtime' #TODO: maybe more customizable?
 
 
-
         plistFilename = None
         plistFilename = None
         packagemaker = "/Developer/usr/bin/packagemaker"
         packagemaker = "/Developer/usr/bin/packagemaker"
         if os.path.exists(packagemaker):
         if os.path.exists(packagemaker):
             # PackageMaker 3.0 or better, e.g. OSX 10.5.
             # PackageMaker 3.0 or better, e.g. OSX 10.5.
             CMD = packagemaker
             CMD = packagemaker
-            CMD += ' --id "%s"' % (package_id)
+            CMD += ' --id "%s"' % package_id
             CMD += ' --version "%s"' % options.version
             CMD += ' --version "%s"' % options.version
             CMD += ' --title "%s"' % options.long_name
             CMD += ' --title "%s"' % options.long_name
             CMD += ' --out p3d-setup.pkg'
             CMD += ' --out p3d-setup.pkg'
             CMD += ' --target 10.4' # The earliest version of OSX supported by Panda
             CMD += ' --target 10.4' # The earliest version of OSX supported by Panda
             CMD += ' --domain system'
             CMD += ' --domain system'
             CMD += ' --root "%s"' % tmproot
             CMD += ' --root "%s"' % tmproot
+            CMD += ' --no-relocate'
         else:
         else:
             # PackageMaker 2.0, e.g. OSX 10.4.
             # PackageMaker 2.0, e.g. OSX 10.4.
             packagemaker = "/Developer/Tools/packagemaker"
             packagemaker = "/Developer/Tools/packagemaker"