Installbuilder Windows fixes

refs #615

install.pri

@@ -163,6 +163,7 @@ win32:!isEmpty(bitrock_customize_bin):!isEmpty(bitrock_builder_bin) {
     QMAKE_EXTRA_TARGETS += create_updater
 
     create_installer.depends = create_updater
-    create_installer.commands = $${bitrock_builder_bin} build $${bitrock_project} windows --setvars project.outputDirectory=$${PREFIX}/..
+    create_installer.commands = $${bitrock_builder_bin} build $${bitrock_project} windows \
+                                --setvars project.outputDirectory=$$shell_path($${PREFIX}/..)
     QMAKE_EXTRA_TARGETS += create_installer
 }

installer/installbuilder/autoupdater.xml

@@ -6,14 +6,16 @@
     <show>0</show>
     <folderList>
         <folder>
+            <description>Auto Updater</description>
             <destination>${installdir}</destination>
             <name>autoupdaterwin</name>
             <platforms>windows</platforms>
             <distributionFileList>
                 <distributionFile origin="../../dist/autoupdate-windows.exe"/>
-</distributionFileList>
+            </distributionFileList>
         </folder>
         <folder>
+            <description>Auto Updater</description>
             <destination>${installdir}</destination>
             <name>autoupdaterlinux</name>
             <platforms>linux</platforms>

installer/installbuilder/project.xml

@@ -7,7 +7,6 @@
     <leftImage>../images/leftimage.png</leftImage>
     <logoImage>../images/logo.png</logoImage>
     <splashImage>../images/splashscreen.png</splashImage>
-    <outputDirectory>.</outputDirectory>
     <componentList>
         <include>
             <file>swift.xml</file>
@@ -51,6 +50,7 @@ check_for_updates = 1
     <!-- <osxApplicationBundleIcon>TODO</osxApplicationBundleIcon>  
   <wmImage>TODO</wmImage>  -->
     <osxApplicationBundleIdentifier>org.swift-project.macinstaller</osxApplicationBundleIdentifier>
+    <outputDirectory>.</outputDirectory>
     <productDisplayIcon>../images/icon.ico</productDisplayIcon>
     <saveRelativePaths>1</saveRelativePaths>
     <vendor>swift Project</vendor>
@@ -62,10 +62,10 @@ check_for_updates = 1
     <windowsSigningTimestampServer>http://timestamp.digicert.com</windowsSigningTimestampServer>
     <customLanguageFileList>
         <!-- <language> 
-        <code>en</code> 
+            <code>en</code>
-        <encoding>utf-8</encoding>
+            <encoding>utf-8</encoding>
-        <file>${build_project_directory}/lang/alf-en.po</file>
+            <file>${build_project_directory}/lang/alf-en.po</file>
-    </language> -->
+        </language> -->
     </customLanguageFileList>
     <finalPageActionList>
         <runProgram>

installer/installbuilder/qt5-binaries.xml

@@ -12,9 +12,6 @@
             <name>bin_windows</name>
             <platforms>windows</platforms>
             <distributionFileList>
-                <distributionFile>
-                    <origin>../../dist/bin/icuuc54.dll</origin>
-                </distributionFile>
                 <distributionFile>
                     <allowWildcards>1</allowWildcards>
                     <origin>../../dist/bin/Qt5Core*.dll</origin>
@@ -54,20 +51,12 @@
                 <distributionFile>
                     <origin>../../dist/bin/dbus-daemon.exe</origin>
                 </distributionFile>
-                <distributionFile>
-                    <origin>../../dist/bin/icudt54.dll</origin>
-                </distributionFile>
-                <distributionFile>
-                    <origin>../../dist/bin/icuin54.dll</origin>
-                </distributionFile>
-                <distributionFile>
-                    <origin>../../dist/bin/icuuc54.dll</origin>
-                </distributionFile>
                 <distributionDirectory>
                     <origin>../../dist/bin/platforms</origin>
                 </distributionDirectory>
                 <distributionFile>
-                    <origin>../../dist/bin/expat.dll</origin>
+                    <allowWildcards>1</allowWildcards>
+                    <origin>../../dist/bin/expat.dll*</origin>
                 </distributionFile>
                 <distributionFile>
                     <origin>../../dist/bin/libeay32.dll</origin>

installer/installbuilder/swift-externals.xml

@@ -21,7 +21,8 @@
                     <origin>../../dist/bin/vatlib.dll</origin>
                 </distributionFile>
                 <distributionFile>
-                    <origin>../../dist/bin/portaudio.dll</origin>
+                    <allowWildcards>1</allowWildcards>
+                    <origin>../../dist/bin/*portaudio*.dll</origin>
                 </distributionFile>
                 <distributionFile>
                     <origin>../../dist/bin/SimConnect.dll</origin>
@@ -33,7 +34,8 @@
                     <origin>../../dist/bin/speexdsp.dll</origin>
                 </distributionFile>
                 <distributionFile>
-                    <origin>../../dist/bin/opus.dll</origin>
+                    <allowWildcards>1</allowWildcards>
+                    <origin>../../dist/bin/*opus*.dll</origin>
                 </distributionFile>
             </distributionFileList>
         </folder>

installer/installbuilder/swift-pilotclient.xml

@@ -72,16 +72,7 @@ This installs the binaries to run all swift applications.</detailedDescription>
                     <origin>../../dist/data</origin>
                 </distributionDirectory>
                 <distributionDirectory>
-                    <origin>../../dist/local.env.template</origin>
+                    <origin>../../dist/share</origin>
-                </distributionDirectory>
-                <distributionDirectory>
-                    <origin>../../dist/qss</origin>
-                </distributionDirectory>
-                <distributionDirectory>
-                    <origin>../../dist/shared</origin>
-                </distributionDirectory>
-                <distributionDirectory>
-                    <origin>../../dist/sounds</origin>
                 </distributionDirectory>
             </distributionFileList>
         </folder>
@@ -89,7 +80,7 @@ This installs the binaries to run all swift applications.</detailedDescription>
     <startMenuShortcutList>
         <startMenuShortcut>
             <comment></comment>
-            <name>swift gui</name>
+            <name>swiftgui</name>
             <runAsAdmin>0</runAsAdmin>
             <runInTerminal>0</runInTerminal>
             <windowsExec>${installdir}/bin/swiftguistd.exe</windowsExec>
@@ -99,7 +90,7 @@ This installs the binaries to run all swift applications.</detailedDescription>
         </startMenuShortcut>
         <startMenuShortcut>
             <comment></comment>
-            <name>swift core</name>
+            <name>swiftcore</name>
             <runAsAdmin>0</runAsAdmin>
             <runInTerminal>0</runInTerminal>
             <windowsExec>${installdir}/bin/swiftcore.exe</windowsExec>
@@ -109,7 +100,7 @@ This installs the binaries to run all swift applications.</detailedDescription>
         </startMenuShortcut>
         <startMenuShortcut>
             <comment></comment>
-            <name>swift data</name>
+            <name>swiftdata</name>
             <runAsAdmin>0</runAsAdmin>
             <runInTerminal>0</runInTerminal>
             <windowsExec>${installdir}/bin/swiftdata.exe</windowsExec>

installer/installbuilder/vcredist.xml

@@ -1,6 +1,6 @@
 <component>
     <name>vcruntime</name>
-    <description>Visual Studio 2013 Redistributables</description>
+    <description>Visual Studio 2015 Redistributables</description>
     <canBeEdited>0</canBeEdited>
     <selected>1</selected>
     <show>1</show>