[vlc-commits] commit: win32 nsis script: remove mozilla mentions completely ( Rafaël Carré )

[git at videolan.org]

vlc | branch: master | Rafaël Carré <rafael.carre at gmail.com> | Mon Oct 11 19:57:12 2010 +0200| [e6b29b8fd2bd15dc20300942c849237e9837c716] | committer: Rafaël Carré 

win32 nsis script: remove mozilla mentions completely

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e6b29b8fd2bd15dc20300942c849237e9837c716
---

 extras/package/win32/vlc.win32.nsi.in |   26 --------------------------
 1 files changed, 0 insertions(+), 26 deletions(-)

diff --git a/extras/package/win32/vlc.win32.nsi.in b/extras/package/win32/vlc.win32.nsi.in
index 526e970..9345310 100644
--- a/extras/package/win32/vlc.win32.nsi.in
+++ b/extras/package/win32/vlc.win32.nsi.in
@@ -21,7 +21,6 @@
 !define MUI_LANGDLL_REGISTRY_VALUENAME "Language"
 
 @BUILD_ACTIVEX_TRUE@ !define INSTALL_ACTIVEX
- at BUILD_MOZILLA_TRUE@ !define INSTALL_MOZILLA
 
 @FILE_LIBVLCCORE_DLL@
 @FILE_LIBVLC_DLL@
@@ -601,25 +600,6 @@ Section $Name_Section02b SEC02b
     "$INSTDIR\vlc.exe" ""
 SectionEnd
 
-!ifdef INSTALL_MOZILLA
-Section /o $Name_Section03 SEC03
-  SectionIn 3
-
-  SetOutPath "$INSTDIR"
-  !insertmacro OpenUninstallLog
-  !insertmacro InstallFile npvlc.dll
-  !insertmacro InstallFile npvlc.dll.manifest
-  !insertmacro CloseUninstallLog
-
-  !define Moz "SOFTWARE\MozillaPlugins\@videolan.org/vlc,version=${VERSION}"
-  WriteRegStr HKLM ${Moz} "Description" "VLC Multimedia Plugin"
-  WriteRegStr HKLM ${Moz} "Path" "$INSTDIR\npvlc.dll"
-  WriteRegStr HKLM ${Moz} "Product" "VLC media player"
-  WriteRegStr HKLM ${Moz} "Vendor" "VideoLAN"
-  WriteRegStr HKLM ${Moz} "Version" "${VERSION}"
-SectionEnd
-!endif
-
 !ifdef INSTALL_ACTIVEX
 Section $Name_Section04 SEC04
   SectionIn 3
@@ -753,8 +733,6 @@ SectionEnd
   !insertmacro MUI_DESCRIPTION_TEXT ${SEC01} $Desc_Section01
   !insertmacro MUI_DESCRIPTION_TEXT ${SEC02a} $Desc_Section02a
   !insertmacro MUI_DESCRIPTION_TEXT ${SEC02b} $Desc_Section02b
- at BUILD_MOZILLA_TRUE@ !insertmacro MUI_DESCRIPTION_TEXT ${SEC03} $Desc_Section03
- at BUILD_ACTIVEX_TRUE@ !insertmacro MUI_DESCRIPTION_TEXT ${SEC04} $Desc_Section04
   !insertmacro MUI_DESCRIPTION_TEXT ${SEC05} $Desc_Section05
   !insertmacro MUI_DESCRIPTION_TEXT ${SEC06} $Desc_Section06
   !insertmacro MUI_DESCRIPTION_TEXT ${SEC07} $Desc_Section07
@@ -1042,10 +1020,6 @@ Section "un.$Name_Section91" SEC91
   DeleteRegKey HKCR "VLC.SVCDMovie"
   DeleteRegKey HKCR "VLC.OPENFolder"
 
-
-  DeleteRegKey HKLM \
-    "SOFTWARE\MozillaPlugins\@videolan.org/vlc,version=${VERSION}"
-
   DeleteRegKey HKLM \
     "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"