X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=install-win32;h=dacd516cc4f6b709c5229d8dd76a746013b5bfaf;hb=a826dc3e0deb30ebd57140cef90f7fb3844afd6c;hp=0106100989f598742e366f1d9640896061c60a60;hpb=d0a61d5a12fad5bd500b9d7e2c88efb772cae510;p=vlc

diff --git a/install-win32 b/install-win32
index 0106100989..dacd516cc4 100644
--- a/install-win32
+++ b/install-win32
@@ -5,8 +5,10 @@
 ;;;;;;;;;;;;;
 ; 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> 6 Jul 2003
+; . Start menu shortcuts now created in the "All Users" section.
+; modifications by Gildas Bazin <gbazin@netcourrier.com> 6 Apr 2003
+; . added shortcut to the skins interface, added the default skin.
 ; modifications by Gildas Bazin <gbazin@netcourrier.com> 26 Feb 2003
 ; . added the locale directory.
 ; modifications by Samuel Hocevar <sam@zoy.org> 05 Apr 2002
@@ -25,6 +27,7 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;
 
 OutFile ..\vlc-${VERSION}-win32.exe
+SetCompressor bzip2
 
 Name "VLC media player"
 Caption "VLC '${VERSION}' for Win32 Setup"
@@ -33,6 +36,7 @@ Caption "VLC '${VERSION}' for Win32 Setup"
 CRCCheck on
 
 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"
@@ -46,7 +50,7 @@ SetDatablockOptimize on
 SetDateSave off
 SetCompress auto
 
-UninstallText "This will uninstall the VLC media player. Hit next to continue."
+UninstallText "This will uninstall the VLC media player."
 
 ;;;;;;;;;;;;;;;;;;;;
 ; Install settings ;
@@ -56,20 +60,37 @@ Section "Install"
 	SetOutPath $INSTDIR
 
 	File  vlc.exe
+	File  vlc.exe.manifest
 	File  *.txt
 
-	File  /r share
 	File  /r plugins
 	File  /r locale
+	File  /r skins
+	File  /r http
+	File  /r mozilla
+
+        SetShellVarContext all
 
 	CreateDirectory "$SMPROGRAMS\VideoLAN"
-	CreateShortCut "$SMPROGRAMS\VideoLAN\vlc.lnk" "$INSTDIR\vlc.exe" 
-	CreateShortCut "$SMPROGRAMS\VideoLAN\FAQ.lnk" "$INSTDIR\faq.htm"
-	CreateShortCut "$SMPROGRAMS\VideoLAN\Uninstall VLC.lnk" "$INSTDIR\uninstall.exe"
+	CreateShortCut "$SMPROGRAMS\VideoLAN\vlc.lnk" \
+                       "$INSTDIR\vlc.exe" "--intf wxwin"
+	CreateShortCut "$SMPROGRAMS\VideoLAN\vlc (skins).lnk" \
+                       "$INSTDIR\vlc.exe" "--intf skins"
+
+        WriteRegStr HKLM \
+            SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\VideoLAN \
+            "DisplayName" "VideoLAN VLC media player ${VERSION}"
+        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 "InstallDir" $INSTDIR
+	WriteRegStr HKLM SOFTWARE\VideoLAN\VLC "Version" "${VERSION}"
+
+        WriteRegStr HKLM \
+            SOFTWARE\MozillaPlugins\@videolan.org/vlc,version=${VERSION} \
+            "Path" '"$INSTDIR\mozilla\npvlc.dll"'
 
 	Exec "explorer $SMPROGRAMS\VideoLAN\"
 SectionEnd
@@ -79,16 +100,13 @@ SectionEnd
 ;;;;;;;;;;;;;;;;;;;;;;
 
 Section "Uninstall"
-	Delete $SMPROGRAMS\VideoLAN\*
-	RMDir $SMPROGRAMS\VideoLAN
-	Delete $INSTDIR\share\*
-	RMDir $INSTDIR\share
-	Delete $INSTDIR\plugins\*
-	RMDir $INSTDIR\plugins
-	Delete $INSTDIR\locale\*
-	RMDir $INSTDIR\locale
-	Delete $INSTDIR\*
-	RMDir $INSTDIR
+        SetShellVarContext all
+	RMDir /r $SMPROGRAMS\VideoLAN
+	RMDir /r $INSTDIR
 	DeleteRegKey HKLM SOFTWARE\VideoLAN
-SectionEnd
+        DeleteRegKey HKLM \
+            SOFTWARE\MozillaPlugins\@videolan.org/vlc,version=${VERSION}
 
+        DeleteRegKey HKLM \
+            Software\Microsoft\Windows\CurrentVersion\Uninstall\VideoLAN
+SectionEnd