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
@@ -40,86 +40,85 @@ myenv.EnableQt4Modules(['QtCore', 'QtGui', 'QtWebKit'], debug = False)
 myenv.Append(CPPPATH = ["/usr/include/phonon"])
 
 myenv.Append(CPPPATH = ["."])
 
 if env["PLATFORM"] == "win32" :
 	#myenv["LINKFLAGS"] = ["/SUBSYSTEM:CONSOLE"]
 	myenv.Append(LINKFLAGS = ["/SUBSYSTEM:WINDOWS"])
 	myenv.Append(LIBS = "qtmain")
 
 myenv.Command("DefaultTheme.qrc", "../resources/themes/Default", Action(generateDefaultTheme, cmdstr = "$GENCOMSTR"))
 
 sources = [
 		"main.cpp",
 		"QtAboutWidget.cpp",
 		"QtAddContactDialog.cpp",
 		"QtChatWindow.cpp",
 		"QtChatWindowFactory.cpp",
 		"QtJoinMUCDialog.cpp",
 		"QtLoginWindow.cpp",
 		"QtLoginWindowFactory.cpp",
 		"QtMainWindow.cpp",
 		"QtMainWindowFactory.cpp",
 		"QtSettingsProvider.cpp",
 		"QtStatusWidget.cpp",
 		"QtSwift.cpp",
 		"QtChatView.cpp",
 		"QtChatTabs.cpp",
 		"QtSoundPlayer.cpp",
 		"QtSystemTray.cpp",
 		"QtTabbable.cpp",
 		"QtTextEdit.cpp",
 		"QtXMLConsoleWidgetFactory.cpp",
 		"QtXMLConsoleWidget.cpp",
 		"ChatSnippet.cpp",
 		"MessageSnippet.cpp",
 		"SystemMessageSnippet.cpp",
 		"Roster/RosterModel.cpp",
 		"Roster/QtTreeWidget.cpp",
 		"Roster/QtTreeWidgetItem.cpp",
 		"Roster/RosterDelegate.cpp",
 		"EventViewer/EventView.cpp",
 		"EventViewer/EventModel.cpp",
 		"EventViewer/EventDelegate.cpp",
 		"QtRosterHeader.cpp",
 		"qrc_DefaultTheme.cc",
 		"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")
 	sources += ["../resources/Windows/Swift.res"]
 
 if env["PLATFORM"] == "darwin" or env["PLATFORM"] == "win32" :
 	swiftProgram = myenv.Program("Swift", sources)
 else :
 	swiftProgram = myenv.Program("swift", sources)
 
 myenv.Uic4("QtJoinMUCDialog.ui")
 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)
 
 if env["PLATFORM"] == "win32" :
 	if "dist" in COMMAND_LINE_TARGETS or env.GetOption("clean") :
 		myenv.WindowsBundle("Swift", resources = [
 				os.path.join(env["OPENSSL_DIR"], "bin", "ssleay32.dll"),	
 				os.path.join(env["OPENSSL_DIR"], "bin", "libeay32.dll"),	
 			],	
 			qtimageformats = ["gif", "ico", "jpeg", "mng", "svg", "tiff"],
 			qtlibs = ["QtCore4", "QtGui4", "QtNetwork4", "QtWebKit4", "phonon4"])
 
 		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")