* ./modules/access/dvdplay/intf.c: added a sanity check upon initialization

[vlc] / install-win32

diff --git a/install-win32 b/install-win32
index 4a0a144ec6bbfe36f863c4f9fa65b0cadee7478d..91dec7758c19f3170c22601731b678e92fb67373 100644 (file)
--- a/install-win32
+++ b/install-win32
@@ -1,26 +1,34 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;\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 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
 ; . added an exec command to display the program file folder. (grOovy)\r
 \r
-OutFile vlc-@VERSION@.exe\r
+;;;;;;;;;;;;;;;;;;;;;;;;;\r
+; General configuration ;\r
+;;;;;;;;;;;;;;;;;;;;;;;;;\r
+\r
+OutFile ..\vlc-${VERSION}-win32.exe\r
+\r
 Name "the VideoLAN Client"\r
-Caption "vlc @VERSION@ for Win32 Setup"\r
-;Icon ../share/gvlc_win32.ico\r
+Caption "VideoLAN Client '${VERSION}' for Win32 Setup"\r
+;Icon ../share/gvlc32x32.ico\r
 \r
 CRCCheck on\r
 \r
-InstallDir $PROGRAMFILES\vlc\r
+InstallDir "$PROGRAMFILES\VideoLAN\VideoLAN Client"\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
@@ -29,58 +37,48 @@ 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 VideoLAN Client. Hit next to continue."\r
+\r
+;;;;;;;;;;;;;;;;;;;;\r
+; Install settings ;\r
+;;;;;;;;;;;;;;;;;;;;\r
+\r
 Section "Install"\r
        SetOutPath $INSTDIR\r
 \r
        File  vlc.exe\r
-       File  directx.so\r
-       File  gtk.so\r
-       File  sdl.so\r
-\r
-       File  INSTALL-win32.txt\r
-       File  AUTHORS\r
-       File  COPYING\r
-       File  ChangeLog\r
-       File  ChangeLog.libdvdcss\r
-       File  README\r
-       File  README.libdvdcss\r
-       File  FAQ\r
-       File  TODO\r
-\r
-       File  SDL.dll\r
-       File  gtk-1.3.dll\r
-       File  gdk-1.3.dll\r
-       File  glib-1.3.dll\r
-       File  gmodule-1.3.dll\r
-       File  gnu-intl.dll\r
-\r
-       ;File  README-GTK.txt\r
-       File  README-SDL.txt\r
+       File  *.txt\r
 \r
        File  /r share\r
+       File  /r plugins\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" "$INSTDIR\vlc.exe" \r
+       CreateShortCut "$SMPROGRAMS\VideoLAN\Uninstall VLC.lnk" "$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
+;;;;;;;;;;;;;;;;;;;;;;\r
+; Uninstall settings ;\r
+;;;;;;;;;;;;;;;;;;;;;;\r
+\r
 Section "Uninstall"\r
        Delete $SMPROGRAMS\VideoLAN\*\r
        RMDir $SMPROGRAMS\VideoLAN\r
        Delete $INSTDIR\share\*\r
        RMDir $INSTDIR\share\r
+       Delete $INSTDIR\plugins\*\r
+       RMDir $INSTDIR\plugins\r
        Delete $INSTDIR\*\r
        RMDir $INSTDIR\r
        DeleteRegKey HKLM SOFTWARE\VideoLAN\r