From 594ed40431c1b30e65cdb87e39c9ec058785261a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Remko=20Tron=C3=A7on?= <git@el-tramo.be>
Date: Thu, 13 Aug 2009 14:53:45 +0200
Subject: Made NSIS build status pretty.


diff --git a/BuildTools/SCons/Tools/nsis.py b/BuildTools/SCons/Tools/nsis.py
index 07ef045..567876d 100644
--- a/BuildTools/SCons/Tools/nsis.py
+++ b/BuildTools/SCons/Tools/nsis.py
@@ -13,7 +13,7 @@ def generate(env) :
 	Builder = SCons.Builder.Builder
 
 	env['NSIS_MAKENSIS'] = 'makensis'
-	env['NSIS_OPTIONS'] = ''
+	env['NSIS_OPTIONS'] = ["/V2"]
 	def winToLocalReformat(path) :
 		return os.path.join(*path.split("\\"))
 	def scanNsisContent(node, env, path, arg):
@@ -26,7 +26,7 @@ def generate(env) :
 		argument = None,
 		skeys = ['.nsi'])
 	nsisbuilder = Builder(
-		action = '$NSIS_MAKENSIS $NSIS_OPTIONS $SOURCE',
+		action = SCons.Action.Action('$NSIS_MAKENSIS $NSIS_OPTIONS $SOURCE', cmdstr = '$NSISCOMSTR'),
 		source_scanner = nsisscanner,
 		single_source = True
 		)
diff --git a/SConstruct b/SConstruct
index 014d8ef..bef9fdd 100644
--- a/SConstruct
+++ b/SConstruct
@@ -117,6 +117,7 @@ if int(ARGUMENTS.get("V", 0)) == 0:
     env["RCCOMSTR"]             = "  \033[0;34;140mRC\033[0m     $TARGET"
     env["BUNDLECOMSTR"]         = "  \033[0;34;140mBUNDLE\033[0m $TARGET"
     env["NIBCOMSTR"]            = "  \033[0;34;140mNIB\033[0m    $TARGET"
+    env["NSISCOMSTR"]           = "  \033[0;34;140mNSIS\033[0m   $TARGET"
     #Progress(                     "  \033[0;35;140mDEP\033[0m    $TARGET\n")
   else :
     env["CCCOMSTR"]             = "  CC     $TARGET"
@@ -132,6 +133,7 @@ if int(ARGUMENTS.get("V", 0)) == 0:
     env["RCCOMSTR"]             = "  RC     $TARGET"
     env["BUNDLECOMSTR"]         = "  BUNDLE $TARGET"
     env["NIBCOMSTR"]            = "  NIB    $TARGET"
+    env["NSISCOMSTR"]           = "  NSIS   $TARGET"
     #Progress('  DEP $TARGET\n')
 
 if env["PLATFORM"] == "win32" :
diff --git a/Swift/QtUI/SConscript b/Swift/QtUI/SConscript
index 700eb81..1666c64 100644
--- a/Swift/QtUI/SConscript
+++ b/Swift/QtUI/SConscript
@@ -110,7 +110,8 @@ if env["PLATFORM"] == "win32" :
 				File(os.path.join(env["OPENSSL_DIR"], "bin", "libeay32.dll")),	
 			])
 
-		myenv.Nsis("../Packaging/nsis/swift.nsi", NSIS_OPTIONS = [
+		myenv.Append(NSIS_OPTIONS = [
 				"/DmsvccRedistributableDir=\"" + env["vcredist"] + "\"", 
 				"/DbuildDate=" + datetime.date.today().strftime("%Y%m%d")
 			])
+		myenv.Nsis("../Packaging/nsis/swift.nsi")
diff --git a/Swiften/SConscript b/Swiften/SConscript
index eb60c7e..320bafa 100644
--- a/Swiften/SConscript
+++ b/Swiften/SConscript
@@ -38,8 +38,6 @@ sources = [
 		"EventLoop/EventOwner.cpp",
 		"EventLoop/MainEventLoop.cpp",
 		"EventLoop/SimpleEventLoop.cpp",
-		"EventLoop/Cocoa/CocoaEventLoop.mm",
-		"EventLoop/Cocoa/CocoaEvent.mm",
 		"History/HistoryManager.cpp",
 		"History/SQLiteHistoryManager.cpp",
 		"JID/JID.cpp",
@@ -155,10 +153,13 @@ sources = [
 		"StringCodecs/Base64.cpp",
 		"StringCodecs/SHA1.cpp",
 	]
-
 # "Notifier/GrowlNotifier.cpp",
 
 if env["PLATFORM"] == "darwin" :
+	"EventLoop/Cocoa/CocoaEventLoop.mm",
+	"EventLoop/Cocoa/CocoaEvent.mm",
+
+if env["PLATFORM"] == "darwin" :
 	myenv.Append(CPPDEFINES = "HAVE_BONJOUR")
 	sources += [
 			"LinkLocal/DNSSD/Bonjour/BonjourQuerier.cpp",
@@ -167,7 +168,6 @@ if env["PLATFORM"] == "darwin" :
 elif myenv.get("HAVE_AVAHI", 0) :
 	sources += ["LinkLocal/DNSSD/Avahi/AvahiQuerier.cpp"]
 
-
 if myenv.get("HAVE_OPENSSL", 0) :
 	myenv.Append(CPPDEFINES = "HAVE_OPENSSL")
 	sources += ["StreamStack/OpenSSLLayer.cpp"]
-- 
cgit v0.10.2-6-g49f6