From f616febbeaaa6bb88b4d37e8ae00f5740abaf2ad Mon Sep 17 00:00:00 2001
From: SiboVG <sibo.vangool@hotmail.com>
Date: Mon, 12 Dec 2022 21:47:55 +0100
Subject: [PATCH 1/2] Upgrade install4j to v10 + add code signing certificates

---
 install4j/22.xx/openrocket-22.xx.install4j | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/install4j/22.xx/openrocket-22.xx.install4j b/install4j/22.xx/openrocket-22.xx.install4j
index 457cad828..569397b9f 100644
--- a/install4j/22.xx/openrocket-22.xx.install4j
+++ b/install4j/22.xx/openrocket-22.xx.install4j
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<install4j version="9.0.6" transformSequenceNumber="9">
+<install4j version="10.0.4" transformSequenceNumber="10">
   <directoryPresets config="../../core/resources-src/pix/icon" />
   <application name="OpenRocket 22.02.beta.05" 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.05" allPathsRelative="true" convertDotsToUnderscores="false" macVolumeId="5f58a2be20d8e22f" javaMinVersion="11" javaMaxVersion="11" jdkMode="jdk" jdkName="JDK 11.0">
+    <codeSigning macEnabled="true" macPkcs12File="./code_signing/OpenRocket_macOS.p12" windowsEnabled="true" windowsPkcs12File="./code_signing/OpenRocket_Windows.pfx" macNotarize="true" appleId="sibo.vangool@hotmail.com" />
     <jreBundles jdkProviderId="Liberica" release="11/11.0.15+10">
       <modules>
         <defaultModules set="jre" />
@@ -9,7 +10,7 @@
       </modules>
     </jreBundles>
   </application>
-  <files preserveSymlinks="false">
+  <files>
     <mountPoints>
       <mountPoint id="58" />
     </mountPoints>
@@ -44,6 +45,9 @@
         <file path="../../core/resources-src/pix/icon/icon-256-1.png" />
         <file path="../../core/resources-src/pix/icon/icon-256.png" />
       </iconImageFiles>
+      <macStaticAssociations>
+        <fileAssociation extension="ork" description="OpenRocket Design" iconFile="./OpenRocket.icns" role="editor" />
+      </macStaticAssociations>
     </launcher>
   </launchers>
   <installerGui>
@@ -311,12 +315,6 @@ return console.askOkCancel(message, true);
                   <property name="description" type="string">OpenRocket Design</property>
                   <property name="extension" type="string">ork</property>
                   <property name="launcherId" type="string">59</property>
-                  <property name="macIconFile">
-                    <object class="com.install4j.api.beans.ExternalFile">
-                      <string>./OpenRocket.icns</string>
-                    </object>
-                  </property>
-                  <property name="macRole" type="enum" class="com.install4j.runtime.beans.actions.desktop.MacAssociationRole" value="EDITOR" />
                   <property name="unix" type="boolean" value="true" />
                   <property name="unixIconFile">
                     <object class="com.install4j.api.beans.ExternalFile">
@@ -652,7 +650,7 @@ return console.askYesNo(message, true);
     </styles>
   </installerGui>
   <mediaSets>
-    <windows name="Windows" id="60" mediaFileName="${compiler:sys.shortName}-${compiler:sys.version}-Windows">
+    <windows name="Windows" id="60" mediaFileName="${compiler:sys.shortName}-${compiler:sys.version}-Windows" architecture="64">
       <jreBundle>
         <modules>
           <module name="java.scripting" />

From f86d06fb67275c743038d0dca460dfe43f7f7685 Mon Sep 17 00:00:00 2001
From: SiboVG <sibo.vangool@hotmail.com>
Date: Mon, 12 Dec 2022 21:47:55 +0100
Subject: [PATCH 2/2] Upgrade install4j to v10 + add code signing certificates
 Ignore adding the certificates in Git, I feel like this is unsafe?

---
 install4j/.gitignore                       |  2 ++
 install4j/22.xx/.gitignore                 | 22 ++++++++++++++++++++++
 install4j/22.xx/openrocket-22.xx.install4j | 16 +++++++---------
 3 files changed, 31 insertions(+), 9 deletions(-)
 create mode 100644 install4j/22.xx/.gitignore

diff --git a/install4j/.gitignore b/install4j/.gitignore
index 226e9d734..60eadae4b 100644
--- a/install4j/.gitignore
+++ b/install4j/.gitignore
@@ -18,3 +18,5 @@ media/
 
 # macOS files
 .DS_Store
+
+code_signing/
diff --git a/install4j/22.xx/.gitignore b/install4j/22.xx/.gitignore
new file mode 100644
index 000000000..60eadae4b
--- /dev/null
+++ b/install4j/22.xx/.gitignore
@@ -0,0 +1,22 @@
+# Compiled class file
+*.class
+
+# Log file
+*.log
+
+# Package Files #
+*.jar
+*.war
+*.nar
+*.ear
+*.zip
+*.tar.gz
+*.rar
+
+# Install4j media
+media/
+
+# macOS files
+.DS_Store
+
+code_signing/
diff --git a/install4j/22.xx/openrocket-22.xx.install4j b/install4j/22.xx/openrocket-22.xx.install4j
index 457cad828..569397b9f 100644
--- a/install4j/22.xx/openrocket-22.xx.install4j
+++ b/install4j/22.xx/openrocket-22.xx.install4j
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<install4j version="9.0.6" transformSequenceNumber="9">
+<install4j version="10.0.4" transformSequenceNumber="10">
   <directoryPresets config="../../core/resources-src/pix/icon" />
   <application name="OpenRocket 22.02.beta.05" 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.05" allPathsRelative="true" convertDotsToUnderscores="false" macVolumeId="5f58a2be20d8e22f" javaMinVersion="11" javaMaxVersion="11" jdkMode="jdk" jdkName="JDK 11.0">
+    <codeSigning macEnabled="true" macPkcs12File="./code_signing/OpenRocket_macOS.p12" windowsEnabled="true" windowsPkcs12File="./code_signing/OpenRocket_Windows.pfx" macNotarize="true" appleId="sibo.vangool@hotmail.com" />
     <jreBundles jdkProviderId="Liberica" release="11/11.0.15+10">
       <modules>
         <defaultModules set="jre" />
@@ -9,7 +10,7 @@
       </modules>
     </jreBundles>
   </application>
-  <files preserveSymlinks="false">
+  <files>
     <mountPoints>
       <mountPoint id="58" />
     </mountPoints>
@@ -44,6 +45,9 @@
         <file path="../../core/resources-src/pix/icon/icon-256-1.png" />
         <file path="../../core/resources-src/pix/icon/icon-256.png" />
       </iconImageFiles>
+      <macStaticAssociations>
+        <fileAssociation extension="ork" description="OpenRocket Design" iconFile="./OpenRocket.icns" role="editor" />
+      </macStaticAssociations>
     </launcher>
   </launchers>
   <installerGui>
@@ -311,12 +315,6 @@ return console.askOkCancel(message, true);
                   <property name="description" type="string">OpenRocket Design</property>
                   <property name="extension" type="string">ork</property>
                   <property name="launcherId" type="string">59</property>
-                  <property name="macIconFile">
-                    <object class="com.install4j.api.beans.ExternalFile">
-                      <string>./OpenRocket.icns</string>
-                    </object>
-                  </property>
-                  <property name="macRole" type="enum" class="com.install4j.runtime.beans.actions.desktop.MacAssociationRole" value="EDITOR" />
                   <property name="unix" type="boolean" value="true" />
                   <property name="unixIconFile">
                     <object class="com.install4j.api.beans.ExternalFile">
@@ -652,7 +650,7 @@ return console.askYesNo(message, true);
     </styles>
   </installerGui>
   <mediaSets>
-    <windows name="Windows" id="60" mediaFileName="${compiler:sys.shortName}-${compiler:sys.version}-Windows">
+    <windows name="Windows" id="60" mediaFileName="${compiler:sys.shortName}-${compiler:sys.version}-Windows" architecture="64">
       <jreBundle>
         <modules>
           <module name="java.scripting" />