aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGavin Andresen <gavinandresen@gmail.com>2012-09-05 17:54:37 -0400
committerGavin Andresen <gavinandresen@gmail.com>2012-09-05 17:54:37 -0400
commitace35a19977fc9b44a2b8639974746b4411669d6 (patch)
treeb4429f0448212fdd96317dcc824dee187fa98bc5
parent8788221761afc2c2990da746d9a6c444ff869684 (diff)
Fix mac .dmg packager for latest macports qt4
-rwxr-xr-xcontrib/macdeploy/macdeployqtplus5
1 files changed, 4 insertions, 1 deletions
diff --git a/contrib/macdeploy/macdeployqtplus b/contrib/macdeploy/macdeployqtplus
index e159f9bbc3..16daa59b08 100755
--- a/contrib/macdeploy/macdeployqtplus
+++ b/contrib/macdeploy/macdeployqtplus
@@ -169,6 +169,9 @@ class DeploymentInfo(object):
elif os.path.exists(os.path.join(parentDir, "share", "qt4", "translations")):
# MacPorts layout, e.g. "/opt/local/share/qt4"
self.qtPath = os.path.join(parentDir, "share", "qt4")
+ elif os.path.exists(os.path.join(os.path.dirname(parentDir), "share", "qt4", "translations")):
+ # Newer Macports layout
+ self.qtPath = os.path.join(os.path.dirname(parentDir), "share", "qt4")
if self.qtPath is not None:
pluginPath = os.path.join(self.qtPath, "plugins")
@@ -725,7 +728,7 @@ if config.dmg is not None:
disk.close()
if bg_path is not None:
subprocess.call(["SetFile", "-a", "V", bg_path])
- disk.update(registering_applications=False)
+# disk.update(registering_applications=False)
sleep(2)
disk.eject()