summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2012-10-05 19:24:47 (GMT)
committerRemko Tronçon <git@el-tramo.be>2012-10-06 18:51:27 (GMT)
commit6a83fc02607ad2457c924eed7c80e9e8f7d04d03 (patch)
treef74d0ebdb7591684227429889e7aca472284bf03
parent9c9c32f06b742d59138a53a424cb91954c8e4ba0 (diff)
downloadswift-contrib-6a83fc02607ad2457c924eed7c80e9e8f7d04d03.zip
swift-contrib-6a83fc02607ad2457c924eed7c80e9e8f7d04d03.tar.bz2
Generate packages in /Packages.
-rw-r--r--Swift/QtUI/SConscript14
1 files changed, 8 insertions, 6 deletions
diff --git a/Swift/QtUI/SConscript b/Swift/QtUI/SConscript
index e3d00a8..632007c 100644
--- a/Swift/QtUI/SConscript
+++ b/Swift/QtUI/SConscript
@@ -283,8 +283,9 @@ if env["PLATFORM"] == "darwin" :
commonResources[""] = commonResources.get("", []) + ["#/Swift/resources/MacOSX/Swift.icns"]
app = myenv.AppBundle("Swift", version = myenv["SWIFT_VERSION"], resources = commonResources, frameworks = frameworks, handlesXMPPURIs = True)
if env["DIST"] :
- myenv.Command(["Swift-${SWIFT_VERSION}.dmg"], [app], ["Swift/Packaging/MacOSX/package.sh " + app.path + " Swift/Packaging/MacOSX/Swift.dmg.gz $TARGET $QTDIR"])
- myenv.Command(["Swift-${SWIFT_VERSION}.dsym"], ["Swift"], ["dsymutil -o ${TARGET} ${SOURCE}"])
+ myenv.Command(["#/Packages/Swift-${SWIFT_VERSION}.dmg"], [app], ["Swift/Packaging/MacOSX/package.sh " + app.path + " Swift/Packaging/MacOSX/Swift.dmg.gz $TARGET $QTDIR"])
+ dsym = myenv.Command(["Swift-${SWIFT_VERSION}.dSYM"], ["Swift"], ["dsymutil -o ${TARGET} ${SOURCE}"])
+ myenv.Command(["#/Packages/Swift-${SWIFT_VERSION}.dSYM.zip"], dsym, ["zip -r ${TARGET} ${SOURCE}"])
if env.get("SWIFT_INSTALLDIR", "") :
env.Install(os.path.join(env["SWIFT_INSTALLDIR"], "bin"), swiftProgram + openURIProgram)
@@ -368,10 +369,11 @@ if env["PLATFORM"] == "win32" :
for lang in translation_languages:
heatDependencies.append("Swift/translations/swift_" + lang + ".qm")
myenv.WiX_Heat('..\\Packaging\\WiX\\gen_files.wxs', heatDependencies)
- myenv.WiX_Candle('..\\Packaging\\WiX\\Swift.wixobj', '..\\Packaging\\WiX\\Swift.wxs')
- myenv.WiX_Candle('..\\Packaging\\WiX\\gen_files.wixobj', '..\\Packaging\\WiX\\gen_files.wxs')
- myenv.WiX_Light('..\\Packaging\\WiX\\Swift-' + myenv["SWIFT_VERSION"] + '.msi', ['..\\Packaging\\WiX\\gen_files.wixobj','..\\Packaging\\WiX\\Swift.wixobj'])
+ myenv.WiX_Light('..\\..\\..\\Packages\\Swift-' + myenv["SWIFT_VERSION"] + '.msi', [
+ myenv.WiX_Candle('..\\Packaging\\WiX\\Swift.wixobj', '..\\Packaging\\WiX\\Swift.wxs') +
+ myenv.WiX_Candle('..\\Packaging\\WiX\\gen_files.wixobj', '..\\Packaging\\WiX\\gen_files.wxs')
+ )
if myenv["debug"] :
- myenv.InstallAs('../Packaging/WiX/Swift-' + myenv["SWIFT_VERSION"] + '.pdb', "Swift.pdb")
+ myenv.InstallAs('#/Packages/Swift-' + myenv["SWIFT_VERSION"] + '.pdb', "Swift.pdb")