Commit b15f35e7 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Win32: minor fixes to the installer

parent 83ab5425
...@@ -9,8 +9,8 @@ ...@@ -9,8 +9,8 @@
!define VERSION @VERSION@ !define VERSION @VERSION@
!define PRODUCT_VERSION @VERSION@ !define PRODUCT_VERSION @VERSION@
!define PRODUCT_GROUP "VideoLAN" !define PRODUCT_GROUP "VideoLAN"
!define PRODUCT_PUBLISHER "VideoLAN Team" !define PRODUCT_PUBLISHER "VideoLAN"
!define PRODUCT_WEB_SITE "http://www.videolan.org" !define PRODUCT_WEB_SITE "http://www.videolan.org/"
!define PRODUCT_DIR_REGKEY "Software\VideoLAN\VLC" !define PRODUCT_DIR_REGKEY "Software\VideoLAN\VLC"
!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
!define PRODUCT_UNINST_ROOT_KEY "HKLM" !define PRODUCT_UNINST_ROOT_KEY "HKLM"
...@@ -91,10 +91,10 @@ RequestExecutionLevel user ...@@ -91,10 +91,10 @@ RequestExecutionLevel user
!define MUI_FINISHPAGE_RUN !define MUI_FINISHPAGE_RUN
!define MUI_FINISHPAGE_RUN_FUNCTION AppRunAs !define MUI_FINISHPAGE_RUN_FUNCTION AppRunAs
!define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\README.txt"
!define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED
!define MUI_FINISHPAGE_LINK $Link_VisitWebsite !define MUI_FINISHPAGE_LINK $Link_VisitWebsite
!define MUI_FINISHPAGE_LINK_LOCATION "http://www.videolan.org/vlc/" !define MUI_FINISHPAGE_LINK_LOCATION "http://www.videolan.org/vlc/"
!define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\README.txt"
!define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED
!define MUI_FINISHPAGE_NOREBOOTSUPPORT !define MUI_FINISHPAGE_NOREBOOTSUPPORT
!insertmacro MUI_PAGE_FINISH !insertmacro MUI_PAGE_FINISH
...@@ -532,42 +532,13 @@ Section /o $Name_Section03 SEC03 ...@@ -532,42 +532,13 @@ Section /o $Name_Section03 SEC03
WriteRegStr HKLM ${Moz} "Product" "VLC media player" WriteRegStr HKLM ${Moz} "Product" "VLC media player"
WriteRegStr HKLM ${Moz} "Vendor" "VideoLAN" WriteRegStr HKLM ${Moz} "Vendor" "VideoLAN"
WriteRegStr HKLM ${Moz} "Version" "${VERSION}" WriteRegStr HKLM ${Moz} "Version" "${VERSION}"
; for very old version of mozilla, these lines may be needed
;Push $R0
;Push $R1
;Push $R2
;!define Index 'Line${__LINE__}'
;StrCpy $R1 "0"
;"${Index}-Loop:"
; ; Check for Key
; EnumRegKey $R0 HKLM "SOFTWARE\Mozilla" "$R1"
; StrCmp $R0 "" "${Index}-End"
; IntOp $R1 $R1 + 1
; ReadRegStr $R2 HKLM "SOFTWARE\Mozilla\$R0\Extensions" "Plugins"
; StrCmp $R2 "" "${Index}-Loop" ""
; CopyFiles "$INSTDIR\npvlc.dll" "$R2"
; !ifdef LIBVLC_DLL
; CopyFiles ${LIBVLC_DLL} "$R2"
; !endif
; !ifdef LIBVLC_CONTROL_DLL
; CopyFiles ${LIBVLC_CONTROL_DLL} "$R2"
; !endif
; Goto "${Index}-Loop"
;"${Index}-End:"
;!undef Index
SectionEnd SectionEnd
!endif !endif
!ifdef INSTALL_ACTIVEX !ifdef INSTALL_ACTIVEX
Section $Name_Section04 SEC04 Section $Name_Section04 SEC04
SectionIn 3 SectionIn 3
SetOutPath "$INSTDIR" SetOutPath "$INSTDIR"
!insertmacro OpenUninstallLog !insertmacro OpenUninstallLog
!insertmacro InstallFile activex\axvlc.dll !insertmacro InstallFile activex\axvlc.dll
...@@ -749,6 +720,7 @@ FunctionEnd ...@@ -749,6 +720,7 @@ FunctionEnd
Function .OnInstSuccess Function .OnInstSuccess
UAC::Unload UAC::Unload
FunctionEnd FunctionEnd
;; End function ;; End function
Section -Post Section -Post
WriteUninstaller "$INSTDIR\uninstall.exe" WriteUninstaller "$INSTDIR\uninstall.exe"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment