summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Swift/Controllers/MainController.cpp3
-rw-r--r--Swift/Controllers/SConscript3
-rw-r--r--Swift/QtUI/QtSwift.cpp2
-rw-r--r--Swift/QtUI/SConscript2
4 files changed, 6 insertions, 4 deletions
diff --git a/Swift/Controllers/MainController.cpp b/Swift/Controllers/MainController.cpp
index d8781c8..573bff9 100644
--- a/Swift/Controllers/MainController.cpp
+++ b/Swift/Controllers/MainController.cpp
@@ -15,6 +15,7 @@
#include "Swiften/Application/ApplicationMessageDisplay.h"
#include "Swiften/Network/TimerFactory.h"
#include "Swiften/Network/BoostTimerFactory.h"
+#include "Swift/Controllers/BuildVersion.h"
#include "Swift/Controllers/Chat/ChatController.h"
#include "Swift/Controllers/Chat/MUCSearchController.h"
#include "Swift/Controllers/Chat/ChatsManager.h"
@@ -195,7 +196,7 @@ void MainController::handleConnected() {
eventWindowController_ = new EventWindowController(eventController_, eventWindowFactory_);
- clientVersionResponder_ = new SoftwareVersionResponder(CLIENT_NAME, CLIENT_VERSION, client_);
+ clientVersionResponder_ = new SoftwareVersionResponder(CLIENT_NAME, buildVersion, client_);
loginWindow_->morphInto(rosterController_->getWindow());
DiscoInfo discoInfo;
diff --git a/Swift/Controllers/SConscript b/Swift/Controllers/SConscript
index eb63bed..ad03a5a 100644
--- a/Swift/Controllers/SConscript
+++ b/Swift/Controllers/SConscript
@@ -1,4 +1,5 @@
Import("env")
+import Version
################################################################################
# Flags
@@ -10,12 +11,14 @@ if env["SCONS_STAGE"] == "flags" :
"LIBS": ["SwiftControllers"]
}
+
################################################################################
# Build
################################################################################
if env["SCONS_STAGE"] == "build" :
myenv = env.Clone()
+ myenv.BuildVersion("BuildVersion.h", project = "swift")
myenv.MergeFlags(env["BOOST_FLAGS"])
myenv.StaticLibrary("SwiftControllers", [
"Chat/ChatController.cpp",
diff --git a/Swift/QtUI/QtSwift.cpp b/Swift/QtUI/QtSwift.cpp
index 8ff8447..d53db7e 100644
--- a/Swift/QtUI/QtSwift.cpp
+++ b/Swift/QtUI/QtSwift.cpp
@@ -28,7 +28,7 @@
#include "Swiften/Client/Client.h"
#include "Swift/Controllers/MainController.h"
#include "Swift/Controllers/ApplicationInfo.h"
-#include "Swift/QtUI/BuildVersion.h"
+#include "Swift/Controllers/BuildVersion.h"
#include "SwifTools/AutoUpdater/AutoUpdater.h"
#include "SwifTools/AutoUpdater/PlatformAutoUpdaterFactory.h"
diff --git a/Swift/QtUI/SConscript b/Swift/QtUI/SConscript
index e3c4a3c..f266ffe 100644
--- a/Swift/QtUI/SConscript
+++ b/Swift/QtUI/SConscript
@@ -108,9 +108,7 @@ sources = [
"qrc_Swift.cc",
]
-
myenv["SWIFT_VERSION"] = Version.getBuildVersion("swift")
-myenv.BuildVersion("BuildVersion.h", project = "swift")
if env["PLATFORM"] == "win32" :
myenv.RES("../resources/Windows/Swift.rc")