Merge pull request #1959 from SiboVG/22.02_prep

Prep OR for 22.02 release candidate 1

ReleaseNotes.md

@@ -14,7 +14,7 @@ Release Notes
 </div>
 
 <div id="22.02.RC.01">
- 
+
 OpenRocket 22.02.RC.01 (2023-01-xx)
 ------------------------
 (through PR1996)
@@ -60,6 +60,7 @@ OpenRocket 22.02.RC.01 (2023-01-xx)
  
 </div>
  
+
 <div id="22.02.beta.05">
 
 OpenRocket 22.02.beta.05 (2022-09-28)

core/resources/build.properties

@@ -1,10 +1,10 @@
 
 # The OpenRocket build version
-build.version=22.02.beta.05
+build.version=22.02.RC.01
 
 # The copyright year for the build. Displayed in the about dialog.
 # Will show as Copyright 2013-${build.copyright}
-build.copyright=2022
+build.copyright=2023
 
 # The source of the package.  When building a package for a specific
 # distribution (Debian, Fedora etc.), this should be changed appropriately!

core/src/net/sf/openrocket/communication/UpdateInfoRetriever.java

@@ -36,6 +36,7 @@ public class UpdateInfoRetriever {
 	private static final Map<String, Integer> devTags = Stream.of(new Object[][] {
 			{ "alpha", 1 },
 			{ "beta", 2 },
+			{ "RC", 3 },	// Release Candidate
 	}).collect(Collectors.toMap(c -> (String) c[0], c -> (Integer) c[1]));
 
 	/* Enum for the current build version. Values:

core/test/net/sf/openrocket/communication/UpdateInfoTest.java

@@ -92,6 +92,12 @@ public class UpdateInfoTest extends BaseTestCase {
 				UpdateInfoRetriever.UpdateInfoFetcher.compareLatest("22.beta.01", "22.beta.01"));
 		assertEquals(UpdateInfoRetriever.ReleaseStatus.NEWER,
 				UpdateInfoRetriever.UpdateInfoFetcher.compareLatest("22.beta.02", "22.beta.01"));
+		assertEquals(UpdateInfoRetriever.ReleaseStatus.OLDER,
+				UpdateInfoRetriever.UpdateInfoFetcher.compareLatest("22.RC.01", "22.RC.02"));
+		assertEquals(UpdateInfoRetriever.ReleaseStatus.LATEST,
+				UpdateInfoRetriever.UpdateInfoFetcher.compareLatest("22.RC.01", "22.RC.01"));
+		assertEquals(UpdateInfoRetriever.ReleaseStatus.NEWER,
+				UpdateInfoRetriever.UpdateInfoFetcher.compareLatest("22.RC.02", "22.RC.01"));
 
 		assertEquals(UpdateInfoRetriever.ReleaseStatus.OLDER,
 				UpdateInfoRetriever.UpdateInfoFetcher.compareLatest("22.alpha.01", "22.02.alpha.02"));
@@ -105,6 +111,12 @@ public class UpdateInfoTest extends BaseTestCase {
 				UpdateInfoRetriever.UpdateInfoFetcher.compareLatest("22.beta.01", "22.02.beta.01"));
 		assertEquals(UpdateInfoRetriever.ReleaseStatus.OLDER,
 				UpdateInfoRetriever.UpdateInfoFetcher.compareLatest("22.beta.02", "22.02.beta.01"));
+		assertEquals(UpdateInfoRetriever.ReleaseStatus.OLDER,
+				UpdateInfoRetriever.UpdateInfoFetcher.compareLatest("22.RC.01", "22.02.RC.02"));
+		assertEquals(UpdateInfoRetriever.ReleaseStatus.OLDER,
+				UpdateInfoRetriever.UpdateInfoFetcher.compareLatest("22.RC.01", "22.02.RC.01"));
+		assertEquals(UpdateInfoRetriever.ReleaseStatus.OLDER,
+				UpdateInfoRetriever.UpdateInfoFetcher.compareLatest("22.RC.02", "22.02.RC.01"));
 
 		assertEquals(UpdateInfoRetriever.ReleaseStatus.OLDER,
 				UpdateInfoRetriever.UpdateInfoFetcher.compareLatest("22.02.alpha.01", "22.02.beta.02"));
@@ -112,12 +124,36 @@ public class UpdateInfoTest extends BaseTestCase {
 				UpdateInfoRetriever.UpdateInfoFetcher.compareLatest("22.02.alpha.01", "22.02.beta.01"));
 		assertEquals(UpdateInfoRetriever.ReleaseStatus.OLDER,
 				UpdateInfoRetriever.UpdateInfoFetcher.compareLatest("22.02.alpha.02", "22.02.beta.01"));
+		assertEquals(UpdateInfoRetriever.ReleaseStatus.OLDER,
+				UpdateInfoRetriever.UpdateInfoFetcher.compareLatest("22.02.alpha.01", "22.02.RC.02"));
+		assertEquals(UpdateInfoRetriever.ReleaseStatus.OLDER,
+				UpdateInfoRetriever.UpdateInfoFetcher.compareLatest("22.02.alpha.01", "22.02.RC.01"));
+		assertEquals(UpdateInfoRetriever.ReleaseStatus.OLDER,
+				UpdateInfoRetriever.UpdateInfoFetcher.compareLatest("22.02.alpha.02", "22.02.RC.01"));
+		assertEquals(UpdateInfoRetriever.ReleaseStatus.OLDER,
+				UpdateInfoRetriever.UpdateInfoFetcher.compareLatest("22.02.beta.01", "22.02.RC.02"));
+		assertEquals(UpdateInfoRetriever.ReleaseStatus.OLDER,
+				UpdateInfoRetriever.UpdateInfoFetcher.compareLatest("22.02.beta.01", "22.02.RC.01"));
+		assertEquals(UpdateInfoRetriever.ReleaseStatus.OLDER,
+				UpdateInfoRetriever.UpdateInfoFetcher.compareLatest("22.02.beta.02", "22.02.RC.01"));
 		assertEquals(UpdateInfoRetriever.ReleaseStatus.NEWER,
 				UpdateInfoRetriever.UpdateInfoFetcher.compareLatest("22.02.beta.01", "22.02.alpha.02"));
 		assertEquals(UpdateInfoRetriever.ReleaseStatus.NEWER,
 				UpdateInfoRetriever.UpdateInfoFetcher.compareLatest("22.02.beta.01", "22.02.alpha.01"));
 		assertEquals(UpdateInfoRetriever.ReleaseStatus.NEWER,
 				UpdateInfoRetriever.UpdateInfoFetcher.compareLatest("22.02.beta.02", "22.02.alpha.01"));
+		assertEquals(UpdateInfoRetriever.ReleaseStatus.NEWER,
+				UpdateInfoRetriever.UpdateInfoFetcher.compareLatest("22.02.RC.01", "22.02.alpha.02"));
+		assertEquals(UpdateInfoRetriever.ReleaseStatus.NEWER,
+				UpdateInfoRetriever.UpdateInfoFetcher.compareLatest("22.02.RC.01", "22.02.alpha.01"));
+		assertEquals(UpdateInfoRetriever.ReleaseStatus.NEWER,
+				UpdateInfoRetriever.UpdateInfoFetcher.compareLatest("22.02.RC.02", "22.02.alpha.01"));
+		assertEquals(UpdateInfoRetriever.ReleaseStatus.NEWER,
+				UpdateInfoRetriever.UpdateInfoFetcher.compareLatest("22.02.RC.01", "22.02.beta.02"));
+		assertEquals(UpdateInfoRetriever.ReleaseStatus.NEWER,
+				UpdateInfoRetriever.UpdateInfoFetcher.compareLatest("22.02.RC.01", "22.02.beta.01"));
+		assertEquals(UpdateInfoRetriever.ReleaseStatus.NEWER,
+				UpdateInfoRetriever.UpdateInfoFetcher.compareLatest("22.02.RC.02", "22.02.beta.01"));
 
 		assertEquals(UpdateInfoRetriever.ReleaseStatus.NEWER,
 				UpdateInfoRetriever.UpdateInfoFetcher.compareLatest("22.02.alpha.01", "22"));
@@ -149,6 +185,21 @@ public class UpdateInfoTest extends BaseTestCase {
 		assertEquals(UpdateInfoRetriever.ReleaseStatus.OLDER,
 				UpdateInfoRetriever.UpdateInfoFetcher.compareLatest("22.02.beta.01", "22.02.02"));
 
+		assertEquals(UpdateInfoRetriever.ReleaseStatus.NEWER,
+				UpdateInfoRetriever.UpdateInfoFetcher.compareLatest("22.02.RC.01", "22"));
+		assertEquals(UpdateInfoRetriever.ReleaseStatus.OLDER,
+				UpdateInfoRetriever.UpdateInfoFetcher.compareLatest("22.02.RC.01", "22.02"));
+		assertEquals(UpdateInfoRetriever.ReleaseStatus.OLDER,
+				UpdateInfoRetriever.UpdateInfoFetcher.compareLatest("22.02.RC.01", "22.02.01"));
+		assertEquals(UpdateInfoRetriever.ReleaseStatus.NEWER,
+				UpdateInfoRetriever.UpdateInfoFetcher.compareLatest("22.02.RC.01", "22"));
+		assertEquals(UpdateInfoRetriever.ReleaseStatus.OLDER,
+				UpdateInfoRetriever.UpdateInfoFetcher.compareLatest("22.02.RC.01", "22.03"));
+		assertEquals(UpdateInfoRetriever.ReleaseStatus.NEWER,
+				UpdateInfoRetriever.UpdateInfoFetcher.compareLatest("22.02.RC.01", "22.01"));
+		assertEquals(UpdateInfoRetriever.ReleaseStatus.OLDER,
+				UpdateInfoRetriever.UpdateInfoFetcher.compareLatest("22.02.RC.01", "22.02.02"));
+
 
 		// Test bogus releases
 		assertExceptionCompareLatest("22.02.gamma.01", "22.02");

install4j/22.02/.gitignore

@@ -20,3 +20,4 @@ media/
 .DS_Store
 
 code_signing/
+openrocket-22.xx.install4j~

install4j/README.md

@@ -7,22 +7,24 @@ The [OpenRocket](http://www.openrocket.info) project will do its best
 to publish installers for the following platforms.
 
 * Windows, 64-bit
-* macOS, 64-bit
+* macOS, 64-bit (Intel & Apple Silicon)
 * Linux, 64-bit
 
 # Maintainers
 * Neil Weinstock 
 * Justin Hanney
 * Joe Pfeiffer
+* Sibo Van Gool
 
 # 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:
+This is an example of updating the installer from 22.02.beta.05 to 22.02:
-1. Download the OpenRocket-22.02.beta.01-macOS.dmg file
+1. Make sure install4j is not opened
-2. Make a read/write .dmg file using the terminal command `hdiutil convert OpenRocket-22.02.beta.01-macOS.dmg -format UDRW -o 22.02.beta.01_rw.dmg`
+2. Download the OpenRocket-22.02.beta.05-macOS.dmg file 
-3. Enlarge the writable DMG, by first checking the current size: `hdiutil resize 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 22.02.beta.01_rw.dmg`
+3. Make a read/write .dmg file using the terminal command `hdiutil convert OpenRocket-22.02.beta.05-macOS.dmg -format UDRW -o 22.02.beta.05_rw.dmg`
-4. Mount the DMG: `hdiutil attach 22.02.beta.01_rw.dmg`
+4. Enlarge the writable DMG, by first checking the current size: `hdiutil resize 22.02.beta.05_rw.dmg`, e.g. you get 430000 in the 'cur' column, then just resize it to e.g. 500000: `hdiutil resize -sectors 500000 22.02.beta.05_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
+5. Mount the DMG: `hdiutil attach 22.02.beta.05_rw.dmg`
-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`
+6. Open the OpenRocket-disk from your desktop and change the app name from 22.02.beta.05 to 22.02 
-7. Eject the OpenRocket DMG disk from your desktop (important step)
+7. Copy the .DS_Store to `openrocket/install4j/22.02/macOS_resources` by running the command `cp /Volumes/OpenRocket/.DS_Store openrocket/install4j/22.02/macOS_resources/DS_Store`
-8. Delete `22.02.beta.01_rw.dmg`
+8. Eject the OpenRocket DMG disk from your desktop (important step)
-9. You're all done!
+9. Delete `22.02.beta.05_rw.dmg`
+10. You're all done!