From 9b6caad7d6b1706e1177e5ea5ff0d03958d9aad4 Mon Sep 17 00:00:00 2001 From: JoePfeiffer Date: Mon, 14 Feb 2022 08:13:12 -0700 Subject: [PATCH 1/3] Moved version 20.x to 22.xx Changed to relative file paths. The paths assume install4j is executed from within a directory located at the top level of the openrocket source tree. Changed macOS build to use "generated" JRE bundle --- {20.x => 22.xx}/OpenRocket.icns | Bin 22.xx/openrocket-22.xx.install4j | 485 ++++++++++++++++++ .../openrocket-22.xx.install4j~ | 0 3 files changed, 485 insertions(+) rename {20.x => 22.xx}/OpenRocket.icns (100%) create mode 100644 22.xx/openrocket-22.xx.install4j rename 20.x/openrocket-20.x.install4j => 22.xx/openrocket-22.xx.install4j~ (100%) diff --git a/20.x/OpenRocket.icns b/22.xx/OpenRocket.icns similarity index 100% rename from 20.x/OpenRocket.icns rename to 22.xx/OpenRocket.icns diff --git a/22.xx/openrocket-22.xx.install4j b/22.xx/openrocket-22.xx.install4j new file mode 100644 index 000000000..d25404d37 --- /dev/null +++ b/22.xx/openrocket-22.xx.install4j @@ -0,0 +1,485 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + sys.installationDir + + + context.getBooleanVariable("sys.confirmedUpdateInstallation") + + + + + + ${form:welcomeMessage} + + !context.isConsole() + + + + + + String message = context.getMessage("ConsoleWelcomeLabel", context.getApplicationName()); +return console.askOkCancel(message, true); + + + + + + + + updateCheck + + + + + ${i18n:ClickNext} + + + + + + !context.getBooleanVariable("sys.confirmedUpdateInstallation") + + + + + sys.installationDir + + + context.getVariable("sys.responseFile") == null + + + + + + ${i18n:SelectDirLabel(${compiler:sys.fullName})} + + + + + + + + suggestAppDir + validateApplicationId + existingDirWarning + checkWritable + manualEntryAllowed + checkFreeSpace + showRequiredDiskSpace + showFreeDiskSpace + allowSpacesOnUnix + validationScript + standardValidation + + + + + + + + + ${i18n:SelectComponentsLabel2} + + !context.isConsole() + + + + + + + selectionChangedScript + + + + + + + + + OpenRocket Rocket Files + ork + 59 + + + + + + + ${i18n:SelectAssociationsLabel} + + + + + + + + showSelectionButtons + selectionButtonPosition + + + + + + + + + + ${i18n:UninstallerMenuEntry(${compiler:sys.fullName})} + + !context.getBooleanVariable("sys.programGroupDisabled") + + + + ${compiler:sys.fullName} ${compiler:sys.version} + + + + + + + ${i18n:WizardPreparing} + + + + + + + + + ${form:finishedMessage} + + + + + + + + + ${i18n:UninstallerMenuEntry(${compiler:sys.fullName})} + + + + + + + + + + + + + + + + ${form:welcomeMessage} + + !context.isConsole() + + + + + + String message = context.getMessage("ConfirmUninstall", context.getApplicationName()); +return console.askYesNo(message, true); + + + + + + + + + + + + + + + ${i18n:UninstallerPreparing} + + + + + + + + + + ${form:successMessage} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/20.x/openrocket-20.x.install4j b/22.xx/openrocket-22.xx.install4j~ similarity index 100% rename from 20.x/openrocket-20.x.install4j rename to 22.xx/openrocket-22.xx.install4j~ From 8e7f52698e3d16510401dc5c13069ec76cb4fd61 Mon Sep 17 00:00:00 2001 From: JoePfeiffer Date: Mon, 14 Feb 2022 08:35:51 -0700 Subject: [PATCH 2/3] Saving config file from install4j updated to newer format. Added Linux build target --- 22.xx/openrocket-22.xx.install4j | 992 ++++++++++++++++--------------- 1 file changed, 507 insertions(+), 485 deletions(-) diff --git a/22.xx/openrocket-22.xx.install4j b/22.xx/openrocket-22.xx.install4j index d25404d37..d2acd1071 100644 --- a/22.xx/openrocket-22.xx.install4j +++ b/22.xx/openrocket-22.xx.install4j @@ -1,485 +1,507 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - sys.installationDir - - - context.getBooleanVariable("sys.confirmedUpdateInstallation") - - - - - - ${form:welcomeMessage} - - !context.isConsole() - - - - - - String message = context.getMessage("ConsoleWelcomeLabel", context.getApplicationName()); -return console.askOkCancel(message, true); - - - - - - - - updateCheck - - - - - ${i18n:ClickNext} - - - - - - !context.getBooleanVariable("sys.confirmedUpdateInstallation") - - - - - sys.installationDir - - - context.getVariable("sys.responseFile") == null - - - - - - ${i18n:SelectDirLabel(${compiler:sys.fullName})} - - - - - - - - suggestAppDir - validateApplicationId - existingDirWarning - checkWritable - manualEntryAllowed - checkFreeSpace - showRequiredDiskSpace - showFreeDiskSpace - allowSpacesOnUnix - validationScript - standardValidation - - - - - - - - - ${i18n:SelectComponentsLabel2} - - !context.isConsole() - - - - - - - selectionChangedScript - - - - - - - - - OpenRocket Rocket Files - ork - 59 - - - - - - - ${i18n:SelectAssociationsLabel} - - - - - - - - showSelectionButtons - selectionButtonPosition - - - - - - - - - - ${i18n:UninstallerMenuEntry(${compiler:sys.fullName})} - - !context.getBooleanVariable("sys.programGroupDisabled") - - - - ${compiler:sys.fullName} ${compiler:sys.version} - - - - - - - ${i18n:WizardPreparing} - - - - - - - - - ${form:finishedMessage} - - - - - - - - - ${i18n:UninstallerMenuEntry(${compiler:sys.fullName})} - - - - - - - - - - - - - - - - ${form:welcomeMessage} - - !context.isConsole() - - - - - - String message = context.getMessage("ConfirmUninstall", context.getApplicationName()); -return console.askYesNo(message, true); - - - - - - - - - - - - - - - ${i18n:UninstallerPreparing} - - - - - - - - - - ${form:successMessage} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + sys.installationDir + + + context.getBooleanVariable("sys.confirmedUpdateInstallation") + + + + + + ${form:welcomeMessage} + + !context.isConsole() + + + + + + String message = context.getMessage("ConsoleWelcomeLabel", context.getApplicationName()); +return console.askOkCancel(message, true); + + + + + + + + updateCheck + + + + + ${i18n:ClickNext} + + + + + + !context.getBooleanVariable("sys.confirmedUpdateInstallation") + + + + + sys.installationDir + + + context.getVariable("sys.responseFile") == null + + + + + + ${i18n:SelectDirLabel(${compiler:sys.fullName})} + + + + + + + + suggestAppDir + validateApplicationId + existingDirWarning + checkWritable + manualEntryAllowed + checkFreeSpace + showRequiredDiskSpace + showFreeDiskSpace + allowSpacesOnUnix + validationScript + standardValidation + + + + + + + + + ${i18n:SelectComponentsLabel2} + + !context.isConsole() + + + + + + + selectionChangedScript + + + + + + + + + OpenRocket Rocket Files + ork + 59 + + + + + + + ${i18n:SelectAssociationsLabel} + + + + + + + + showSelectionButtons + selectionButtonPosition + + + + + + + + + + ${i18n:UninstallerMenuEntry(${compiler:sys.fullName})} + + !context.getBooleanVariable("sys.programGroupDisabled") + + + + ${compiler:sys.fullName} ${compiler:sys.version} + + + + + + + ${i18n:WizardPreparing} + + + + + + + + + ${form:finishedMessage} + + + + + + + + + ${i18n:UninstallerMenuEntry(${compiler:sys.fullName})} + + + + + + + + + + + + + + + + ${form:welcomeMessage} + + !context.isConsole() + + + + + + String message = context.getMessage("ConfirmUninstall", context.getApplicationName()); +return console.askYesNo(message, true); + + + + + + + + + + + + + + + ${i18n:UninstallerPreparing} + + + + + + + + + + ${form:successMessage} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 84d165c427d5d9f04c29d6567ff7ac3a1280e5dd Mon Sep 17 00:00:00 2001 From: JoePfeiffer Date: Mon, 14 Feb 2022 10:49:10 -0700 Subject: [PATCH 3/3] show splash screen on startup --- 22.xx/openrocket-22.xx.install4j | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/22.xx/openrocket-22.xx.install4j b/22.xx/openrocket-22.xx.install4j index d2acd1071..8c7493d74 100644 --- a/22.xx/openrocket-22.xx.install4j +++ b/22.xx/openrocket-22.xx.install4j @@ -1,7 +1,7 @@ - + @@ -15,6 +15,7 @@ +