summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2010-10-23 11:22:44 (GMT)
committerRemko Tronçon <git@el-tramo.be>2010-10-23 11:22:44 (GMT)
commit204242e4da194f2d7f87bfc95a950f8dcf9f481b (patch)
tree5c2fd201af1c48252b5208525e2683da8ba3cbf0 /Swift/QtUI/SConscript
parentca8268eb662fedeef039bc39f7b8206c08610299 (diff)
downloadswift-204242e4da194f2d7f87bfc95a950f8dcf9f481b.zip
swift-204242e4da194f2d7f87bfc95a950f8dcf9f481b.tar.bz2
Improved Mac packaging.
Diffstat (limited to 'Swift/QtUI/SConscript')
-rw-r--r--Swift/QtUI/SConscript7
1 files changed, 2 insertions, 5 deletions
diff --git a/Swift/QtUI/SConscript b/Swift/QtUI/SConscript
index 78579a6..0bb0708 100644
--- a/Swift/QtUI/SConscript
+++ b/Swift/QtUI/SConscript
@@ -152,11 +152,8 @@ if env["PLATFORM"] == "darwin" :
frameworks.append(env["GROWL_FRAMEWORK"])
app = myenv.AppBundle("Swift", version = myenv["SWIFT_VERSION"], resources = ["../resources/MacOSX/Swift.icns"] + commonResources, frameworks = frameworks)
if env["DIST"] :
- myenv.Command(["Swift-${SWIFT_VERSION}.dmg"], [app], [
- "$QTDIR/bin/macdeployqt $SOURCE -dmg",
- Move("$TARGET", "$SOURCE.dir/Swift.dmg")
- ])
-
+ myenv.Command(["Swift-${SWIFT_VERSION}.dmg"], [app], ["Swift/Packaging/MacOSX/package.sh " + app.path + " Swift/Packaging/MacOSX/Swift.dmg.gz $TARGET $QTDIR"])
+
if env.get("SWIFT_INSTALLDIR", "") :
env.Install(os.path.join(env["SWIFT_INSTALLDIR"], "bin"), swiftProgram)
env.InstallAs(os.path.join(env["SWIFT_INSTALLDIR"], "share", "pixmaps", "swift.xpm"), "../resources/logo/logo-icon-32.xpm")