X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=install-win32;h=91dec7758c19f3170c22601731b678e92fb67373;hb=a7a66d7a5de8f36f2561445b4a99956202ac9913;hp=eaefb9bd8cc132aaca7326944bcd274c4bcb22d7;hpb=a264d0321011bd88241f53eb7f02052f4a6e609d;p=vlc

diff --git a/install-win32 b/install-win32
index eaefb9bd8c..91dec7758c 100644
--- a/install-win32
+++ b/install-win32
@@ -1,13 +1,16 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ; NSIS installer script for vlc ;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; written by Pierre Baillet <oct@zoy.org> 29/7/01 v0.2
-; modifications by Samuel Hocevar <sam@zoy.org> 12/11/01
 
 ;;;;;;;;;;;;;
 ; CHANGELOG ;
 ;;;;;;;;;;;;;
+; modifications by Samuel Hocevar <sam@zoy.org> 05 Apr 2002
+; . no need for @VERSION@ anymore
+; . updated script for NSIS 1.96.
+; modifications by Samuel Hocevar <sam@zoy.org> 12 Nov 2001
 ; . removed version information.
+; written by Pierre Baillet <oct@zoy.org> 29 Jul 2001 v0.2
 ; . lists all installed files so as to prevent installer.nsi to be included
 ;   in the release.
 ; . really remove the shortcuts.
@@ -17,14 +20,15 @@
 ; General configuration ;
 ;;;;;;;;;;;;;;;;;;;;;;;;;
 
-OutFile vlc-@VERSION@.exe
+OutFile ..\vlc-${VERSION}-win32.exe
+
 Name "the VideoLAN Client"
-Caption "vlc @VERSION@ for Win32 Setup"
-;Icon ../share/gvlc_win32.ico
+Caption "VideoLAN Client '${VERSION}' for Win32 Setup"
+;Icon ../share/gvlc32x32.ico
 
 CRCCheck on
 
-InstallDir $PROGRAMFILES\vlc
+InstallDir "$PROGRAMFILES\VideoLAN\VideoLAN Client"
 ; check if the program has already been installed, if so, take this dir
 ; as install dir
 InstallDirRegKey HKLM SOFTWARE\VideoLAN\VLC "Install_Dir"
@@ -33,15 +37,13 @@ DirText "Choose a directory to install in to:"
 AutoCloseWindow false
 ShowInstDetails show
 
-; uninstall stuff
-UninstallText "This will uninstall the VideoLAN Client. Hit next to continue."
-UninstallExeName "vlc-uninst.exe"
-
 SetOverwrite ifnewer
 SetDatablockOptimize on
 SetDateSave off
 SetCompress auto
 
+UninstallText "This will uninstall the VideoLAN Client. Hit next to continue."
+
 ;;;;;;;;;;;;;;;;;;;;
 ; Install settings ;
 ;;;;;;;;;;;;;;;;;;;;
@@ -50,37 +52,19 @@ Section "Install"
 	SetOutPath $INSTDIR
 
 	File  vlc.exe
-	File  directx.so
-	File  gtk.so
-	File  sdl.so
-
-	File  INSTALL-win32.txt
-	File  AUTHORS
-	File  COPYING
-	File  ChangeLog
-	File  ChangeLog.libdvdcss
-	File  README
-	File  README.libdvdcss
-	File  FAQ
-	File  TODO
-
-	File  SDL.dll
-	File  gtk-1.3.dll
-	File  gdk-1.3.dll
-	File  glib-1.3.dll
-	File  gmodule-1.3.dll
-	File  gnu-intl.dll
-
-	;File  README-GTK.txt
-	File  README-SDL.txt
+	File  *.txt
 
 	File  /r share
+	File  /r plugins
 
 	CreateDirectory "$SMPROGRAMS\VideoLAN"
-	CreateShortCut "$SMPROGRAMS\VideoLAN\vlc_@VERSION@.lnk" "$INSTDIR\vlc.exe" 
-	CreateShortCut "$SMPROGRAMS\VideoLAN\Uninstall VLC.lnk" "$INSTDIR\vlc-uninst.exe"
+	CreateShortCut "$SMPROGRAMS\VideoLAN\vlc.lnk" "$INSTDIR\vlc.exe" 
+	CreateShortCut "$SMPROGRAMS\VideoLAN\Uninstall VLC.lnk" "$INSTDIR\uninstall.exe"
+	WriteUninstaller "uninstall.exe"
+
 	WriteRegStr HKLM SOFTWARE\VideoLAN\VLC "Install_Dir" $INSTDIR
-	WriteRegStr HKLM SOFTWARE\VideoLAN\VLC "version" "@VERSION@"
+	WriteRegStr HKLM SOFTWARE\VideoLAN\VLC "version" "${VERSION}"
+
 	Exec "explorer $SMPROGRAMS\VideoLAN\"
 SectionEnd
 
@@ -93,6 +77,8 @@ Section "Uninstall"
 	RMDir $SMPROGRAMS\VideoLAN
 	Delete $INSTDIR\share\*
 	RMDir $INSTDIR\share
+	Delete $INSTDIR\plugins\*
+	RMDir $INSTDIR\plugins
 	Delete $INSTDIR\*
 	RMDir $INSTDIR
 	DeleteRegKey HKLM SOFTWARE\VideoLAN