Makefile.am: fixed EXTRA_DIST for MacOS X plugin

[vlc] / vlc.win32.nsi.in

diff --git a/vlc.win32.nsi.in b/vlc.win32.nsi.in
index b342b79c858e88c6a30ca36cc35fb2eeb6122144..8abc5cec79c9b488fc661cb06cbfc6ca8ef7dff7 100644 (file)
--- a/vlc.win32.nsi.in
+++ b/vlc.win32.nsi.in
@@ -256,6 +256,16 @@ FunctionEnd
 \r
 Var UninstallLog\r
 \r
+!macro OpenUninstallLog\r
+  FileOpen $UninstallLog "$INSTDIR\uninstall.log" w\r
+  FileSeek $UninstallLog 0 END\r
+!macroend\r
+\r
+!macro CloseUninstallLog\r
+  FileClose $UninstallLog\r
+  SetFileAttributes "$INSTDIR\uninstall.log" HIDDEN\r
+!macroend\r
+\r
 !macro InstallFile FILEREGEX\r
   File "${FILEREGEX}"\r
   !define Index 'Line${__LINE__}'\r
@@ -312,8 +322,7 @@ Section "Media player (required)" SEC01
   SetShellVarContext all\r
   SetOutPath "$INSTDIR"\r
 \r
-  FileOpen $UninstallLog "$INSTDIR\uninstall.log" w\r
-  FileSeek $UninstallLog 0 END\r
+  !insertmacro OpenUninstallLog\r
 \r
   !insertmacro InstallFile vlc.exe\r
   !insertmacro InstallFile vlc.exe.manifest\r
@@ -333,8 +342,7 @@ Section "Media player (required)" SEC01
     "${PRODUCT_WEB_SITE}/doc/"\r
   FileWrite $UninstallLog "Documentation.url$\r$\n"\r
 \r
-  FileClose $UninstallLog\r
-  SetFileAttributes "$INSTDIR\uninstall.log" HIDDEN\r
+  !insertmacro CloseUninstallLog\r
 \r
   ; Add VLC to "recomended programs" for the following extensions\r
   WriteRegStr HKCR Applications\vlc.exe "" ""\r
@@ -402,7 +410,10 @@ SectionEnd
 \r
 Section /o "Mozilla plugin" SEC03\r
   SectionIn 2 3\r
-  File /r mozilla\r
+\r
+  !insertmacro OpenUninstallLog\r
+  !insertmacro InstallFolder mozilla\r
+  !insertmacro CloseUninstallLog\r
 \r
   ; doesn't work. bug in mozilla/mozilla firefox or moz documentation (xpt file isn't loaded)\r
   ; see mozilla bugs 184506 and 159445\r
@@ -441,12 +452,14 @@ SectionEnd
 Section "ActiveX plugin" SEC04\r
   SectionIn 2 3\r
   SetOutPath "$INSTDIR"\r
-  File activex\axvlc.dll\r
+  !insertmacro OpenUninstallLog\r
+  !insertmacro InstallFile activex\axvlc.dll\r
+  !insertmacro CloseUninstallLog\r
   RegDLL "$INSTDIR\axvlc.dll"\r
 SectionEnd\r
 \r
 Section "Context Menus" SEC05\r
-  SectionIn 2 3\r
+  SectionIn 2\r
   !insertmacro MacroAllExtensions AddContextMenu\r
   !insertmacro AddContextMenu "Directory"\r
 SectionEnd\r
@@ -663,6 +676,7 @@ Section "Uninstall" SEC91
 SectionEnd\r
 \r
 Section /o "un.Delete preferences and cache" SEC92\r
+  SectionIn 2 3 RO\r
   !insertmacro delprefs\r
 SectionEnd\r
 \r