From 5f6755c506453712aff256f0ad08f84c171a8c51 Mon Sep 17 00:00:00 2001
From: Tres Finocchiaro <tres.finocchiaro@gmail.com>
Date: Sun, 23 Oct 2022 19:59:42 -0400
Subject: [PATCH] Add arch info to filename of desktop installers (#1033)

Add arch info to desktop installers
Closes #1032
---
 ant/apple/installer.xml        | 26 +++++++++++++-------------
 ant/apple/product-def.plist.in |  2 +-
 ant/linux/installer.xml        | 11 +++++++++--
 ant/windows/installer.xml      | 11 +++++++++--
 4 files changed, 32 insertions(+), 18 deletions(-)

diff --git a/ant/apple/installer.xml b/ant/apple/installer.xml
index bbd8f0d86..f1402df1f 100644
--- a/ant/apple/installer.xml
+++ b/ant/apple/installer.xml
@@ -1,6 +1,7 @@
 <project name="apple-installer" basedir="../../" xmlns:if="ant:if">
     <property file="ant/project.properties"/>
     <import file="${basedir}/ant/version.xml"/>
+    <import file="${basedir}/ant/platform-detect.xml"/>
 
     <!--
     ################################################################
@@ -8,7 +9,7 @@
     ################################################################
     -->
 
-    <target name="build-pkg" depends="get-identity,add-certificates,get-version">
+    <target name="build-pkg" depends="get-identity,add-certificates,get-version,platform-detect">
         <echo level="info">Creating installer using pkgbuild</echo>
         <!--
         #####################################
@@ -18,6 +19,12 @@
 
         <mkdir dir="${build.dir}/scripts/payload"/>
 
+        <!-- Get the os-preferred name for the target architecture -->
+        <condition property="apple.target.arch" value="arm64">
+            <isset property="target.arch.aarch64"/>
+        </condition>
+        <property name="apple.target.arch" value="x86_64" description="fallback value"/>
+
         <!-- Build app without sandboxing by default-->
         <property name="build.sandboxed" value="false"/>
         <antcall target="build-app">
@@ -58,7 +65,7 @@
             <arg value="--sign" if:true="${codesign.available}"/>
             <arg value="${codesign.activeid}" if:true="${codesign.available}"/>
 
-            <arg value="${out.dir}/${project.filename}${build.type}-${build.version}-unbranded.pkg"/>
+            <arg value="${out.dir}/${project.filename}${build.type}-${build.version}-${apple.target.arch}-unbranded.pkg"/>
         </exec>
 
         <!-- Branding for qz only -->
@@ -71,13 +78,6 @@
         <copy file="${basedir}/ant/apple/${pkg.background}" tofile="${out.dir}/resources/background.tiff" failonerror="true"/>
 
         <!-- Create product definition plist that stipulates supported arch -->
-        <condition property="build.archdef" value="arm64">
-            <isset property="target.arch.aarch64"/>
-        </condition>
-        <condition property="build.archdef" value="x86_64">
-            <isset property="target.arch.x86_64"/>
-        </condition>
-
         <copy file="ant/apple/product-def.plist.in" tofile="${build.dir}/product-def.plist">
             <filterchain><expandproperties/></filterchain>
         </copy>
@@ -92,7 +92,7 @@
             <arg value="--timestamp"/>
 
             <arg value="--package"/>
-            <arg value="${out.dir}/${project.filename}${build.type}-${build.version}-unbranded.pkg"/>
+            <arg value="${out.dir}/${project.filename}${build.type}-${build.version}-${apple.target.arch}-unbranded.pkg"/>
 
             <arg value="--product"/>
             <arg value="${build.dir}/product-def.plist"/>
@@ -130,13 +130,13 @@
             <arg value="${build.dir}/product-def.plist"/>
 
             <arg value="--package-path"/>
-            <arg value="${project.filename}${build.type}-${build.version}-unbranded.pkg"/>
+            <arg value="${project.filename}${build.type}-${build.version}-${apple.target.arch}-unbranded.pkg"/>
 
-            <arg value="${out.dir}/${project.filename}${build.type}-${build.version}.pkg"/>
+            <arg value="${out.dir}/${project.filename}${build.type}-${build.version}-${apple.target.arch}.pkg"/>
         </exec>
 
         <!-- Cleanup unbranded version -->
-        <delete file="${out.dir}/${project.filename}${build.type}-${build.version}-unbranded.pkg"/>
+        <delete file="${out.dir}/${project.filename}${build.type}-${build.version}-${apple.target.arch}-unbranded.pkg"/>
     </target>
 
     <target name="build-dmg" depends="get-identity,add-certificates,get-version">
diff --git a/ant/apple/product-def.plist.in b/ant/apple/product-def.plist.in
index 31eb5c377..0868f44fe 100644
--- a/ant/apple/product-def.plist.in
+++ b/ant/apple/product-def.plist.in
@@ -4,7 +4,7 @@
 <dict>
   <key>arch</key>
   <array>
-    <string>${build.archdef}</string>
+    <string>${apple.target.arch}</string>
   </array>
 </dict>
 </plist>
\ No newline at end of file
diff --git a/ant/linux/installer.xml b/ant/linux/installer.xml
index ae61ba41e..29832f508 100644
--- a/ant/linux/installer.xml
+++ b/ant/linux/installer.xml
@@ -1,10 +1,17 @@
 <project name="linux-installer" basedir="../../">
     <property file="ant/project.properties"/>
     <import file="${basedir}/ant/version.xml"/>
+    <import file="${basedir}/ant/platform-detect.xml"/>
 
-    <target name="build-run" depends="get-version">
+    <target name="build-run" depends="get-version,platform-detect">
         <echo level="info">Creating installer using makeself</echo>
 
+        <!-- Get the os-preferred name for the target architecture -->
+        <condition property="linux.target.arch" value="arm64">
+            <isset property="target.arch.aarch64"/>
+        </condition>
+        <property name="linux.target.arch" value="x86_64" description="fallback value"/>
+
         <copy file="assets/branding/linux-icon.svg" tofile="${dist.dir}/${project.filename}.svg"/>
 
         <mkdir dir="${build.dir}/scripts"/>
@@ -30,7 +37,7 @@
 
         <exec executable="makeself" failonerror="true">
             <arg value="${dist.dir}"/>
-            <arg value="${out.dir}/${project.filename}${build.type}-${build.version}.run"/>
+            <arg value="${out.dir}/${project.filename}${build.type}-${build.version}-${linux.target.arch}.run"/>
             <arg value="${project.name} Installer"/>
             <arg value="./install"/>
         </exec>
diff --git a/ant/windows/installer.xml b/ant/windows/installer.xml
index 375a6fe5a..412c64ce0 100644
--- a/ant/windows/installer.xml
+++ b/ant/windows/installer.xml
@@ -1,9 +1,16 @@
 <project name="windows-installer" basedir="../../">
     <property file="ant/project.properties"/>
     <import file="${basedir}/ant/version.xml"/>
+    <import file="${basedir}/ant/platform-detect.xml"/>
     <property environment="env"/>
 
-    <target name="build-exe" depends="get-version">
+    <target name="build-exe" depends="get-version,platform-detect">
+        <!-- Get the os-preferred name for the target architecture -->
+        <condition property="windows.target.arch" value="arm64">
+            <isset property="target.arch.aarch64"/>
+        </condition>
+        <property name="windows.target.arch" value="x86_64" description="fallback value"/>
+
         <!-- Sign Libs and Runtime -->
         <fileset dir="${dist.dir}/" id="win.sign.found">
             <include name="**/*.dll"/>
@@ -38,7 +45,7 @@
         <!-- Installer (bundles dist/ payload) -->
         <antcall target="config-compile-sign">
             <param name="nsis.script.in" value="windows-installer.nsi.in"/>
-            <param name="nsis.outfile" value="${out.dir}/${project.filename}${build.type}-${build.version}.exe"/>
+            <param name="nsis.outfile" value="${out.dir}/${project.filename}${build.type}-${build.version}-${windows.target.arch}.exe"/>
         </antcall>
     </target>