Muldersoft/Simple-x264-Launcher
Muldersoft/Simple-x264-Launcher
1
0
Fork 0
Code Releases 1 Activity

Various install script fixes.

Browse Source
This commit is contained in:
LoRd_MuldeR 2013-12-13 15:35:46 +01:00
parent f0e61037f5
commit 5a8d3b8eca
2 changed files with 30 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
etc/setup/setup.nsi
View File

@ -299,6 +299,7 @@ Function .onInit
; --------
InitPluginsDir
File "/oname=$PLUGINSDIR\checkproc.exe" "checkproc.exe"
nsExec::Exec /TIMEOUT=5000 '"$PLUGINSDIR\checkproc.exe" Softonic Brothersoft Afreecodec'
Pop $0

68
etc/setup/wrapper.nsi
View File

@ -1,5 +1,5 @@
; ///////////////////////////////////////////////////////////////////////////////
; // LameXP - Audio Encoder Front-End
; // Simple x264 Launcher
; // Copyright (C) 2004-2012 LoRd_MuldeR <MuldeR2@GMX.de>
; //
; // This program is free software; you can redistribute it and/or modify
@ -23,36 +23,27 @@
;Basic Defines
;--------------------------------
!ifndef LAMEXP_VERSION
!error "LAMEXP_VERSION is not defined !!!"
!ifndef X264_BUILD
!error "X264_BUILD is not defined !!!"
!endif
!ifndef LAMEXP_BUILD
!error "LAMEXP_BUILD is not defined !!!"
!ifndef X264_DATE
!error "X264_DATE is not defined !!!"
!endif
!ifndef LAMEXP_INSTTYPE
!error "LAMEXP_INSTTYPE is not defined !!!"
!ifndef X264_OUTPUT_FILE
!error "X264_OUTPUT_FILE is not defined !!!"
!endif
!ifndef LAMEXP_PATCH
!error "LAMEXP_PATCH is not defined !!!"
!ifndef X264_SOURCE_FILE
!error "X264_SOURCE_FILE is not defined !!!"
!endif
!ifndef LAMEXP_DATE
!error "LAMEXP_DATE is not defined !!!"
!endif
!ifndef LAMEXP_OUTPUT_FILE
!error "LAMEXP_OUTPUT_FILE is not defined !!!"
!endif
!ifndef LAMEXP_SOURCE_FILE
!error "LAMEXP_SOURCE_FILE is not defined !!!"
!endif
!ifndef LAMEXP_UPX_PATH
!error "LAMEXP_UPX_PATH is not defined !!!"
!ifndef X264_UPX_PATH
!error "X264_UPX_PATH is not defined !!!"
!endif
;Web-Site
!define MyWebSite "http://mulder.at.gg/"
;Installer file name
!define InstallerFileName "$PLUGINSDIR\LameXP-SETUP-r${LAMEXP_BUILD}.exe"
!define InstallerFileName "$PLUGINSDIR\x264_x64-SETUP-r${X264_BUILD}.exe"
;--------------------------------
;Includes
@ -69,9 +60,9 @@
XPStyle on
RequestExecutionLevel user
InstallColors /windows
Name "LameXP v${LAMEXP_VERSION} ${LAMEXP_INSTTYPE}-${LAMEXP_PATCH} [Build #${LAMEXP_BUILD}]"
OutFile "${LAMEXP_OUTPUT_FILE}"
BrandingText "${LAMEXP_DATE} / Build #${LAMEXP_BUILD}"
Name "Simple x264 Launcher [Build #${X264_BUILD}]"
OutFile "${X264_OUTPUT_FILE}"
BrandingText "${X264_DATE} / Build #${X264_BUILD}"
Icon "${NSISDIR}\Contrib\Graphics\Icons\orange-install.ico"
ChangeUI all "${NSISDIR}\Contrib\UIs\sdbarker_tiny.exe"
ShowInstDetails show
@ -94,7 +85,7 @@ SubCaption 4 " "
;Compressor
;--------------------------------
!packhdr "$%TEMP%\exehead.tmp" '"${LAMEXP_UPX_PATH}\upx.exe" --brute "$%TEMP%\exehead.tmp"'
!packhdr "$%TEMP%\exehead.tmp" '"${X264_UPX_PATH}\upx.exe" --brute "$%TEMP%\exehead.tmp"'
;--------------------------------
@ -109,19 +100,19 @@ ReserveFile "${NSISDIR}\Plugins\StdUtils.dll"
;Version Info
;--------------------------------
!searchreplace PRODUCT_VERSION_DATE "${LAMEXP_DATE}" "-" "."
VIProductVersion "${PRODUCT_VERSION_DATE}.${LAMEXP_BUILD}"
!searchreplace PRODUCT_VERSION_DATE "${X264_DATE}" "-" "."
VIProductVersion "${PRODUCT_VERSION_DATE}.${X264_BUILD}"
VIAddVersionKey "Author" "LoRd_MuldeR <mulder2@gmx.de>"
VIAddVersionKey "Comments" "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version."
VIAddVersionKey "CompanyName" "Free Software Foundation"
VIAddVersionKey "FileDescription" "LameXP v${LAMEXP_VERSION} ${LAMEXP_INSTTYPE}-${LAMEXP_PATCH} [Build #${LAMEXP_BUILD}]"
VIAddVersionKey "FileVersion" "${PRODUCT_VERSION_DATE}.${LAMEXP_BUILD} (${LAMEXP_VERSION})"
VIAddVersionKey "LegalCopyright" "Copyright 2004-2012 LoRd_MuldeR"
VIAddVersionKey "FileDescription" "Simple x264 Launcher [Build #${X264_BUILD}]"
VIAddVersionKey "FileVersion" "${PRODUCT_VERSION_DATE}.${X264_BUILD}"
VIAddVersionKey "LegalCopyright" "Copyright 2004-2013 LoRd_MuldeR"
VIAddVersionKey "LegalTrademarks" "GNU"
VIAddVersionKey "OriginalFilename" "LameXP.${LAMEXP_DATE}.Build-${LAMEXP_BUILD}.exe"
VIAddVersionKey "ProductName" "LameXP - Audio Encoder Frontend"
VIAddVersionKey "ProductVersion" "${LAMEXP_VERSION}, Build #${LAMEXP_BUILD} (${LAMEXP_DATE})"
VIAddVersionKey "OriginalFilename" "x264_x64.${X264_DATE}.exe"
VIAddVersionKey "ProductName" "Simple x264 Launcher"
VIAddVersionKey "ProductVersion" "Build #${X264_BUILD} (${X264_DATE})"
VIAddVersionKey "Website" "${MyWebSite}"
@ -138,13 +129,12 @@ Section "-LaunchTheInstaller"
SetOutPath "$PLUGINSDIR"
SetOverwrite on
File "/oname=${InstallerFileName}" "${LAMEXP_SOURCE_FILE}"
File "/oname=${InstallerFileName}" "${X264_SOURCE_FILE}"
; --------
${If} "$EXEFILE" == "LameXP.exe"
${OrIf} "$EXEFILE" == "LameXP-Portable.exe"
MessageBox MB_ICONSTOP|MB_TOPMOST "Sorry, you must NOT rename the LameXP installation program to 'LameXP.exe' or 'LameXP-Portable.exe'. Please re-rename the installer executable file (e.g. to 'LameXP-Setup.exe') and then try again!"
${If} "$EXEFILE" == "x264_launcher.exe"
MessageBox MB_ICONSTOP|MB_TOPMOST "Sorry, you must NOT rename the installation program to 'x264_launcher.exe'. Please re-rename the installer executable file (e.g. to 'x264_x64-Setup.exe') and then try again!"
Quit
${EndIf}
@ -161,7 +151,7 @@ Section "-LaunchTheInstaller"
${Do}
SetOverwrite ifdiff
File "/oname=${InstallerFileName}" "${LAMEXP_SOURCE_FILE}"
File "/oname=${InstallerFileName}" "${X264_SOURCE_FILE}"
DetailPrint "ExecShellWait: ${InstallerFileName}"
${StdUtils.ExecShellWaitEx} $R1 $R2 "${InstallerFileName}" "open" '$R9'
@ -187,7 +177,7 @@ Section "-LaunchTheInstaller"
DetailPrint "Installer not launched yet, trying fallback mode!"
SetOverwrite ifdiff
File "/oname=${InstallerFileName}" "${LAMEXP_SOURCE_FILE}"
File "/oname=${InstallerFileName}" "${X264_SOURCE_FILE}"
ClearErrors
ExecShell "open" "${InstallerFileName}" '$R9' SW_SHOWNORMAL