Merge pull request #1453 from SiboVG/beta4-macOS-DS_Store

Update everything for beta 04 release

core/resources/build.properties

@@ -1,6 +1,6 @@
 
 # The OpenRocket build version
-build.version=22.02.beta.03
+build.version=22.02.beta.04
 
 # The copyright year for the build. Displayed in the about dialog.
 # Will show as Copyright 2013-${build.copyright}

install4j/22.xx/openrocket-22.xx.install4j

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <install4j version="9.0.6" transformSequenceNumber="9">
   <directoryPresets config="../../core/resources-src/pix/icon" />
-  <application name="OpenRocket 22.02.beta.03" applicationId="8434-9327-1469-6373" mediaDir="media" shortName="OpenRocket" publisher="OpenRocket" publisherWeb="http://openrocket.info" version="22.02.beta.03" allPathsRelative="true" macVolumeId="5f58a2be20d8e22f" javaMinVersion="11" javaMaxVersion="11" jdkMode="jdk" jdkName="JDK 11.0">
+  <application name="OpenRocket 22.02.beta.04" applicationId="8434-9327-1469-6373" mediaDir="media" mediaFilePattern="${compiler:sys.shortName}_${compiler:sys.version}_${compiler:sys.platform}" shortName="OpenRocket" publisher="OpenRocket" publisherWeb="http://openrocket.info" version="22.02.beta.04" allPathsRelative="true" convertDotsToUnderscores="false" macVolumeId="5f58a2be20d8e22f" javaMinVersion="11" javaMaxVersion="11" jdkMode="jdk" jdkName="JDK 11.0">
     <jreBundles jdkProviderId="Liberica" release="11/11.0.15+10">
       <modules>
         <defaultModules set="jre" />
@@ -18,7 +18,7 @@
     </entries>
   </files>
   <launchers>
-    <launcher name="OpenRocket 22.02.beta.03" id="59" icnsFile="OpenRocket.icns">
+    <launcher name="OpenRocket 22.02.beta.04" id="59" icnsFile="OpenRocket.icns">
       <executable name="OpenRocket" iconSet="true" iconFile="../../core/resources-src/pix/icon/icon-windows.ico" executableDir="." executableMode="gui">
         <versionInfo legalCopyright="Copyright 2007-2022 Sampo Niskanen and Others" />
       </executable>
@@ -652,22 +652,22 @@ return console.askYesNo(message, true);
     </styles>
   </installerGui>
   <mediaSets>
-    <windows name="Windows" id="60">
+    <windows name="Windows" id="60" mediaFileName="${compiler:sys.shortName}-${compiler:sys.version}-Windows">
       <jreBundle>
         <modules>
           <module name="java.scripting" />
         </modules>
       </jreBundle>
     </windows>
-    <unixInstaller name="Unix Installer" id="168" />
+    <unixInstaller name="Unix Installer" id="168" mediaFileName="${compiler:sys.shortName}-${compiler:sys.version}-Linux" />
-    <macosArchive name="macOS Single Bundle Archive (Intel)" id="213" mediaFileName="${compiler:sys.shortName}_${compiler:sys.platform}_${compiler:sys.version}" launcherId="59">
+    <macosArchive name="macOS Single Bundle Archive (Intel)" id="213" mediaFileName="${compiler:sys.shortName}-${compiler:sys.version}-macOS" launcherId="59">
       <topLevelFiles>
         <file name=".DS_Store" file="./macOS_resources/DS_Store" />
         <file name=".background/macOS_installer_background.png" file="./macOS_resources/macOS_installer_background.png" />
         <symlink name="Applications" target="/Applications" />
       </topLevelFiles>
     </macosArchive>
-    <macos name="macOS Single Bundle" id="224" mediaFileName="${compiler:sys.shortName}_${compiler:sys.platform}_${compiler:sys.version}-installer" launcherId="59" />
+    <macos name="macOS Single Bundle" id="224" mediaFileName="${compiler:sys.shortName}-${compiler:sys.version}-macOS_ARM" launcherId="59" />
   </mediaSets>
   <buildIds buildAll="false">
     <mediaSet refId="60" />

install4j/README.md

@@ -14,3 +14,15 @@ to publish installers for the following platforms.
 * Neil Weinstock 
 * Justin Hanney
 * Joe Pfeiffer
+
+# Instructions on updating the macOS drag-and-drop installer
+This is an example of updating the installer from 22.02.beta.01 to 22.02.beta.02:
+1. Download the 22.02.beta.01.dmg file
+2. Make a read/write .dmg file using the terminal command `hdiutil convert OpenRocket_macos_22_02_beta_01.dmg -format UDRW -o 22.02.beta.01_rw.dmg`
+3. Enlarge the writable DMG, by first checking the current size: `hdiutil resize OpenRocket_macos_22_02_beta_01_rw.dmg`, e.g. you get 370000 in the 'cur' column, then just resize it to e.g. 400000: `hdiutil resize -sectors 400000 OpenRocket_macos_22_02_beta_01_rw.dmg`
+4. Mount the DMG: `hdiutil attach OpenRocket_macos_22_02_beta_01_rw.dmg`
+5. Open the OpenRocket-disk from your desktop and change the app name from 22.02.beta.01 to 22.02.beta.02
+6. Copy the .DS_Store to `openrocket/install4j/22.xx/macOS_resources` by running the command `cp /Volumes/OpenRocket/.DS_Store openrocket/install4j/22.xx/macOS_resources/DS_Store`
+7. Eject the OpenRocket DMG disk from your desktop (important step)
+8. Delete `OpenRocket_macos_22_02_beta_01_rw.dmg`
+9. You're all done!