X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=install-win32;h=4a463ea77cdbbce09ffefeb18c84dd05183de33f;hb=69784399879bef522d099d5cf71149aba7d9fc9a;hp=c5fc17e2bab55d1d67088f5c19c323e1f24fef80;hpb=8acfd9b406c4f3f69b6195809fd3f48ce9168c39;p=vlc

diff --git a/install-win32 b/install-win32
index c5fc17e2ba..4a463ea77c 100644
--- a/install-win32
+++ b/install-win32
@@ -1,13 +1,20 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ; 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 Gildas Bazin <gbazin@netcourrier.com> 01 Mar 2003
+; . added a shortcut to the faq in the menu.
+; modifications by Gildas Bazin <gbazin@netcourrier.com> 26 Feb 2003
+; . added the locale directory.
+; 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 +24,17 @@
 ; General configuration ;
 ;;;;;;;;;;;;;;;;;;;;;;;;;
 
-OutFile vlc-@VERSION@.exe
-Name "the VideoLAN Client"
-Caption "vlc @VERSION@ for Win32 Setup"
-;Icon ../share/gvlc_win32.ico
+OutFile ..\vlc-${VERSION}-win32.exe
+SetCompressor bzip2
+
+Name "VLC media player"
+Caption "VLC '${VERSION}' for Win32 Setup"
+;Icon ../share/gvlc32x32.ico
 
 CRCCheck on
 
-InstallDir $PROGRAMFILES\vlc
+InstallDir "$PROGRAMFILES\VideoLAN\VLC"
+
 ; 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 +43,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 VLC media player."
+
 ;;;;;;;;;;;;;;;;;;;;
 ; Install settings ;
 ;;;;;;;;;;;;;;;;;;;;
@@ -50,26 +58,33 @@ Section "Install"
 	SetOutPath $INSTDIR
 
 	File  vlc.exe
-	File  *.so
-	File  *.dll
 	File  *.txt
-
-	File  AUTHORS
-	File  COPYING
-	File  ChangeLog
-	File  ChangeLog.libdvdcss
-	File  README
-	File  README.libdvdcss
-	File  FAQ
-	File  TODO
+	File  *.htm
 
 	File  /r share
+	File  /r plugins
+	File  /r locale
+	File  /r skins
 
 	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\vlc (wxwindows).lnk" \
+                       "$INSTDIR\vlc.exe" "--intf wxwin"
+	CreateShortCut "$SMPROGRAMS\VideoLAN\vlc (skins).lnk" \
+                       "$INSTDIR\vlc.exe" "--intf skins"
+	CreateShortCut "$SMPROGRAMS\VideoLAN\FAQ.lnk" "$INSTDIR\FAQ.htm"
+
+        WriteRegStr HKLM \
+            SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\VideoLAN \
+            "DisplayName" "VideoLAN VLC media player"
+        WriteRegStr HKLM \
+            SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\VideoLAN \
+            "UninstallString" '"$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
 
@@ -78,12 +93,9 @@ SectionEnd
 ;;;;;;;;;;;;;;;;;;;;;;
 
 Section "Uninstall"
-	Delete $SMPROGRAMS\VideoLAN\*
-	RMDir $SMPROGRAMS\VideoLAN
-	Delete $INSTDIR\share\*
-	RMDir $INSTDIR\share
-	Delete $INSTDIR\*
-	RMDir $INSTDIR
+	RMDir /r $SMPROGRAMS\VideoLAN
+	RMDir /r $INSTDIR
 	DeleteRegKey HKLM SOFTWARE\VideoLAN
+        DeleteRegKey HKLM \
+            Software\Microsoft\Windows\CurrentVersion\Uninstall\VideoLAN
 SectionEnd
-