hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2331 from SiboVG/prep-beta

Browse Source 
Prep beta
This commit is contained in:
Sibo Van Gool 2023-09-16 01:03:24 +02:00 committed by GitHub
commit f33dcb9d44
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
core/resources/datafiles/thrustcurves/thrustcurves.ser
View File

Binary file not shown.

0
install4j/23.xx/.gitignore → install4j/23.09/.gitignore vendored
View File

BIN
install4j/23.xx/macOS_resources/DS_Store → install4j/23.09/macOS_resources/DS_Store
View File

Binary file not shown.

0
install4j/23.xx/macOS_resources/macOS_installer_background.png → install4j/23.09/macOS_resources/macOS_installer_background.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 88 KiB

After

Width:  |  Height:  |  Size: 88 KiB

0
install4j/23.xx/macOS_resources/macOS_installer_background.psd → install4j/23.09/macOS_resources/macOS_installer_background.psd
View File

4
install4j/23.xx/openrocket-23.xx.install4j → install4j/23.09/openrocket-23.09.install4j
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<install4j version="10.0.4" transformSequenceNumber="10">
<directoryPresets config="../../core/resources/pix/icon" />
<application name="OpenRocket" 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="23.xx" allPathsRelative="true" convertDotsToUnderscores="false" macVolumeId="5f58a2be20d8e22f" javaMinVersion="17" javaMaxVersion="17" jdkMode="jdk" jdkName="JDK 11.0">
<application name="OpenRocket 23.09.beta.01" 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="23.09.beta.01" allPathsRelative="true" convertDotsToUnderscores="false" macVolumeId="5f58a2be20d8e22f" javaMinVersion="17" javaMaxVersion="17" 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="17/17.0.7+7">
<modules>
@ -19,7 +19,7 @@
</entries>
</files>
<launchers>
<launcher name="OpenRocket 23.xx" id="59" icnsFile="../../core/resources/pix/icon/icon-macos.icns">
<launcher name="OpenRocket 23.09.beta.01" id="59" icnsFile="../../core/resources/pix/icon/icon-macos.icns">
<executable name="OpenRocket" iconSet="true" iconFile="../../core/resources/pix/icon/icon-windows.ico" executableDir="." executableMode="gui">
<versionInfo include="true" fileDescription="A model rocket flight-trajectory simulator." legalCopyright="Copyright 2007-2023 Sampo Niskanen and Others" internalName="${compiler:sys.shortName} ${compiler:sys.version}" />
</executable>

16
install4j/README.md
View File

@ -17,14 +17,14 @@ to publish installers for the following platforms.
* Sibo Van Gool
# Instructions on updating the macOS drag-and-drop installer
This is an example of updating the installer from 22.02.beta.05 to 22.02:
This is an example of updating the installer from 22.02 to 23.09.beta.01:
1. Make sure install4j is not opened
2. Download the OpenRocket-22.02.beta.05-macOS.dmg file
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. 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. Mount the DMG: `hdiutil attach 22.02.beta.05_rw.dmg`
6. Open the OpenRocket-disk from your desktop and change the app name from 22.02.beta.05 to 22.02
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`
2. Download the OpenRocket-22.02-macOS.dmg file
3. Make a read/write .dmg file using the terminal command `hdiutil convert OpenRocket-22.02-macOS.dmg -format UDRW -o 22.02.beta.05_rw.dmg` OR use the `template_dmg_rw.dmg`.
4. Enlarge the writable DMG, by first checking the current size: `hdiutil resize template_dmg_rw.dmg`, e.g. you get 430000 in the 'cur' column, then just resize it to e.g. 500000: `hdiutil resize -sectors 500000 template_dmg_rw.dmg`
5. Mount the DMG: `hdiutil attach template_dmg_rw.dmg`
6. Open the OpenRocket-disk from your desktop and change the app name from 22.02 to 23.09
7. Copy the .DS_Store to `openrocket/install4j/23.09/macOS_resources` by running the command `cp /Volumes/OpenRocket/.DS_Store openrocket/install4j/23.09/macOS_resources/DS_Store`
8. Eject the OpenRocket DMG disk from your desktop (important step)
9. Delete `22.02.beta.05_rw.dmg`
9. Delete `template_dmg_rw.dmg`
10. You're all done!

2
swing/resources-src/datafiles/components-dbcook

@ -1 +1 @@
Subproject commit 9da5f4e25f57e8ec476ea38cd91c78edff06003f
Subproject commit f4e30ecd12c64803dce013c615bbe62f89785408