* modules/gui/macosx/playlist.m: 10.1 is archaic. i don't know why i bother ;)

[vlc] / install-win32

diff --git a/install-win32 b/install-win32
index 10183afe69a536c171f046db38ec2277ea73f87a..6a065905956cb22b9cb0d9498250102689a4773f 100644 (file)
--- a/install-win32
+++ b/install-win32
@@ -1,13 +1,20 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;\r
 ; NSIS installer script for vlc ;\r
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;\r
-; written by Pierre Baillet <oct@zoy.org> 29/7/01 v0.2\r
-; modifications by Samuel Hocevar <sam@zoy.org> 12/11/01\r
 \r
 ;;;;;;;;;;;;;\r
 ; CHANGELOG ;\r
 ;;;;;;;;;;;;;\r
+; modifications by Gildas Bazin <gbazin@netcourrier.com> 01 Mar 2003\r
+; . added a shortcut to the faq in the menu.\r
+; modifications by Gildas Bazin <gbazin@netcourrier.com> 26 Feb 2003\r
+; . added the locale directory.\r
+; modifications by Samuel Hocevar <sam@zoy.org> 05 Apr 2002\r
+; . no need for @VERSION@ anymore\r
+; . updated script for NSIS 1.96.\r
+; modifications by Samuel Hocevar <sam@zoy.org> 12 Nov 2001\r
 ; . removed version information.\r
+; written by Pierre Baillet <oct@zoy.org> 29 Jul 2001 v0.2\r
 ; . lists all installed files so as to prevent installer.nsi to be included\r
 ;   in the release.\r
 ; . really remove the shortcuts.\r
@@ -17,14 +24,17 @@
 ; General configuration ;\r
 ;;;;;;;;;;;;;;;;;;;;;;;;;\r
 \r
-OutFile vlc-@VERSION@.exe\r
-Name "the VideoLAN Client"\r
-Caption "vlc @VERSION@ for Win32 Setup"\r
-;Icon ../share/gvlc_win32.ico\r
+OutFile ..\vlc-${VERSION}-win32.exe\r
+SetCompressor bzip2\r
+\r
+Name "VLC media player"\r
+Caption "VLC '${VERSION}' for Win32 Setup"\r
+;Icon ../share/gvlc32x32.ico\r
 \r
 CRCCheck on\r
 \r
-InstallDir $PROGRAMFILES\vlc\r
+InstallDir "$PROGRAMFILES\VideoLAN\VLC"\r
+\r
 ; check if the program has already been installed, if so, take this dir\r
 ; as install dir\r
 InstallDirRegKey HKLM SOFTWARE\VideoLAN\VLC "Install_Dir"\r
@@ -33,15 +43,13 @@ DirText "Choose a directory to install in to:"
 AutoCloseWindow false\r
 ShowInstDetails show\r
 \r
-; uninstall stuff\r
-UninstallText "This will uninstall the VideoLAN Client. Hit next to continue."\r
-UninstallExeName "vlc-uninst.exe"\r
-\r
 SetOverwrite ifnewer\r
 SetDatablockOptimize on\r
 SetDateSave off\r
 SetCompress auto\r
 \r
+UninstallText "This will uninstall the VLC media player."\r
+\r
 ;;;;;;;;;;;;;;;;;;;;\r
 ; Install settings ;\r
 ;;;;;;;;;;;;;;;;;;;;\r
@@ -50,17 +58,32 @@ Section "Install"
        SetOutPath $INSTDIR\r
 \r
        File  vlc.exe\r
-       File  *.so\r
-       File  *.dll\r
        File  *.txt\r
 \r
        File  /r share\r
+       File  /r plugins\r
+       File  /r locale\r
+       File  /r skins\r
 \r
        CreateDirectory "$SMPROGRAMS\VideoLAN"\r
-       CreateShortCut "$SMPROGRAMS\VideoLAN\vlc_@VERSION@.lnk" "$INSTDIR\vlc.exe" \r
-       CreateShortCut "$SMPROGRAMS\VideoLAN\Uninstall VLC.lnk" "$INSTDIR\vlc-uninst.exe"\r
+       CreateShortCut "$SMPROGRAMS\VideoLAN\vlc.lnk" \\r
+                       "$INSTDIR\vlc.exe" "--intf wxwin"\r
+       CreateShortCut "$SMPROGRAMS\VideoLAN\vlc (skins).lnk" \\r
+                       "$INSTDIR\vlc.exe" "--intf skins"\r
+       CreateShortCut "$SMPROGRAMS\VideoLAN\vlc (custom).lnk" \\r
+                       "$INSTDIR\vlc.exe" \r
+\r
+        WriteRegStr HKLM \\r
+            SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\VideoLAN \\r
+            "DisplayName" "VideoLAN VLC media player"\r
+        WriteRegStr HKLM \\r
+            SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\VideoLAN \\r
+            "UninstallString" '"$INSTDIR\uninstall.exe"'\r
+       WriteUninstaller "uninstall.exe"\r
+\r
        WriteRegStr HKLM SOFTWARE\VideoLAN\VLC "Install_Dir" $INSTDIR\r
-       WriteRegStr HKLM SOFTWARE\VideoLAN\VLC "version" "@VERSION@"\r
+       WriteRegStr HKLM SOFTWARE\VideoLAN\VLC "version" "${VERSION}"\r
+\r
        Exec "explorer $SMPROGRAMS\VideoLAN\"\r
 SectionEnd\r
 \r
@@ -69,12 +92,9 @@ SectionEnd
 ;;;;;;;;;;;;;;;;;;;;;;\r
 \r
 Section "Uninstall"\r
-       Delete $SMPROGRAMS\VideoLAN\*\r
-       RMDir $SMPROGRAMS\VideoLAN\r
-       Delete $INSTDIR\share\*\r
-       RMDir $INSTDIR\share\r
-       Delete $INSTDIR\*\r
-       RMDir $INSTDIR\r
+       RMDir /r $SMPROGRAMS\VideoLAN\r
+       RMDir /r $INSTDIR\r
        DeleteRegKey HKLM SOFTWARE\VideoLAN\r
+        DeleteRegKey HKLM \\r
+            Software\Microsoft\Windows\CurrentVersion\Uninstall\VideoLAN\r
 SectionEnd\r
-\r