5 files changed, 183 insertions, 7 deletions
diff --git a/BuildTools/SCons/SConscript.boot b/BuildTools/SCons/SConscript.boot
index 24a8b67..2463d6c 100644
--- a/BuildTools/SCons/SConscript.boot
+++ b/BuildTools/SCons/SConscript.boot
@@ -1,69 +1,71 @@
 import sys, os, re, platform, hashlib
 sys.path.append(Dir("#/BuildTools/SCons").abspath)
 
 ################################################################################
 # Build variables
 ################################################################################
 
 vars = Variables(os.path.join(Dir("#").abspath, "config.py"))
 vars.Add('cc', "C compiler")
 vars.Add('cxx', "C++ compiler")
 vars.Add('ccflags', "Extra C(++) compiler flags")
 vars.Add('link', "Linker")
 vars.Add('linkflags', "Extra linker flags")
 vars.Add(BoolVariable("ccache", "Use CCache", "no"))
 vars.Add(BoolVariable("distcc", "Use DistCC", "no"))
 vars.Add('distcc_hosts', "DistCC hosts (overrides DISTCC_HOSTS)")
 vars.Add(EnumVariable("test", "Compile and run tests", "none", ["none", "all", "unit", "system"]))
 vars.Add(BoolVariable("optimize", "Compile with optimizations turned on", "no"))
 vars.Add(BoolVariable("debug", "Compile with debug information", "yes"))
 vars.Add(BoolVariable("allow_warnings", "Allow compilation warnings during compilation", "yes"))
 vars.Add(BoolVariable("assertions", "Compile with assertions", "yes"))
 vars.Add(BoolVariable("max_jobs", "Build with maximum number of parallel jobs", "no"))
 vars.Add(EnumVariable("target", "Choose a target platform for compilation", "native", ["native", "iphone-simulator", "iphone-device", "xcode"]))
 vars.Add(BoolVariable("swift_mobile", "Build mobile Swift", "no"))
 if os.name != "nt" :
 	vars.Add(BoolVariable("coverage", "Compile with coverage information", "no"))
 if os.name == "posix" :
 	vars.Add(BoolVariable("valgrind", "Run tests with valgrind", "no"))
 if os.name == "mac" or (os.name == "posix" and os.uname()[0] == "Darwin"):
 	vars.Add(BoolVariable("universal", "Create universal binaries", "no"))
 	vars.Add(BoolVariable("mac105", "Link against the 10.5 frameworks", "no"))
 if os.name == "nt" :
 	vars.Add(PathVariable("vcredist", "MSVC redistributable dir", "", PathVariable.PathAccept))
 if os.name == "nt" :
+	vars.Add(PathVariable("wix_bindir", "Path to WiX binaries", "", PathVariable.PathAccept))
+if os.name == "nt" :
 	vars.Add(PackageVariable("bonjour", "Bonjour SDK location", "yes"))
 vars.Add(PackageVariable("openssl", "OpenSSL location", "yes"))
 vars.Add(PathVariable("boost_includedir", "Boost headers location", None, PathVariable.PathAccept))
 vars.Add(PathVariable("boost_libdir", "Boost library location", None, PathVariable.PathAccept))
 vars.Add(PathVariable("expat_includedir", "Expat headers location", None, PathVariable.PathAccept))
 vars.Add(PathVariable("expat_libdir", "Expat library location", None, PathVariable.PathAccept))
 vars.Add("expat_libname", "Expat library name", "libexpat" if os.name == "nt" else "expat")
 vars.Add(PathVariable("libidn_includedir", "LibIDN headers location", None, PathVariable.PathAccept))
 vars.Add(PathVariable("libidn_libdir", "LibIDN library location", None, PathVariable.PathAccept))
 vars.Add("libidn_libname", "LibIDN library name", "libidn" if os.name == "nt" else "idn")
 vars.Add(PathVariable("sqlite_includedir", "SQLite headers location", None, PathVariable.PathAccept))
 vars.Add(PathVariable("sqlite_libdir", "SQLite library location", None, PathVariable.PathAccept))
 vars.Add("sqlite_libname", "SQLite library name", "libsqlite3" if os.name == "nt" else "sqlite3")
 vars.Add(PathVariable("avahi_includedir", "Avahi headers location", None, PathVariable.PathAccept))
 vars.Add(PathVariable("avahi_libdir", "Avahi library location", None, PathVariable.PathAccept))
 vars.Add(PathVariable("qt", "Qt location", "", PathVariable.PathAccept))
 vars.Add(PathVariable("docbook_xml", "DocBook XML", None, PathVariable.PathAccept))
 vars.Add(PathVariable("docbook_xsl", "DocBook XSL", None, PathVariable.PathAccept))
 vars.Add(BoolVariable("build_examples", "Build example programs", "yes"))
 vars.Add(BoolVariable("enable_variants", "Build in a separate dir under build/, depending on compile flags", "no"))
 vars.Add(BoolVariable("experimental", "Build experimental features", "no"))
 
 ################################################################################
 # Set up default build & configure environment
 ################################################################################
 
 env = Environment(CPPPATH = ["#"], ENV = {
 		'PATH' : os.environ['PATH'], 
 		'LD_LIBRARY_PATH' : os.environ.get("LD_LIBRARY_PATH", ""),
 	}, variables = vars)
 
 Help(vars.GenerateHelpText(env))
 
 # Default environment variables
 env["PLATFORM_FLAGS"] = {}
diff --git a/BuildTools/SCons/Tools/wix.py b/BuildTools/SCons/Tools/wix.py
new file mode 100644
index 0000000..2c5904b
--- /dev/null
+++ b/BuildTools/SCons/Tools/wix.py
@@ -0,0 +1,52 @@
+import re, os
+import SCons.Util
+from subprocess import call
+
+def generate(env) :
+	print "Adding WiX to environment"
+	wixPath = env.get("wix_bindir", "")
+	if len(wixPath) > 0 and wixPath[-1] != "\\":
+		wixPath += "\\"
+	env['WIX_HEAT'] = wixPath + 'heat.exe'
+	env['WIX_HEAT_OPTIONS'] = '-gg -sfrag -suid -template fragment -dr ProgramFilesFolder'
+	env['WIX_CANDLE'] = wixPath + 'candle.exe'
+	env['WIX_CANDLE_OPTIONS'] = ''
+	env['WIX_LIGHT'] = wixPath + 'light.exe'
+	env['WIX_LIGHT_OPTIONS'] = '-ext WixUIExtension'
+
+	def WiX_IncludeScanner(source, env, path, arg):
+		wixIncludeRegexp = re.compile(r'^\s*\<\?include (\S+.wxs)\s*\?\>\S*', re.M)
+		contents = source.get_contents()
+		includes = wixIncludeRegexp.findall(contents)
+		return [ "" + include for include in includes ]
+
+	heat_builder = SCons.Builder.Builder(
+ 		action = '"$WIX_HEAT" dir Swift\\QtUI\\Swift -cg Files $WIX_HEAT_OPTIONS -o ${TARGET} -t Swift\\Packaging\\WiX\\include.xslt',
+		suffix = '.wxi')
+
+
+	candle_scanner = env.Scanner(name = 'wixincludefile',
+		function = WiX_IncludeScanner,
+		argument = None,
+		skeys = ['.wxs'])
+
+	candle_builder = SCons.Builder.Builder(
+ 		action = '"$WIX_CANDLE" $WIX_CANDLE_OPTIONS ${SOURCES} -o ${TARGET}',
+		src_suffix = '.wxs',
+		suffix = '.wixobj',
+		source_scanner = candle_scanner,
+ 		src_builder = heat_builder)
+
+
+	light_builder = SCons.Builder.Builder(
+ 		action = '"$WIX_LIGHT" $WIX_LIGHT_OPTIONS -b Swift\\QtUI\\Swift ${SOURCES} -o ${TARGET}',
+		src_suffix = '.wixobj',
+ 		src_builder = candle_builder)
+
+	env['BUILDERS']['WiX_Heat'] = heat_builder
+	env['BUILDERS']['WiX_Candle'] = candle_builder
+	env['BUILDERS']['WiX_Light'] = light_builder
+
+def exists(env) :
+	return True
+
diff --git a/Swift/Packaging/WiX/Swift.wxs b/Swift/Packaging/WiX/Swift.wxs
new file mode 100644
index 0000000..7ac96d5
--- /dev/null
+++ b/Swift/Packaging/WiX/Swift.wxs
@@ -0,0 +1,66 @@
+<?xml version='1.0' encoding='utf-8'?>
+
+<!-- For a sensible tutorial on WiX, see http://wix.tramontana.co.hu/tutorial -->
+
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+
+	<?include variables.wxs ?>
+
+	<Product Name='Swift' Id='D7F276D5-BA67-421E-817B-9E7AB4B7D2BF' UpgradeCode='D7F276D5-BA67-421E-817B-9E7AB4B7D2BF' Language='1033' Codepage='1252' Version='0.0.1' Manufacturer='Swift.im'>
+		<Package Id='*' Keywords='Installer' Description="Swift Installer" Comments="Swift is available under the GPL version 3" Manufacturer="Swift.im" InstallerVersion='300' Languages='1033' Compressed='yes' SummaryCodepage='1252'/>
+		<Media Id='1' Cabinet='Swift.cab' EmbedCab='yes'/>
+
+		<!--<Upgrade Id='D7F276D5-BA67-421E-817B-9E7AB4B7D2BF'>
+			<UpgradeVersion OnlyDetect='no' Property='PREVIOUSFOUND' 
+				Minimum='0.0.1' IncludeMinimum='yes'
+				Maximum='2.0.0' IncludeMaximum='no'/>
+		</Upgrade>-->
+		<!-- This means it will upgrade any existing version up to but not including 2.0.
+			This'll mean we can ship nightlies and we can upgrade to 2.0 from them.
+			It also means we can 'upgrade' from e.g. 1.0 to 0.9. We want to change this so only real upgrades are allowed.
+			The numbering scheme probably needs to therefore be major.minor.commitssinceversion -->
+
+
+		<Directory Id='TARGETDIR' Name='SourceDir'>
+	      <Directory Id='ProgramFilesFolder' Name='PFiles'>
+	          <!--<Directory Id='INSTALLDIR' Name='Swift'>
+	          	
+	          </Directory>-->
+	      </Directory>
+
+	      <Directory Id="ProgramMenuFolder" Name="Programs">
+	        <Directory Id="ProgramMenuDir" Name="Swift">
+	          <Component Id="Shortcuts" Guid="D3BB9B0A-5D14-4920-B127-7CCD2D57BFB0">
+	        	<RemoveFolder Id='ProgramMenuDir' On='uninstall' />
+	            <RegistryValue Root='HKCU' Key='Software\Swift\Swift' Type='string' Value='' KeyPath='yes' />
+		    <Shortcut Id='SwiftShortcut' Directory='ProgramMenuDir' Name='Swift' Target="[INSTALLDIR]\Swift.exe" Icon='Swift.exe'/>
+	          </Component>
+	        </Directory>
+	      </Directory>
+
+	      <Directory Id="DesktopFolder" Name="Desktop" />
+
+	      <Merge Id="CRT" DiskId="1" Language="1033" SourceFile="$(var.VCCRTFile)"/>
+	    </Directory>
+
+	    <Feature Id='Core' Level='1' Title='Swift' Description='All necessary Swift files' Display='expand' ConfigurableDirectory='INSTALLDIR' AllowAdvertise='no' Absent='disallow'>
+	      <ComponentGroupRef Id='Files' />
+	      
+	      <!--<ComponentRef Id='Manual' />-->
+	      <MergeRef Id="CRT"/>
+	    </Feature>
+
+	    <Feature Id='Shortcut' Level='1' Title='Shortcut' Description='Start Menu Shortcut' Display='expand' ConfigurableDirectory='INSTALLDIR' AllowAdvertise='no'>
+	      <ComponentRef Id='Shortcuts' />
+	    </Feature>
+
+	    <!--<UIRef Id='WixUI_Advanced'/>-->
+	    <!--<UIRef Id="WixUI_Minimal"/>-->
+	    <UIRef Id="WixUI_Mondo"/>
+	    <WixVariable Id='WixUILicenseRtf' Value='COPYING.rtf'/>
+
+	    <Icon Id="Swift.exe" SourceFile="Swift.exe" />
+
+	    
+	</Product>
+</Wix>
+\ No newline at end of file
diff --git a/Swift/Packaging/WiX/include.xslt b/Swift/Packaging/WiX/include.xslt
new file mode 100644
index 0000000..ec1ad50
--- /dev/null
+++ b/Swift/Packaging/WiX/include.xslt
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:wix="http://schemas.microsoft.com/wix/2006/wi">
+
+	<xsl:template match='wix:Directory[@Id="Swift"]/@Id'>
+		<xsl:attribute name='Id'>INSTALLDIR</xsl:attribute>
+	</xsl:template>
+
+	<xsl:template match="@*|node()">
+		<xsl:copy>
+			<xsl:apply-templates select="@*|node()"/>
+		</xsl:copy>
+	</xsl:template>
+</xsl:stylesheet>
diff --git a/Swift/QtUI/SConscript b/Swift/QtUI/SConscript
index a62e14c..95ec49a 100644
--- a/Swift/QtUI/SConscript
+++ b/Swift/QtUI/SConscript
@@ -11,70 +11,71 @@ def generateDefaultTheme(dir) :
       filePath = os.path.join(path,file)
       result += "<file alias=\"%(alias)s\">%(path)s</file>" % { 
           "alias": filePath[len(sourceDir)+1:],
           "path": filePath
         }
   result += "</qresource>"
   result += "</RCC>"
   return result
 
 Import("env")
 
 myenv = env.Clone()
 myenv["CXXFLAGS"] = filter(lambda x : x != "-Wfloat-equal", myenv["CXXFLAGS"])
 myenv.UseFlags(env["SWIFT_CONTROLLERS_FLAGS"])
 myenv.UseFlags(env["SWIFTOOLS_FLAGS"])
 if myenv["HAVE_XSS"] :
   myenv.UseFlags(env["XSS_FLAGS"])
 if env["PLATFORM"] == "posix" :
   myenv.Append(LIBS = ["X11"])
 if myenv["HAVE_SPARKLE"] :
   myenv.UseFlags(env["SPARKLE_FLAGS"])
 myenv.UseFlags(env["SWIFTEN_FLAGS"])
 myenv.UseFlags(env["SWIFTEN_DEP_FLAGS"])
 if myenv.get("HAVE_GROWL", False) :
 	myenv.UseFlags(myenv["GROWL_FLAGS"])
 	myenv.Append(CPPDEFINES = ["HAVE_GROWL"])
 if myenv["swift_mobile"] :
 	myenv.Append(CPPDEFINES = ["SWIFT_MOBILE"])
 if myenv.get("HAVE_SNARL", False) :
 	myenv.UseFlags(myenv["SNARL_FLAGS"])
 	myenv.Append(CPPDEFINES = ["HAVE_SNARL"])
 myenv.UseFlags(myenv["PLATFORM_FLAGS"])
 
 myenv.Tool("qt4", toolpath = ["#/BuildTools/SCons/Tools"])
 myenv.Tool("nsis", toolpath = ["#/BuildTools/SCons/Tools"])
+myenv.Tool("wix", toolpath = ["#/BuildTools/SCons/Tools"])
 qt4modules = ['QtCore', 'QtGui', 'QtWebKit']
 if env["PLATFORM"] == "posix" :
 	qt4modules += ["QtDBus"]
 myenv.EnableQt4Modules(qt4modules, debug = False)
 
 myenv.Append(CPPPATH = ["."])
 
 if env["PLATFORM"] == "win32" :
   #myenv["LINKFLAGS"] = ["/SUBSYSTEM:CONSOLE"]
   myenv.Append(LINKFLAGS = ["/SUBSYSTEM:WINDOWS"])
   myenv.Append(LIBS = "qtmain")
 
 myenv.WriteVal("DefaultTheme.qrc", myenv.Value(generateDefaultTheme(myenv.Dir("#/Swift/resources/themes/Default"))))
 
 sources = [
     "main.cpp",
     "QtAboutWidget.cpp",
     "QtAvatarWidget.cpp",
     "QtUIFactory.cpp",
     "QtChatWindowFactory.cpp",
     "QtChatWindow.cpp",
     "QtClickableLabel.cpp",
     "QtLoginWindow.cpp",
     "QtMainWindow.cpp",
     "QtProfileWindow.cpp",
     "QtNameWidget.cpp",
     "QtSettingsProvider.cpp",
     "QtStatusWidget.cpp",
 		"QtScaledAvatarCache.cpp",
     "QtSwift.cpp",
     "QtURIHandler.cpp",
     "QtChatView.cpp",
     "QtChatTheme.cpp",
     "QtChatTabs.cpp",
     "QtSoundPlayer.cpp",
@@ -226,45 +227,86 @@ if env["PLATFORM"] == "win32" :
 	myenv.WriteVal("../Packaging/nsis/translations-uninstall.nsh", myenv.Value(nsis_translation_uninstall_script))
 	
 
 ################################################################################
 
 if env["PLATFORM"] == "darwin" :
   frameworks = []
   if env["HAVE_SPARKLE"] :
     frameworks.append(env["SPARKLE_FRAMEWORK"])
   if env["HAVE_GROWL"] :
     frameworks.append(env["GROWL_FRAMEWORK"])
   commonResources[""] = commonResources.get("", []) + ["#/Swift/resources/MacOSX/Swift.icns"]
   app = myenv.AppBundle("Swift", version = myenv["SWIFT_VERSION"], resources = commonResources, frameworks = frameworks, handlesXMPPURIs = True)
   if env["DIST"] :
     myenv.Command(["Swift-${SWIFT_VERSION}.dmg"], [app], ["Swift/Packaging/MacOSX/package.sh " + app.path + " Swift/Packaging/MacOSX/Swift.dmg.gz $TARGET $QTDIR"])
     
 if env.get("SWIFT_INSTALLDIR", "") :
   env.Install(os.path.join(env["SWIFT_INSTALLDIR"], "bin"), swiftProgram + openURIProgram)
   env.InstallAs(os.path.join(env["SWIFT_INSTALLDIR"], "share", "pixmaps", "swift.xpm"), "#/Swift/resources/logo/logo-icon-32.xpm")
   icons_path = os.path.join(env["SWIFT_INSTALLDIR"], "share", "icons", "hicolor")
   env.InstallAs(os.path.join(icons_path, "32x32", "apps", "swift.xpm"), "#/Swift/resources/logo/logo-icon-32.xpm")
   env.InstallAs(os.path.join(icons_path, "scalable", "apps", "swift.svg"), "#/Swift/resources/logo/logo-icon.svg")
   for i in ["16", "22", "24", "64", "128"] :
     env.InstallAs(os.path.join(icons_path, i + "x" + i, "apps", "swift.png"), "#/Swift/resources/logo/logo-icon-" + i + ".png")
   env.Install(os.path.join(env["SWIFT_INSTALLDIR"], "share", "applications"), "#/Swift/resources/swift.desktop")
   for dir, resource in commonResources.items() : 
     env.Install(os.path.join(env["SWIFT_INSTALLDIR"], "share", "swift", dir), resource)
     
 if env["PLATFORM"] == "win32" :
   if env["DIST"] :
     commonResources[""] = commonResources.get("", []) + [
         #os.path.join(env["OPENSSL_DIR"], "bin", "ssleay32.dll"),  
         #os.path.join(env["OPENSSL_DIR"], "bin", "libeay32.dll"),
         "#/Swift/resources/images",  
       ]
+    qtimageformats = ["gif", "ico", "jpeg", "mng", "svg", "tiff"]
+    qtlibs = ["QtCore4", "QtGui4", "QtNetwork4", "QtWebKit4", "QtXMLPatterns4", "phonon4"]
     myenv.WindowsBundle("Swift", 
       resources = commonResources,
-      qtimageformats = ["gif", "ico", "jpeg", "mng", "svg", "tiff"],
-      qtlibs = ["QtCore4", "QtGui4", "QtNetwork4", "QtWebKit4", "QtXMLPatterns4", "phonon4"])
+      qtimageformats = qtimageformats,
+      qtlibs = qtlibs)
+
+    #myenv.Append(NSIS_OPTIONS = [
+    #    "/DmsvccRedistributableDir=\"" + env["vcredist"] + "\"", 
+    #    "/DbuildVersion=" + myenv["SWIFT_VERSION"]
+    #  ])
+    #myenv.Nsis("../Packaging/nsis/swift.nsi")
+    #myenv.WiX("../Packaging/wix/swift.msi", ["../Packaging/WiX/Swift.wxs"])
+    if env["SCONS_STAGE"] == "build" and env.get("wix_bindir", None):
+      licensefile = open('../../COPYING', 'r')
+      rtf = '{\\rtf1\\ansi{\\fonttbl\\f0\\fswiss Helvetica;}\\f0\\pard'
+      for line in licensefile:
+        rtf += line
+        rtf += '\\par'
+      rtf += '}'
+      licensefile.close()
+      myenv.WriteVal("Swift/COPYING.rtf", env.Value(rtf))
+
+      wixvariables = {'VCCRTFile': env.get("vcredist", "c:\\Program Files\\Common Files\\Merge Modules") + "\\Microsoft_VC90_CRT_x86.msm"}
+      wixincludecontent = "<Include>"
+      for key in wixvariables:
+        wixincludecontent += "<?define %s = \"%s\" ?>" % (key, wixvariables[key])
+      wixincludecontent += "</Include>"
+      myenv.WriteVal("..\\Packaging\\Wix\\variables.wxs", env.Value(wixincludecontent))
+      heatDependencies = ['Swift/COPYING.rtf', 'Swift/Swift.exe']
+      for dir, resourceFiles in commonResources.items():
+        for resource in resourceFiles:
+          e = env.Entry(resource)
+          if e.isdir():
+            for subresource in env.Glob(str(e) + "/*") :
+              heatDependencies.append("Swift/" + e.name + "/" + subresource.name)
+          else:
+            if resource[-3:] != ".qm":
+              heatDependencies.append("Swift/" + resource)
+      for resource in qtlibs:
+        heatDependencies.append("Swift/" + resource + ".dll")
+      for resource in qtimageformats:
+        heatDependencies.append("Swift/imageformats/q" + resource + "4.dll")
+      for lang in translation_languages:
+        heatDependencies.append("Swift/translations/swift_" + lang + ".qm")
+      myenv.WiX_Heat('..\\Packaging\\WiX\\gen_files.wxs', heatDependencies)
+      myenv.WiX_Candle('..\\Packaging\\WiX\\Swift.wixobj', '..\\Packaging\\WiX\\Swift.wxs')
+      myenv.WiX_Candle('..\\Packaging\\WiX\\gen_files.wixobj', '..\\Packaging\\WiX\\gen_files.wxs')
+      myenv.WiX_Light('..\\Packaging\\WiX\\Swift-' + myenv["SWIFT_VERSION"] + '.msi', ['..\\Packaging\\WiX\\gen_files.wixobj','..\\Packaging\\WiX\\Swift.wixobj'])
+
 
-    myenv.Append(NSIS_OPTIONS = [
-        "/DmsvccRedistributableDir=\"" + env["vcredist"] + "\"", 
-        "/DbuildVersion=" + myenv["SWIFT_VERSION"]
-      ])
-    myenv.Nsis("../Packaging/nsis/swift.nsi")