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

Prep OR for 22.02 release candidate 1

Browse Source
This commit is contained in:
SiboVG 2023-01-09 08:57:16 +01:00
parent 4ef65cecc8
commit 6604dbdaea
9 changed files with 703 additions and 688 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/resources/build.properties
View File

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

1
install4j/22.xx/.gitignore → install4j/22.02/.gitignore vendored
View File

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

BIN
install4j/22.02/OpenRocket.icns Normal file
View File

Binary file not shown.

BIN
install4j/22.xx/macOS_resources/DS_Store → install4j/22.02/macOS_resources/DS_Store
View File

Binary file not shown.

0
install4j/22.xx/macOS_resources/macOS_installer_background.png → install4j/22.02/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/22.xx/macOS_resources/macOS_installer_background.psd → install4j/22.02/macOS_resources/macOS_installer_background.psd
View File

34
install4j/22.xx/openrocket-22.xx.install4j → install4j/22.02/openrocket-22.02.install4j
View File

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<install4j version="10.0.4" transformSequenceNumber="10"> <install4j version="10.0.4" transformSequenceNumber="10">
<directoryPresets config="../../core/resources-src/pix/icon" /> <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"> <application name="OpenRocket.RC1" 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.RC1" 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" /> <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"> <jreBundles jdkProviderId="Liberica" release="11/11.0.17+7">
<modules> <modules>
<defaultModules set="jre" /> <defaultModules set="jre" />
<module name="java.scripting" /> <module name="java.scripting" />
@ -19,11 +19,16 @@
</entries> </entries>
</files> </files>
<launchers> <launchers>
<launcher name="OpenRocket 22.02.beta.05" id="59" icnsFile="OpenRocket.icns"> <launcher name="OpenRocket 22.02" id="59" icnsFile="OpenRocket.icns">
<executable name="OpenRocket" iconSet="true" iconFile="../../core/resources-src/pix/icon/icon-windows.ico" executableDir="." executableMode="gui"> <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" /> <versionInfo legalCopyright="Copyright 2007-2022 Sampo Niskanen and Others" />
</executable> </executable>
<splashScreen show="true" bitmapFile="../../core/resources/pix/splashscreen.png" /> <splashScreen show="true" width="662" height="336" bitmapFile="../../core/resources/pix/splashscreen.png">
<text>
<statusLine x="491" y="200" fontColor="255,255,255" />
<versionLine x="489" y="143" text="version ${compiler:sys.version}" fontSize="10" fontColor="255,255,255" />
</text>
</splashScreen>
<java mainClass="net.sf.openrocket.startup.OpenRocket"> <java mainClass="net.sf.openrocket.startup.OpenRocket">
<classPath> <classPath>
<archive location="OpenRocket.jar" failOnError="false" /> <archive location="OpenRocket.jar" failOnError="false" />
@ -32,17 +37,17 @@
<iconImageFiles> <iconImageFiles>
<file path="../../core/resources-src/pix/icon/icon-016-4bit.png" /> <file path="../../core/resources-src/pix/icon/icon-016-4bit.png" />
<file path="../../core/resources-src/pix/icon/icon-016-8bit.png" /> <file path="../../core/resources-src/pix/icon/icon-016-8bit.png" />
<file path="../../core/resources-src/pix/icon/icon-016.png" />
<file path="../../core/resources-src/pix/icon/icon-032-4bit.png" /> <file path="../../core/resources-src/pix/icon/icon-032-4bit.png" />
<file path="../../core/resources-src/pix/icon/icon-032-8bit.png" /> <file path="../../core/resources-src/pix/icon/icon-032-8bit.png" />
<file path="../../core/resources-src/pix/icon/icon-032.png" />
<file path="../../core/resources-src/pix/icon/icon-048.png" />
<file path="../../core/resources-src/pix/icon/icon-048-4bit.png" /> <file path="../../core/resources-src/pix/icon/icon-048-4bit.png" />
<file path="../../core/resources-src/pix/icon/icon-048-8bit.png" /> <file path="../../core/resources-src/pix/icon/icon-048-8bit.png" />
<file path="../../core/resources-src/pix/icon/icon-064-4bit.png" /> <file path="../../core/resources-src/pix/icon/icon-064-4bit.png" />
<file path="../../core/resources-src/pix/icon/icon-064-8bit.png" /> <file path="../../core/resources-src/pix/icon/icon-064-8bit.png" />
<file path="../../core/resources-src/pix/icon/icon-064.png" />
<file path="../../core/resources-src/pix/icon/icon-256-1.png" /> <file path="../../core/resources-src/pix/icon/icon-256-1.png" />
<file path="../../core/resources-src/pix/icon/icon-016.png" />
<file path="../../core/resources-src/pix/icon/icon-032.png" />
<file path="../../core/resources-src/pix/icon/icon-048.png" />
<file path="../../core/resources-src/pix/icon/icon-064.png" />
<file path="../../core/resources-src/pix/icon/icon-256.png" /> <file path="../../core/resources-src/pix/icon/icon-256.png" />
</iconImageFiles> </iconImageFiles>
<macStaticAssociations> <macStaticAssociations>
@ -658,18 +663,25 @@ return console.askYesNo(message, true);
</jreBundle> </jreBundle>
</windows> </windows>
<unixInstaller name="Unix Installer" id="168" mediaFileName="${compiler:sys.shortName}-${compiler:sys.version}-Linux" /> <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.version}-macOS" launcherId="59"> <macosArchive name="macOS (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>
<macosArchive name="macOS (Apple Silicon)" id="240" mediaFileName="${compiler:sys.shortName}-${compiler:sys.version}-macOS" architecture="aarch64" launcherId="59">
<topLevelFiles> <topLevelFiles>
<file name=".DS_Store" file="./macOS_resources/DS_Store" /> <file name=".DS_Store" file="./macOS_resources/DS_Store" />
<file name=".background/macOS_installer_background.png" file="./macOS_resources/macOS_installer_background.png" /> <file name=".background/macOS_installer_background.png" file="./macOS_resources/macOS_installer_background.png" />
<symlink name="Applications" target="/Applications" /> <symlink name="Applications" target="/Applications" />
</topLevelFiles> </topLevelFiles>
</macosArchive> </macosArchive>
<macos name="macOS Single Bundle" id="224" mediaFileName="${compiler:sys.shortName}-${compiler:sys.version}-macOS_ARM" launcherId="59" />
</mediaSets> </mediaSets>
<buildIds buildAll="false"> <buildIds>
<mediaSet refId="60" /> <mediaSet refId="60" />
<mediaSet refId="168" /> <mediaSet refId="168" />
<mediaSet refId="213" /> <mediaSet refId="213" />
<mediaSet refId="240" />
</buildIds> </buildIds>
</install4j> </install4j>

BIN
install4j/22.xx/OpenRocket.icns
View File

Binary file not shown.

24
install4j/README.md
View File

@ -7,22 +7,24 @@ The [OpenRocket](http://www.openrocket.info) project will do its best
to publish installers for the following platforms. to publish installers for the following platforms.
* Windows, 64-bit * Windows, 64-bit
* macOS, 64-bit * macOS, 64-bit (Intel & Apple Silicon)
* Linux, 64-bit * Linux, 64-bit
# Maintainers # Maintainers
* Neil Weinstock * Neil Weinstock
* Justin Hanney * Justin Hanney
* Joe Pfeiffer * Joe Pfeiffer
* Sibo Van Gool
# Instructions on updating the macOS drag-and-drop installer # 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!