Muldersoft/LameXP
Muldersoft/LameXP
1
0
Fork 0
Code Releases 2 Activity

Some more fine-tuning for the recent installer improvements.

Browse Source
This commit is contained in:
LoRd_MuldeR 2011-10-02 23:32:15 +02:00
parent 9d09a8d5b0
commit b09aaa30dc
2 changed files with 32 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
etc/Deployment/_deploy.bat
View File

@ -81,7 +81,7 @@ REM ------------------------------------------
REM :: DELETE OLD OUTPUT FILE :: REM :: DELETE OLD OUTPUT FILE ::
REM ------------------------------------------ REM ------------------------------------------
del "%OUT_FILE%.exe" del "%OUT_FILE%.exe"
del "%OUT_FILE%.sfx.exe" del "%OUT_FILE%.sfx"
del "%OUT_FILE%.zip" del "%OUT_FILE%.zip"
REM ------------------------------------------ REM ------------------------------------------
if exist "%OUT_FILE%.exe" ( if exist "%OUT_FILE%.exe" (
@ -131,8 +131,8 @@ REM ------------------------------------------
REM :: CREATE PACKAGES :: REM :: CREATE PACKAGES ::
REM ------------------------------------------ REM ------------------------------------------
"%PATH_SEVENZ%\7z.exe" a -tzip -r "%OUT_FILE%.zip" "%TMP_PATH%\*" "%PATH_SEVENZ%\7z.exe" a -tzip -r "%OUT_FILE%.zip" "%TMP_PATH%\*"
"%PATH_MKNSIS%\makensis.exe" "/DLAMEXP_UPX_PATH=%PATH_UPXBIN%" "/DLAMEXP_DATE=%ISO_DATE%" "/DLAMEXP_VERSION=%VER_LAMEXP_MAJOR%.%VER_LAMEXP_MINOR_HI%%VER_LAMEXP_MINOR_LO%" "/DLAMEXP_BUILD=%VER_LAMEXP_BUILD%" "/DLAMEXP_INSTTYPE=%VER_LAMEXP_TYPE%" "/DLAMEXP_PATCH=%VER_LAMEXP_PATCH%" "/DLAMEXP_SOURCE_PATH=%TMP_PATH%" "/DLAMEXP_OUTPUT_FILE=%OUT_FILE%.exe" "%~dp0\..\NSIS\setup.nsi" "%PATH_MKNSIS%\makensis.exe" "/DLAMEXP_UPX_PATH=%PATH_UPXBIN%" "/DLAMEXP_DATE=%ISO_DATE%" "/DLAMEXP_VERSION=%VER_LAMEXP_MAJOR%.%VER_LAMEXP_MINOR_HI%%VER_LAMEXP_MINOR_LO%" "/DLAMEXP_BUILD=%VER_LAMEXP_BUILD%" "/DLAMEXP_INSTTYPE=%VER_LAMEXP_TYPE%" "/DLAMEXP_PATCH=%VER_LAMEXP_PATCH%" "/DLAMEXP_OUTPUT_FILE=%OUT_FILE%.sfx" "/DLAMEXP_SOURCE_PATH=%TMP_PATH%" "%~dp0\..\NSIS\setup.nsi"
"%PATH_MKNSIS%\makensis.exe" "/DLAMEXP_UPX_PATH=%PATH_UPXBIN%" "/DLAMEXP_DATE=%ISO_DATE%" "/DLAMEXP_VERSION=%VER_LAMEXP_MAJOR%.%VER_LAMEXP_MINOR_HI%%VER_LAMEXP_MINOR_LO%" "/DLAMEXP_BUILD=%VER_LAMEXP_BUILD%" "/DLAMEXP_INSTTYPE=%VER_LAMEXP_TYPE%" "/DLAMEXP_PATCH=%VER_LAMEXP_PATCH%" "/DLAMEXP_SOURCE_FILE=%OUT_FILE%.exe" "/DLAMEXP_OUTPUT_FILE=%OUT_FILE%.sfx.exe" "%~dp0\..\NSIS\wrapper.nsi" "%PATH_MKNSIS%\makensis.exe" "/DLAMEXP_UPX_PATH=%PATH_UPXBIN%" "/DLAMEXP_DATE=%ISO_DATE%" "/DLAMEXP_VERSION=%VER_LAMEXP_MAJOR%.%VER_LAMEXP_MINOR_HI%%VER_LAMEXP_MINOR_LO%" "/DLAMEXP_BUILD=%VER_LAMEXP_BUILD%" "/DLAMEXP_INSTTYPE=%VER_LAMEXP_TYPE%" "/DLAMEXP_PATCH=%VER_LAMEXP_PATCH%" "/DLAMEXP_OUTPUT_FILE=%OUT_FILE%.exe" "/DLAMEXP_SOURCE_FILE=%OUT_FILE%.sfx" "%~dp0\..\NSIS\wrapper.nsi"
rd /S /Q "%TMP_PATH%" rd /S /Q "%TMP_PATH%"
REM ------------------------------------------ REM ------------------------------------------
if not exist "%OUT_FILE%.zip" ( if not exist "%OUT_FILE%.zip" (
@ -145,12 +145,12 @@ if not exist "%OUT_FILE%.exe" (
) )
REM ------------------------------------------ REM ------------------------------------------
attrib +R "%OUT_FILE%.zip" attrib +R "%OUT_FILE%.zip"
attrib +R "%OUT_FILE%.sfx"
attrib +R "%OUT_FILE%.exe" attrib +R "%OUT_FILE%.exe"
attrib +R "%OUT_FILE%.sfx.exe"
REM ------------------------------------------ REM ------------------------------------------
REM :: CREATE SIGNATURE :: REM :: CREATE SIGNATURE ::
REM ------------------------------------------ REM ------------------------------------------
"%PATH_GNUPG1%\gpg.exe" --detach-sign "%OUT_FILE%.sfx.exe" "%PATH_GNUPG1%\gpg.exe" --detach-sign "%OUT_FILE%.exe"
attrib +R "%OUT_FILE%.exe.sig" attrib +R "%OUT_FILE%.exe.sig"
REM ------------------------------------------ REM ------------------------------------------
echo. echo.

40
etc/NSIS/wrapper.nsi
View File

@ -68,9 +68,10 @@
RequestExecutionLevel user RequestExecutionLevel user
XPStyle on XPStyle on
InstallColors /windows
Name "LameXP v${LAMEXP_VERSION} ${LAMEXP_INSTTYPE}-${LAMEXP_PATCH} [Build #${LAMEXP_BUILD}]" Name "LameXP v${LAMEXP_VERSION} ${LAMEXP_INSTTYPE}-${LAMEXP_PATCH} [Build #${LAMEXP_BUILD}]"
OutFile "${LAMEXP_OUTPUT_FILE}" OutFile "${LAMEXP_OUTPUT_FILE}"
BrandingText "${LAMEXP_DATE} / Build ${LAMEXP_BUILD}" BrandingText "${LAMEXP_DATE} / Build #${LAMEXP_BUILD}"
InstallDir "$PROGRAMFILES\MuldeR\LameXP v${LAMEXP_VERSION}" InstallDir "$PROGRAMFILES\MuldeR\LameXP v${LAMEXP_VERSION}"
Icon "${NSISDIR}\Contrib\Graphics\Icons\orange-install.ico" Icon "${NSISDIR}\Contrib\Graphics\Icons\orange-install.ico"
ChangeUI all "${NSISDIR}\Contrib\UIs\sdbarker_tiny.exe" ChangeUI all "${NSISDIR}\Contrib\UIs\sdbarker_tiny.exe"
@ -127,28 +128,41 @@ Section "-LaunchTheInstaller"
InitPluginsDir InitPluginsDir
SetOutPath "$PLUGINSDIR" SetOutPath "$PLUGINSDIR"
File "/oname=$PLUGINSDIR\Install.exe" "${LAMEXP_SOURCE_FILE}" File "/oname=$PLUGINSDIR\LameXP-Install.exe" "${LAMEXP_SOURCE_FILE}"
!insertmacro GetCommandlineParameter "Update" "?" $R9
; --------
!insertmacro GetCommandlineParameter "Update" "?" $R0
StrCmp "$R0" "?" 0 +3
StrCpy $R9 ""
Goto RunTryAgain
StrCmp "$R0" "" 0 +3
StrCpy $R9 "/Update"
Goto RunTryAgain
StrCpy $R9 "/Update=$R0"
; --------
RunTryAgain: RunTryAgain:
ClearErrors ClearErrors
StrCmp "$R9" "?" +3 0 ExecShell "open" "$PLUGINSDIR\LameXP-Install.exe" '$R9' SW_SHOWNORMAL
ExecShell "open" "$PLUGINSDIR\Install.exe" '/Update=$R9' SW_SHOWNORMAL
Goto +2
ExecShell "open" "$PLUGINSDIR\Install.exe" '/Update' SW_SHOWNORMAL
IfErrors 0 RunSuccess IfErrors 0 RunSuccess
ClearErrors ClearErrors
StrCmp "$R9" "?" +3 0 ExecShell "" "$PLUGINSDIR\LameXP-Install.exe" '$R9' SW_SHOWNORMAL
ExecShell "" "$PLUGINSDIR\Install.exe" '/Update=$R9' SW_SHOWNORMAL
Goto +2
ExecShell "" "$PLUGINSDIR\Install.exe" '/Update' SW_SHOWNORMAL
IfErrors 0 RunSuccess IfErrors 0 RunSuccess
MessageBox MB_RETRYCANCEL|MB_ICONSTOP|MB_TOPMOST "Failed to launch installer. Please try again!" IDRETRY RunTryAgain MessageBox MB_RETRYCANCEL|MB_ICONSTOP|MB_TOPMOST "Failed to launch installer. Please try again!" IDRETRY RunTryAgain
Abort "Failed to launch installer :-("
SetDetailsPrint both
DetailPrint "Failed to launch installer :-("
SetDetailsPrint listonly
Abort
RunSuccess: RunSuccess:
Delete /REBOOTOK "$PLUGINSDIR\Install.exe" Delete /REBOOTOK "$PLUGINSDIR\LameXP-Install.exe"
SectionEnd SectionEnd