Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2009-11-27 23:06:49 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2009-11-27 23:06:49 (GMT) |
| commit | ba717874781a33ea40a1aea1ad8b9efce3580fc2 (patch) | |
| tree | 494841bb31cc679902e55eeec0640bc21271015d | |
| parent | 05fa7a57b3c7df3a9cc717cba202c96be05fa21a (diff) | |
| download | swift-ba717874781a33ea40a1aea1ad8b9efce3580fc2.zip swift-ba717874781a33ea40a1aea1ad8b9efce3580fc2.tar.bz2 | |
Use new versioning scheme.
Development builds are now X.Y.Z.date (Assuming we'll never have more
than patch releases). The Swift version number has to be changed in
Swift/SConscript (and only there), or can be passed via the command line
as swift_version=myversion
| -rw-r--r-- | Swift/QtUI/SConscript | 9 | ||||
| -rw-r--r-- | Swift/SConscript | 5 |
2 files changed, 9 insertions, 5 deletions
diff --git a/Swift/QtUI/SConscript b/Swift/QtUI/SConscript index b70832a..f8de60e 100644 --- a/Swift/QtUI/SConscript +++ b/Swift/QtUI/SConscript @@ -85,7 +85,8 @@ sources = [ "qrc_Swift.cc", ] -myenv.BuildVersion("BuildVersion.h", version = ARGUMENTS.get("swift_version", None)) + +myenv.BuildVersion("BuildVersion.h", version = env["SWIFT_VERSION"]) if env["PLATFORM"] == "win32" : myenv.RES("../resources/Windows/Swift.rc") @@ -101,10 +102,8 @@ myenv.Uic4("QtAddContactDialog.ui") myenv.Qrc("DefaultTheme.qrc") myenv.Qrc("Swift.qrc") -buildVersion = Version.getBuildVersion(ARGUMENTS.get("swift_version", None)) - if env["PLATFORM"] == "darwin" : - myenv.AppBundle("Swift", version = buildVersion, resources = ["../resources/MacOSX/Swift.icns"]) + myenv.AppBundle("Swift", version = env["SWIFT_VERSION"], resources = ["../resources/MacOSX/Swift.icns"]) if env.get("SWIFT_INSTALLDIR", "") : env.Install(os.path.join(env["SWIFT_INSTALLDIR"], "bin"), swiftProgram) @@ -120,6 +119,6 @@ if env["PLATFORM"] == "win32" : myenv.Append(NSIS_OPTIONS = [ "/DmsvccRedistributableDir=\"" + env["vcredist"] + "\"", - "/DbuildVersion=" + buildVersion + "/DbuildVersion=" + env["SWIFT_VERSION"] ]) myenv.Nsis("../Packaging/nsis/swift.nsi") diff --git a/Swift/SConscript b/Swift/SConscript index 75db94d..32f9b64 100644 --- a/Swift/SConscript +++ b/Swift/SConscript @@ -1,8 +1,13 @@ +import datetime + Import("env") if not GetOption("help") and not env.get("HAVE_OPENSSL", 0) : print "Error: Swift requires OpenSSL support, and OpenSSL was not found." Exit(1) + +env["SWIFT_VERSION"] = "0.9.9." + datetime.date.today().strftime("%Y%m%d") + SConscript("Controllers/SConscript") SConscript("QtUI/SConscript") |