From 1e2daa56a4aac17816a605e952acc130de4d9ced Mon Sep 17 00:00:00 2001 From: OMGeeky <> Date: Sun, 16 Feb 2025 00:20:50 +0100 Subject: [PATCH] Update ATCS_Installer.nsi to change ATCS_SOURCE_DIR path for improved directory structure and allow github actions --- packaging/Windows/ATCS_Installer.nsi | 32 ++++++++++++++-------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/packaging/Windows/ATCS_Installer.nsi b/packaging/Windows/ATCS_Installer.nsi index 07c0949..2864fab 100644 --- a/packaging/Windows/ATCS_Installer.nsi +++ b/packaging/Windows/ATCS_Installer.nsi @@ -4,7 +4,7 @@ !define VERSION "$%VERSION:~1%" !define TRAINER_VERSION "0.1.5" !define JAVA_BIN "java" -!define ATCS_SOURCE_DIR "C:\ATCS" +!define ATCS_SOURCE_DIR "..\..\" Name "Andor's Trail Content Studio v${VERSION}" OutFile "ATCS_v${VERSION}_Setup.exe" @@ -87,23 +87,23 @@ Section install FileClose $9 WriteUninstaller "$INSTDIR\Uninstall.exe" - - + + !insertmacro MUI_STARTMENU_WRITE_BEGIN "ATCS" - + ;--- Create shortcuts CreateDirectory "$SMPROGRAMS\$StartMenuFolder" CreateShortcut "$SMPROGRAMS\$StartMenuFolder\Andor's Trail Content Studio.lnk" "$INSTDIR\ATCS.cmd" "" "$INSTDIR\ATCS.ico" CreateShortcut "$SMPROGRAMS\$StartMenuFolder\Uninstall.lnk" "$INSTDIR\Uninstall.exe" - + !insertmacro MUI_STARTMENU_WRITE_END - + SectionEnd ;------------------------------------------------------------------------------------ Section uninstall - + Delete "$INSTDIR\lib\jide-oss.jar" Delete "$INSTDIR\lib\ui.jar" Delete "$INSTDIR\lib\junit-4.10.jar" @@ -121,13 +121,13 @@ Section uninstall Delete "$INSTDIR\ATCS.jar" Delete "$INSTDIR\Uninstall.exe" RMDir "$INSTDIR" - + !insertmacro MUI_STARTMENU_GETFOLDER "ATCS" $StartMenuFolder - + Delete "$SMPROGRAMS\$StartMenuFolder\Uninstall.lnk" Delete "$SMPROGRAMS\$StartMenuFolder\Andor's Trail Content Studio.lnk" RMDir "$SMPROGRAMS\$StartMenuFolder" - + SectionEnd @@ -139,28 +139,28 @@ Function GetJRE ; 2 - in JAVA_HOME environment variable ; 3 - in the registry ; 4 - assume java.exe in current dir or PATH - + Push $R0 Push $R1 - + ;ClearErrors ;StrCpy $R0 "$EXEDIR\jre\bin\java.exe" ;IfFileExists $R0 JreFound ;StrCpy $R0 "" - + ClearErrors ReadEnvStr $R0 "JAVA_HOME" StrCpy $R0 "$R0\bin\${JAVA_BIN}.exe" IfErrors 0 JreFound - + ClearErrors ReadRegStr $R1 HKLM "SOFTWARE\JavaSoft\Java Runtime Environment" "CurrentVersion" ReadRegStr $R0 HKLM "SOFTWARE\JavaSoft\Java Runtime Environment\$R1" "JavaHome" StrCpy $R0 "$R0\bin\${JAVA_BIN}.exe" - + IfErrors 0 JreFound StrCpy $R0 "${JAVA_BIN}.exe" - + JreFound: Pop $R1 Exch $R0