summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2009-11-28 10:19:54 (GMT)
committerRemko Tronçon <git@el-tramo.be>2009-11-28 10:19:54 (GMT)
commit647213f7c9bdc5b60c863ee56302f380869befe7 (patch)
treeb4c2e1afbdb1ba96a5afbe8954435153a77ab12b
parentbafe5e6d6386f40f254b5da752545b5f9f41d316 (diff)
downloadswift-contrib-647213f7c9bdc5b60c863ee56302f380869befe7.zip
swift-contrib-647213f7c9bdc5b60c863ee56302f380869befe7.tar.bz2
Create a dist target for mac DMG bundling.
-rw-r--r--BuildTools/SCons/Tools/AppBundle.py5
-rw-r--r--Swift/QtUI/.gitignore1
-rw-r--r--Swift/QtUI/SConscript7
3 files changed, 11 insertions, 2 deletions
diff --git a/BuildTools/SCons/Tools/AppBundle.py b/BuildTools/SCons/Tools/AppBundle.py
index 3d06e97..12667f0 100644
--- a/BuildTools/SCons/Tools/AppBundle.py
+++ b/BuildTools/SCons/Tools/AppBundle.py
@@ -2,7 +2,8 @@ import SCons.Util
def generate(env) :
def createAppBundle(env, bundle, version = "1.0", resources = [], frameworks = [], info = {}) :
- bundleContentsDir = bundle + ".app" + "/Contents"
+ bundleDir = bundle + ".app"
+ bundleContentsDir = bundleDir + "/Contents"
resourcesDir = bundleContentsDir + "/Resources"
frameworksDir = bundleContentsDir + "/Frameworks"
env.Install(bundleContentsDir + "/MacOS", bundle)
@@ -42,6 +43,8 @@ def generate(env) :
for framework in frameworks :
env.Install(frameworksDir, framework)
+ return env.Dir(bundleDir)
+
env.AddMethod(createAppBundle, "AppBundle")
diff --git a/Swift/QtUI/.gitignore b/Swift/QtUI/.gitignore
index b776b0d..379d4f5 100644
--- a/Swift/QtUI/.gitignore
+++ b/Swift/QtUI/.gitignore
@@ -1,2 +1,3 @@
Swift
BuildVersion.h
+Swift-*.dmg
diff --git a/Swift/QtUI/SConscript b/Swift/QtUI/SConscript
index b7eefaf..77bc8f8 100644
--- a/Swift/QtUI/SConscript
+++ b/Swift/QtUI/SConscript
@@ -107,7 +107,12 @@ if env["PLATFORM"] == "darwin" :
frameworks = []
if env["HAVE_SPARKLE"] :
frameworks.append(env["SPARKLE_FRAMEWORK"])
- myenv.AppBundle("Swift", version = env["SWIFT_VERSION"], resources = ["../resources/MacOSX/Swift.icns"], frameworks = frameworks)
+ app = myenv.AppBundle("Swift", version = env["SWIFT_VERSION"], resources = ["../resources/MacOSX/Swift.icns"], frameworks = frameworks)
+ if "dist" in COMMAND_LINE_TARGETS :
+ myenv.Command(["Swift-${SWIFT_VERSION}.dmg"], [app], [
+ "$QTDIR/bin/macdeployqt $SOURCE -dmg",
+ Move("$TARGET", "$SOURCE.dir/Swift.dmg")
+ ])
if env.get("SWIFT_INSTALLDIR", "") :
env.Install(os.path.join(env["SWIFT_INSTALLDIR"], "bin"), swiftProgram)