From f88b0c642a3ae4a068cd95390d4da7af2694e1c9 Mon Sep 17 00:00:00 2001
From: Bane Stojkovic <bancika@gmail.com>
Date: Fri, 30 May 2025 23:47:04 +0200
Subject: [PATCH] mac build naming. Enable windows arm

---
 diylc/diylc-core/src/main/resources/update.xml |  8 ++++++++
 diylc/diylc-swing/deploy/win/install.iss       |  6 +++---
 diylc/diylc-swing/pom.xml                      | 18 +++++++++---------
 3 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/diylc/diylc-core/src/main/resources/update.xml b/diylc/diylc-core/src/main/resources/update.xml
index 4a3d9b5b..c8bc7fd7 100644
--- a/diylc/diylc-core/src/main/resources/update.xml
+++ b/diylc/diylc-core/src/main/resources/update.xml
@@ -337,6 +337,14 @@
 					<changeType>IMPROVEMENT</changeType>
 					<description>Bundle Java JRE with Linux AppImage to avoid having to install it</description>
 				</org.diylc.appframework.update.Change>
+				<org.diylc.appframework.update.Change>
+					<changeType>IMPROVEMENT</changeType>
+					<description>Updated naming conventions Mac build packages to replace 'arm' with 'silicon' and 'x86' to 'intel' for clarity</description>
+				</org.diylc.appframework.update.Change>
+				<org.diylc.appframework.update.Change>
+					<changeType>IMPROVEMENT</changeType>
+					<description>Allow Windows 64 bit installer to run on ARM-based Windows machine (through emulation)</description>
+				</org.diylc.appframework.update.Change>
 			</changes>
 			<url>https://github.com/bancika/diy-layout-creator/releases</url>
 		</org.diylc.appframework.update.Version>
diff --git a/diylc/diylc-swing/deploy/win/install.iss b/diylc/diylc-swing/deploy/win/install.iss
index 98bf5950..ef7ca0e8 100644
--- a/diylc/diylc-swing/deploy/win/install.iss
+++ b/diylc/diylc-swing/deploy/win/install.iss
@@ -12,11 +12,11 @@ ChangesAssociations=yes
 AlwaysShowDirOnReadyPage=yes
 ; Only allow the installer to run on x64-compatible systems,
 ; and enable 64-bit install mode.
-ArchitecturesAllowed={#arch}
-ArchitecturesInstallIn64BitMode={#arch}
+ArchitecturesAllowed=x64compatible
+ArchitecturesInstallIn64BitMode=x64compatible
 
 [Files]
-Source: "diylc-{#arch}.exe"; DestDir: "{app}"; DestName: "diylc.exe"
+Source: "diylc-x64.exe"; DestDir: "{app}"; DestName: "diylc.exe"
 Source: "..\..\src\main\resources\icons\diylc_file.ico"; DestDir: "{app}"
 Source: "..\..\target\diylc.jar"; DestDir: "{app}"
 Source: "..\..\target\jre_win\*"; DestDir: "{app}\jre17"; Flags: ignoreversion recursesubdirs
diff --git a/diylc/diylc-swing/pom.xml b/diylc/diylc-swing/pom.xml
index 9f51f4e5..024fea9d 100644
--- a/diylc/diylc-swing/pom.xml
+++ b/diylc/diylc-swing/pom.xml
@@ -633,7 +633,7 @@
                                         <argument>${project.basedir}:/workspace</argument>
                                         <argument>amake/innosetup</argument>
                                         <argument>/Ddiylcver=${project.version}</argument>
-                                        <argument>/Darch=x64</argument>
+                                        <!--<argument>/Darch=win64 arm64</argument>-->
                                         <argument>/workspace/deploy/win/install.iss</argument>
                                     </arguments>
                                 </configuration>
@@ -891,11 +891,11 @@
                                         
                                         <echo message="Creating unsigned zip for distribution..."/>
                                         <!-- Create unsigned zip for distribution -->
-                                        <zip destfile="${project.build.directory}/diylc-${project.version}-osx-x86-unsigned.zip">
+                                        <zip destfile="${project.build.directory}/diylc-${project.version}-osx-intel-unsigned.zip">
                                             <zipfileset filemode="755" dir="${project.build.directory}/DIYLC.app" prefix="DIYLC.app" />
                                             <zipfileset dir="${project.basedir}/deploy/mac" includes="README.txt" />
                                         </zip>
-                                        <echo message="Unsigned zip created at: ${project.build.directory}/diylc-${project.version}-osx-x86-unsigned.zip"/>
+                                        <echo message="Unsigned zip created at: ${project.build.directory}/diylc-${project.version}-osx-intel-unsigned.zip"/>
 
                                         <!-- First remove existing signatures -->
                                         <echo message="Removing any existing signatures..."/>
@@ -1036,10 +1036,10 @@
 
                                         <echo message="Creating final signed and notarized zip package..."/>
                                         <!-- Create final signed and notarized zip package -->
-                                        <zip destfile="${project.build.directory}/diylc-${project.version}-osx-x86.zip">
+                                        <zip destfile="${project.build.directory}/diylc-${project.version}-osx-intel.zip">
                                             <zipfileset filemode="755" dir="${project.build.directory}/DIYLC.app" prefix="DIYLC.app" />
                                         </zip>
-                                        <echo message="Final package created at: ${project.build.directory}/diylc-${project.version}-osx-x86.zip"/>
+                                        <echo message="Final package created at: ${project.build.directory}/diylc-${project.version}-osx-intel.zip"/>
                                         <echo message="Mac build process completed successfully!"/>
                                     </target>
                                 </configuration>
@@ -1205,11 +1205,11 @@
                                         
                                         <echo message="Creating unsigned zip for distribution..."/>
                                         <!-- Create unsigned zip for distribution -->
-                                        <zip destfile="${project.build.directory}/diylc-${project.version}-osx-arm-unsigned.zip">
+                                        <zip destfile="${project.build.directory}/diylc-${project.version}-osx-silicon-unsigned.zip">
                                             <zipfileset filemode="755" dir="${project.build.directory}/DIYLC.app" prefix="DIYLC.app" />
                                             <zipfileset dir="${project.basedir}/deploy/mac" includes="README.txt" />
                                         </zip>
-                                        <echo message="Unsigned zip created at: ${project.build.directory}/diylc-${project.version}-osx-arm-unsigned.zip"/>
+                                        <echo message="Unsigned zip created at: ${project.build.directory}/diylc-${project.version}-osx-silicon-unsigned.zip"/>
 
                                         <!-- First remove existing signatures -->
                                         <echo message="Removing any existing signatures..."/>
@@ -1350,10 +1350,10 @@
 
                                         <echo message="Creating final signed and notarized zip package..."/>
                                         <!-- Create final signed and notarized zip package -->
-                                        <zip destfile="${project.build.directory}/diylc-${project.version}-osx-arm.zip">
+                                        <zip destfile="${project.build.directory}/diylc-${project.version}-osx-silicon.zip">
                                             <zipfileset filemode="755" dir="${project.build.directory}/DIYLC.app" prefix="DIYLC.app" />
                                         </zip>
-                                        <echo message="Final package created at: ${project.build.directory}/diylc-${project.version}-osx-arm.zip"/>
+                                        <echo message="Final package created at: ${project.build.directory}/diylc-${project.version}-osx-silicon.zip"/>
                                         <echo message="Mac build process completed successfully!"/>
                                     </target>
                                 </configuration>