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

Some minor installer fixes (README file was not included).

Browse Source
This commit is contained in:
LoRd_MuldeR 2014-08-15 20:21:34 +02:00
parent 68f9abdced
commit 1f281ae4bc
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
etc/setup/setup.nsi
View File

@ -406,6 +406,7 @@ SectionEnd
Section "!Install Files" Section "!Install Files"
!insertmacro PrintProgress "$(X264_LANG_STATUS_INSTFILES)" !insertmacro PrintProgress "$(X264_LANG_STATUS_INSTFILES)"
; Clean up an existing installation
Delete `$INSTDIR\*.exe` Delete `$INSTDIR\*.exe`
Delete `$INSTDIR\*.dll` Delete `$INSTDIR\*.dll`
Delete `$INSTDIR\*.txt` Delete `$INSTDIR\*.txt`
@ -432,10 +433,15 @@ Section "!Install Files"
MessageBox MB_TOPMOST|MB_ICONSTOP|MB_RETRYCANCEL 'Could not delete old "$R0" file. Is program still running?' IDRETRY DeleteOldBinary MessageBox MB_TOPMOST|MB_ICONSTOP|MB_RETRYCANCEL 'Could not delete old "$R0" file. Is program still running?' IDRETRY DeleteOldBinary
Abort "Could not delete old binary!" Abort "Could not delete old binary!"
${EndIf} ${EndIf}
SetOutPath "$INSTDIR" SetOutPath "$INSTDIR"
File /a `/oname=$R0` `${X264_SOURCE_PATH}\x264_launcher.exe` File /a `/oname=$R0` `${X264_SOURCE_PATH}\x264_launcher.exe`
SetOutPath "$INSTDIR"
File /a `${X264_SOURCE_PATH}\*.dll`
File /a `${X264_SOURCE_PATH}\*.txt`
File /a `${X264_SOURCE_PATH}\*.html`
SetOutPath "$INSTDIR\imageformats" SetOutPath "$INSTDIR\imageformats"
File /a `${X264_SOURCE_PATH}\imageformats\*.dll` File /a `${X264_SOURCE_PATH}\imageformats\*.dll`
@ -444,10 +450,6 @@ Section "!Install Files"
SetOutPath "$INSTDIR\sources" SetOutPath "$INSTDIR\sources"
File /a `${X264_SOURCE_PATH}\sources\*.tar` File /a `${X264_SOURCE_PATH}\sources\*.tar`
SetOutPath "$INSTDIR"
File /a `${X264_SOURCE_PATH}\*.dll`
File /a `${X264_SOURCE_PATH}\*.txt`
SectionEnd SectionEnd
Section "-Write Uinstaller" Section "-Write Uinstaller"
@ -475,9 +477,9 @@ Section "-Create Shortcuts"
!insertmacro GetExecutableName $R0 !insertmacro GetExecutableName $R0
CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Simple x264 Launcher.lnk" "$INSTDIR\$R0" "" "$INSTDIR\$R0" 0 CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Simple x264 Launcher.lnk" "$INSTDIR\$R0" "" "$INSTDIR\$R0" 0
CreateShortCut "$SMPROGRAMS\$StartMenuFolder\$(X264_LANG_LINK_LICENSE).lnk" "$INSTDIR\License.txt" CreateShortCut "$SMPROGRAMS\$StartMenuFolder\$(X264_LANG_LINK_LICENSE).lnk" "$INSTDIR\LICENSE.txt"
CreateShortCut "$SMPROGRAMS\$StartMenuFolder\$(X264_LANG_LINK_CHANGELOG).lnk" "$INSTDIR\History.txt" CreateShortCut "$SMPROGRAMS\$StartMenuFolder\$(X264_LANG_LINK_CHANGELOG).lnk" "$INSTDIR\HISTORY.txt"
CreateShortCut "$SMPROGRAMS\$StartMenuFolder\$(X264_LANG_LINK_MANUAL).lnk" "$INSTDIR\ReadMe.txt" CreateShortCut "$SMPROGRAMS\$StartMenuFolder\$(X264_LANG_LINK_MANUAL).lnk" "$INSTDIR\README.html"
CreateShortCut "$SMPROGRAMS\$StartMenuFolder\$(X264_LANG_LINK_UNINSTALL).lnk" "$INSTDIR\Uninstall.exe" "" "$INSTDIR\Uninstall.exe" 0 CreateShortCut "$SMPROGRAMS\$StartMenuFolder\$(X264_LANG_LINK_UNINSTALL).lnk" "$INSTDIR\Uninstall.exe" "" "$INSTDIR\Uninstall.exe" 0
!insertmacro CreateWebLink "$SMPROGRAMS\$StartMenuFolder\MuldeR's Homepage.url" "${MyWebSite}" !insertmacro CreateWebLink "$SMPROGRAMS\$StartMenuFolder\MuldeR's Homepage.url" "${MyWebSite}"
@ -665,5 +667,5 @@ FunctionEnd
Function ShowReadmeFunction Function ShowReadmeFunction
!insertmacro DisableNextButton $R0 !insertmacro DisableNextButton $R0
${StdUtils.ExecShellAsUser} $R1 "$INSTDIR\ReadMe.txt" "open" "" ${StdUtils.ExecShellAsUser} $R1 "$INSTDIR\README.html" "open" ""
FunctionEnd FunctionEnd

2
src/version.h
View File

@ -26,7 +26,7 @@
#define VER_X264_MAJOR 2 #define VER_X264_MAJOR 2
#define VER_X264_MINOR 4 #define VER_X264_MINOR 4
#define VER_X264_PATCH 1 #define VER_X264_PATCH 1
#define VER_X264_BUILD 882 #define VER_X264_BUILD 883
#define VER_X264_PORTABLE_EDITION (0) #define VER_X264_PORTABLE_EDITION (0)