• R/O
  • HTTP
  • SSH
  • HTTPS

x264-launcher: Commit

Simple x264 Launcher development repository


Commit MetaInfo

Revision621f7bca2e8f47bb483acdb7e2ea84711a28a0d2 (tree)
Time2014-08-16 22:53:27
Authorlordmulder <mulder2@gmx....>
Commiterlordmulder

Log Message

Some more installer fixes/tweaks.

Change Summary

Incremental Difference

--- a/etc/setup/setup.nsi
+++ b/etc/setup/setup.nsi
@@ -406,22 +406,14 @@ SectionEnd
406406 Section "!Install Files"
407407 !insertmacro PrintProgress "$(X264_LANG_STATUS_INSTFILES)"
408408
409- ; Clean up an existing installation
409+ ; Clean up leftover from an existing installation
410410 Delete `$INSTDIR\*.exe`
411411 Delete `$INSTDIR\*.dll`
412412 Delete `$INSTDIR\*.txt`
413413 Delete `$INSTDIR\*.html`
414- Delete `$INSTDIR\toolset\*.exe`
415- Delete `$INSTDIR\toolset\*.dll`
416- Delete `$INSTDIR\toolset\x86\*.exe`
417- Delete `$INSTDIR\toolset\x86\*.dll`
418- Delete `$INSTDIR\toolset\x64\*.exe`
419- Delete `$INSTDIR\toolset\x64\*.dll`
420- Delete `$INSTDIR\toolset\common\*.exe`
421- Delete `$INSTDIR\toolset\common\*.dll`
422- Delete `$INSTDIR\toolset\common\*.gpg`
423- Delete `$INSTDIR\imageformats\*.exe`
424- Delete `$INSTDIR\imageformats\*.dll`
414+ RMDir /r `$INSTDIR\toolset`
415+ RMDir /r `$INSTDIR\imageformats`
416+ RMDir /r `$INSTDIR\sources`
425417
426418 !insertmacro GetExecutableName $R0
427419
@@ -443,13 +435,13 @@ Section "!Install Files"
443435 File /a `${X264_SOURCE_PATH}\*.html`
444436
445437 SetOutPath "$INSTDIR\imageformats"
446- File /a `${X264_SOURCE_PATH}\imageformats\*.dll`
438+ File /a /r `${X264_SOURCE_PATH}\imageformats\*.*`
447439
448440 SetOutPath "$INSTDIR\toolset"
449441 File /a /r `${X264_SOURCE_PATH}\toolset\*.*`
450442
451443 SetOutPath "$INSTDIR\sources"
452- File /a `${X264_SOURCE_PATH}\sources\*.tar`
444+ File /a /r `${X264_SOURCE_PATH}\sources\*.*`
453445 SectionEnd
454446
455447 Section "-Write Uinstaller"
@@ -476,17 +468,18 @@ Section "-Create Shortcuts"
476468
477469 !insertmacro GetExecutableName $R0
478470
479- CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Simple x264 Launcher.lnk" "$INSTDIR\$R0" "" "$INSTDIR\$R0" 0
480- CreateShortCut "$SMPROGRAMS\$StartMenuFolder\$(X264_LANG_LINK_LICENSE).lnk" "$INSTDIR\LICENSE.txt"
471+ CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Simple x264 Launcher.lnk" "$INSTDIR\$R0" "" "$INSTDIR\$R0" 0
472+ CreateShortCut "$SMPROGRAMS\$StartMenuFolder\$(X264_LANG_LINK_LICENSE).lnk" "$INSTDIR\LICENSE.html"
473+ CreateShortCut "$SMPROGRAMS\$StartMenuFolder\$(X264_LANG_LINK_MANUAL).lnk" "$INSTDIR\README.html"
481474 CreateShortCut "$SMPROGRAMS\$StartMenuFolder\$(X264_LANG_LINK_CHANGELOG).lnk" "$INSTDIR\HISTORY.txt"
482- CreateShortCut "$SMPROGRAMS\$StartMenuFolder\$(X264_LANG_LINK_MANUAL).lnk" "$INSTDIR\README.html"
483475 CreateShortCut "$SMPROGRAMS\$StartMenuFolder\$(X264_LANG_LINK_UNINSTALL).lnk" "$INSTDIR\Uninstall.exe" "" "$INSTDIR\Uninstall.exe" 0
484476
485477 !insertmacro CreateWebLink "$SMPROGRAMS\$StartMenuFolder\MuldeR's Homepage.url" "${MyWebSite}"
486- !insertmacro CreateWebLink "$SMPROGRAMS\$StartMenuFolder\Doom9's Forum.url" "http://forum.doom9.org/"
487- !insertmacro CreateWebLink "$SMPROGRAMS\$StartMenuFolder\x264.com.url" "http://www.x264.com/"
488- !insertmacro CreateWebLink "$SMPROGRAMS\$StartMenuFolder\Avisynth Wiki.url" "http://avisynth.nl/"
489- !insertmacro CreateWebLink "$SMPROGRAMS\$StartMenuFolder\VapourSynth.com.url" "http://www.vapoursynth.com/"
478+ !insertmacro CreateWebLink "$SMPROGRAMS\$StartMenuFolder\Doom9's Forum.url" "http://forum.doom9.org/"
479+ !insertmacro CreateWebLink "$SMPROGRAMS\$StartMenuFolder\x264.com.url" "http://x264.com/"
480+ !insertmacro CreateWebLink "$SMPROGRAMS\$StartMenuFolder\x265.com.url" "http://x265.org/"
481+ !insertmacro CreateWebLink "$SMPROGRAMS\$StartMenuFolder\Avisynth Wiki.url" "http://avisynth.nl/"
482+ !insertmacro CreateWebLink "$SMPROGRAMS\$StartMenuFolder\VapourSynth.com.url" "http://www.vapoursynth.com/"
490483
491484 ${If} ${FileExists} "$SMPROGRAMS\$StartMenuFolder\Simple x264 Launcher.lnk"
492485 ${StdUtils.InvokeShellVerb} $R1 "$SMPROGRAMS\$StartMenuFolder" "Simple x264 Launcher.lnk" ${StdUtils.Const.ISV_PinToTaskbar}
@@ -571,6 +564,8 @@ Section "Uninstall"
571564 Delete /REBOOTOK `$INSTDIR\*.exe`
572565 Delete /REBOOTOK `$INSTDIR\*.dll`
573566 Delete /REBOOTOK `$INSTDIR\*.txt`
567+ Delete /REBOOTOK `$INSTDIR\*.html`
568+
574569 Delete /REBOOTOK `$INSTDIR\toolset\*.exe`
575570 Delete /REBOOTOK `$INSTDIR\toolset\*.dll`
576571 Delete /REBOOTOK `$INSTDIR\toolset\x86\*.exe`
@@ -580,7 +575,9 @@ Section "Uninstall"
580575 Delete /REBOOTOK `$INSTDIR\toolset\common\*.exe`
581576 Delete /REBOOTOK `$INSTDIR\toolset\common\*.dll`
582577 Delete /REBOOTOK `$INSTDIR\toolset\common\*.gpg`
578+
583579 Delete /REBOOTOK `$INSTDIR\imageformats\*.dll`
580+ Delete /REBOOTOK `$INSTDIR\sources\*.*`
584581
585582 RMDir /r /REBOOTOK "$INSTDIR"
586583
--- a/src/version.h
+++ b/src/version.h
@@ -25,8 +25,8 @@
2525
2626 #define VER_X264_MAJOR 2
2727 #define VER_X264_MINOR 4
28-#define VER_X264_PATCH 1
29-#define VER_X264_BUILD 883
28+#define VER_X264_PATCH 2
29+#define VER_X264_BUILD 884
3030
3131 #define VER_X264_PORTABLE_EDITION (0)
3232
Show on old repository browser