From 92596a6d13f89f5ac15c21a4c100a148df8386ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Remko=20Tron=C3=A7on?= <git@el-tramo.be>
Date: Wed, 12 Aug 2009 08:42:46 +0200
Subject: Remove commented code.


diff --git a/Swift/QtUI/SConscript b/Swift/QtUI/SConscript
index 16ad48d..7be53dc 100644
--- a/Swift/QtUI/SConscript
+++ b/Swift/QtUI/SConscript
@@ -35,6 +35,7 @@ Import("env")
 
 myenv = env.Clone()
 myenv["BUILDERS"]["WindowsBundle"] = Builder(action = Action(buildWindowsBundle, cmdstr = "$BUNDLECOMSTR"))
+myenv["BUILDERS"]["AppBundle"] = Builder(action = Action(buildAppBundle, cmdstr = "$BUNDLECOMSTR"))
 
 myenv.MergeFlags(env["SWIFT_CONTROLLERS_FLAGS"])
 myenv.MergeFlags(env["SWIFTEN_FLAGS"])
@@ -100,18 +101,20 @@ if env["PLATFORM"] == "darwin" :
 	myenv.Command("Swift.app", "Swift", createAppBundle)
 
 if env["PLATFORM"] == "win32" :
-	myenv.WindowsBundle(Dir("Swift"), [
-			swiftProgram[0],
-			File(os.path.join(env["QTDIR"], "bin", "QtCore4.dll")),
-			File(os.path.join(env["QTDIR"], "bin", "QtGui4.dll")),
-			File(os.path.join(env["QTDIR"], "bin", "QtNetwork4.dll")),
-			File(os.path.join(env["QTDIR"], "bin", "QtWebKit4.dll")),	
-			File(os.path.join(env["QTDIR"], "bin", "phonon4.dll")),	
-			File(os.path.join(env["OPENSSL_DIR"], "bin", "ssleay32.dll")),	
-			File(os.path.join(env["OPENSSL_DIR"], "bin", "libeay32.dll")),	
-		])
-
 	if "dist" in COMMAND_LINE_TARGETS or env.GetOption("clean") :
-		#myenv.Append(NSIS_OPTIONS = ["/DmsvccRedistributableDir=\"" + env["vcredist"] + "\""])
-		myenv.Append(NSIS_OPTIONS = ["/DmsvccRedistributableDir=\"" + env["vcredist"] + "\"", "/DbuildDate=" + datetime.date.today().strftime("%Y%m%d")])
+		myenv.WindowsBundle(Dir("Swift"), [
+				swiftProgram[0],
+				File(os.path.join(env["QTDIR"], "bin", "QtCore4.dll")),
+				File(os.path.join(env["QTDIR"], "bin", "QtGui4.dll")),
+				File(os.path.join(env["QTDIR"], "bin", "QtNetwork4.dll")),
+				File(os.path.join(env["QTDIR"], "bin", "QtWebKit4.dll")),	
+				File(os.path.join(env["QTDIR"], "bin", "phonon4.dll")),	
+				File(os.path.join(env["OPENSSL_DIR"], "bin", "ssleay32.dll")),	
+				File(os.path.join(env["OPENSSL_DIR"], "bin", "libeay32.dll")),	
+			])
+
+		myenv.Append(NSIS_OPTIONS = [
+				"/DmsvccRedistributableDir=\"" + env["vcredist"] + "\"", 
+				"/DbuildDate=" + datetime.date.today().strftime("%Y%m%d")
+			])
 		myenv.Nsis("../Packaging/nsis/swift.nsi")
-- 
cgit v0.10.2-6-g49f6