Add platform name to installer directory and menu shortcuts

ref T305

install.pri

@@ -214,23 +214,30 @@ bitrock_builder_bin = $$(BITROCK_BUILDER)
         INSTALLER_PLATFORM = windows
         INSTALLER_BASENAME = swiftinstaller-windows-$${WORD_SIZE}-$${BLACK_VERSION}
         INSTALLER_EXT = exe
-        equals(WORD_SIZE,64): WINDOWS64BITMODE = 1
+        ARCHITECTURE = 32
+        equals(WORD_SIZE,64) {
+            WINDOWS64BITMODE = 1
+            ARCHITECTURE = 64
+        }
     }
     else:macx {
         INSTALLER_PLATFORM = osx
         INSTALLER_BASENAME = swiftinstaller-macos-$${WORD_SIZE}-$${BLACK_VERSION}
         INSTALLER_EXT = app
+        ARCHITECTURE = 64
     }
     else:unix {
         INSTALLER_PLATFORM = linux-x$${WORD_SIZE}
         INSTALLER_BASENAME = swiftinstaller-linux-$${WORD_SIZE}-$${BLACK_VERSION}
         INSTALLER_EXT = run
+        ARCHITECTURE = 64
     }
     create_installer.commands = $${bitrock_builder_bin} build $${bitrock_project} $${INSTALLER_PLATFORM} \
                                     --setvars project.outputDirectory=$$shell_path($${PREFIX}/..) \
                                               project.installerFilename=$${INSTALLER_BASENAME}.$${INSTALLER_EXT} \
                                               project.version=$${BLACK_VERSION} \
-                                              project.windows64bitMode=$${WINDOWS64BITMODE}
+                                              project.windows64bitMode=$${WINDOWS64BITMODE} \
+                                              architecture=$${ARCHITECTURE}
     QMAKE_EXTRA_TARGETS += create_installer
 }
 

installer/installbuilder/project.xml

@@ -137,6 +137,7 @@
     <outputDirectory>.</outputDirectory>
     <productDisplayIcon>../images/swift.ico</productDisplayIcon>
     <saveRelativePaths>1</saveRelativePaths>
+    <startMenuGroupName>swift ${project.version} ${architecture}bit</startMenuGroupName>
     <vendor>swift Project</vendor>
     <windowsExecutableIcon>../images/swift.ico</windowsExecutableIcon>
 
@@ -191,13 +192,20 @@
             <description>Installer.Parameter.installdir.description</description>
             <explanation>Installer.Parameter.installdir.explanation</explanation>
             <value></value>
-            <default>${platform_install_prefix}/${product_shortname}-${product_version}</default>
+            <default>${platform_install_prefix}/${project.shortName}-${project.version}-${architecture}bit</default>
             <allowEmptyValue>0</allowEmptyValue>
             <cliOptionName>prefix</cliOptionName>
             <mustBeWritable>1</mustBeWritable>
             <mustExist>0</mustExist>
             <width>30</width>
         </directoryParameter>
+        <stringParameter name="architecture" value="64" ask="0">
+            <description></description>
+            <explanation></explanation>
+            <default></default>
+            <allowEmptyValue>1</allowEmptyValue>
+            <width>40</width>
+        </stringParameter>
     </parameterList>
     <platformOptionsList>
         <platformOptions>

installer/installbuilder/swift-pilotclient.xml

@@ -109,7 +109,7 @@ This installs the binaries to run all swift applications.</detailedDescription>
     <startMenuShortcutList>
         <startMenuShortcut>
             <comment></comment>
-            <name>swift gui</name>
+            <name>swiftgui ${architecture}bit</name>
             <runAsAdmin>0</runAsAdmin>
             <runInTerminal>0</runInTerminal>
             <windowsExec>${installdir}/bin/swiftguistd.exe</windowsExec>
@@ -119,7 +119,7 @@ This installs the binaries to run all swift applications.</detailedDescription>
         </startMenuShortcut>
         <startMenuShortcut>
             <comment></comment>
-            <name>swift core</name>
+            <name>swiftcore ${architecture}bit</name>
             <runAsAdmin>0</runAsAdmin>
             <runInTerminal>0</runInTerminal>
             <windowsExec>${installdir}/bin/swiftcore.exe</windowsExec>
@@ -129,7 +129,7 @@ This installs the binaries to run all swift applications.</detailedDescription>
         </startMenuShortcut>
         <startMenuShortcut>
             <comment></comment>
-            <name>swift data</name>
+            <name>swiftdata ${architecture}bit</name>
             <runAsAdmin>0</runAsAdmin>
             <runInTerminal>0</runInTerminal>
             <windowsExec>${installdir}/bin/swiftdata.exe</windowsExec>
@@ -139,7 +139,7 @@ This installs the binaries to run all swift applications.</detailedDescription>
         </startMenuShortcut>
         <startMenuShortcut>
             <comment></comment>
-            <name>swift launcher</name>
+            <name>swiftlauncher ${architecture}bit</name>
             <runAsAdmin>0</runAsAdmin>
             <runInTerminal>0</runInTerminal>
             <windowsExec>${installdir}/bin/swiftlauncher.exe</windowsExec>
@@ -149,7 +149,7 @@ This installs the binaries to run all swift applications.</detailedDescription>
         </startMenuShortcut>
         <startMenuShortcut>
             <comment></comment>
-            <name>Uninstall swift</name>
+            <name>Uninstall swift ${architecture}bit</name>
             <runAsAdmin>0</runAsAdmin>
             <runInTerminal>0</runInTerminal>
             <windowsExec>${installdir}/uninstall.exe</windowsExec>