More config.status magic.

[vlc] / extras / package / win32 / vlc.win32.nsi.in

diff --git a/extras/package/win32/vlc.win32.nsi.in b/extras/package/win32/vlc.win32.nsi.in
index d4bca3b136150707085851c39636c58e13717f78..948e3b0a8e325d4dc819f3cbdaa85f8ec596aeb1 100644 (file)
--- a/extras/package/win32/vlc.win32.nsi.in
+++ b/extras/package/win32/vlc.win32.nsi.in
@@ -4,7 +4,8 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 !define PRODUCT_NAME "VLC media player"
-!define PRODUCT_VERSION '0.9.0-git'
+!define VERSION @VERSION@
+!define PRODUCT_VERSION @VERSION@ 
 !define PRODUCT_GROUP "VideoLAN"
 !define PRODUCT_PUBLISHER "VideoLAN Team"
 !define PRODUCT_WEB_SITE "http://www.videolan.org"
@@ -17,14 +18,14 @@
 !define MUI_LANGDLL_REGISTRY_KEY "${PRODUCT_DIR_REGKEY}"
 !define MUI_LANGDLL_REGISTRY_VALUENAME "Language"
 
+@FILE_LIBVLCCORE_DLL@
 @FILE_LIBVLC_DLL@
-@FILE_LIBVLC_CONTROL_DLL@
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;
 ; General configuration ;
 ;;;;;;;;;;;;;;;;;;;;;;;;;
 
-Name "${PRODUCT_GROUP} ${PRODUCT_NAME} ${PRODUCT_VERSION}"
+Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"
 OutFile ..\vlc-${VERSION}-win32.exe
 InstallDir "$PROGRAMFILES\VideoLAN\VLC"
 InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" ""
@@ -383,12 +384,12 @@ Section "Media player (required)" SEC01
   ; VLC.exe, libvlc.dll
   !insertmacro InstallFile vlc.exe
   !insertmacro InstallFile vlc.exe.manifest
+  !ifdef LIBVLCCORE_DLL
+      !insertmacro InstallFile ${LIBVLCCORE_DLL}
+  !endif
   !ifdef LIBVLC_DLL
       !insertmacro InstallFile ${LIBVLC_DLL}
   !endif
-  !ifdef LIBVLC_CONTROL_DLL
-      !insertmacro InstallFile ${LIBVLC_CONTROL_DLL}
-  !endif
 
   ; Text files
   !insertmacro InstallFile *.txt
@@ -400,7 +401,8 @@ Section "Media player (required)" SEC01
   !insertmacro InstallFolder skins
   !insertmacro InstallFolder http
   ;!insertmacro InstallFolder share
-  !insertmacro InstallFolder scripts
+  !insertmacro InstallFolder lua
+  ;!insertmacro InstallFolder scripts
 
   ; URLs
   WriteIniStr "$INSTDIR\${PRODUCT_GROUP} Website.url" "InternetShortcut" "URL" \
@@ -529,14 +531,14 @@ Section /o "Mozilla plugin" SEC03
 
 SectionEnd
 
-Section "ActiveX plugin" SEC04
-  SectionIn 1 3
-  SetOutPath "$INSTDIR"
-  !insertmacro OpenUninstallLog
-  !insertmacro InstallFile activex\axvlc.dll
-  !insertmacro CloseUninstallLog
-  RegDLL "$INSTDIR\axvlc.dll"
-SectionEnd
+;Section "ActiveX plugin" SEC04
+;  SectionIn 1 3
+;  SetOutPath "$INSTDIR"
+;  !insertmacro OpenUninstallLog
+;  !insertmacro InstallFile activex\axvlc.dll
+;  !insertmacro CloseUninstallLog
+;  RegDLL "$INSTDIR\axvlc.dll"
+;SectionEnd
 
 Section "Discs Playback" SEC05
   SectionIn 1 2 3
@@ -605,8 +607,8 @@ SectionEnd
     "Adds icon to your desktop for easy access"
   !insertmacro MUI_DESCRIPTION_TEXT ${SEC03} \
     "The VLC Mozilla and Mozilla Firefox plugin"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SEC04} \
-    "The VLC ActiveX plugin"
+;  !insertmacro MUI_DESCRIPTION_TEXT ${SEC04} \
+;    "The VLC ActiveX plugin"
   !insertmacro MUI_DESCRIPTION_TEXT ${SEC05} \
     "DVD and CD playback registration"
   !insertmacro MUI_DESCRIPTION_TEXT ${SEC06} \