From ba717874781a33ea40a1aea1ad8b9efce3580fc2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Remko=20Tron=C3=A7on?= <git@el-tramo.be>
Date: Sat, 28 Nov 2009 00:06:49 +0100
Subject: 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

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")
-- 
cgit v0.10.2-6-g49f6