- Automatic versioning info in ActiveX plugin (refs #181)

- Also include the inf in the distribution

diff --git a/activex/Makefile.am b/activex/Makefile.am
index cceef8be1dbe460066017ac390ffab9f3b3e4f6f..55c6221d82ffc3627dcd1d2f0e4dd424005edde1 100644 (file)
--- a/activex/Makefile.am
+++ b/activex/Makefile.am
@@ -48,6 +48,7 @@ DIST_rsrc = \
 
 DIST_misc = \
     README.TXT \
+    axvlc.inf.in \
     axvlc.def \
     axvlc.idl \
     axvlc.tlb \

diff --git a/activex/axvlc.inf b/activex/axvlc.inf.in
similarity index 61%
rename from activex/axvlc.inf
rename to activex/axvlc.inf.in
index 4fd22a199f4f8968a8f7fded8a62e63574cfb39a..a0d1dc588a1577e44245aa983ae6bdcc79175b79 100644 (file)
--- a/activex/axvlc.inf
+++ b/activex/axvlc.inf.in
@@ -5,19 +5,19 @@
   AdvancedINF=2.0\r
 \r
 [Add.Code]\r
-  vlc-0.8.2-win32.exe\r
+  vlc-@VERSION@-win32.exe\r
   axvlc.dll=axvlc.dll\r
 \r
 [axvlc.dll]\r
-  FileVersion=0,8,2,0\r
+  FileVersion=@VERSION32@\r
   clsid={E23FE9C6-778E-49d4-B537-38FCDE4887D8}\r
   RegisterServer=no\r
   hook=nsiinstaller\r
 \r
-[vlc-0.8.2-win32.exe]\r
-  FileVersion=0,8,2,0\r
+[vlc-@VERSION@-win32.exe]\r
+  FileVersion=@VERSION32@\r
   file-win32-x86=thiscab\r
 \r
 [nsiinstaller]\r
-  run=%EXTRACT_DIR%\vlc-0.8.2-win32.exe\r
+  run=%EXTRACT_DIR%\vlc-@VERSION@-win32.exe\r
 \r

diff --git a/configure.ac b/configure.ac
index 89b1b931467622db851b15a147f443668e60dd2a..0037351f6c85546bacdbcc17a2276cf2795e08b1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -4313,7 +4313,7 @@ dnl
 dnl  Stuff used by the program
 dnl
 AC_DEFINE_UNQUOTED(VERSION_MESSAGE, "${VERSION} ${CODENAME}", [Simple version string])
-AC_DEFINE_UNQUOTED(COPYRIGHT_MESSAGE, "VLC media player - version ${VERSION} ${CODENAME} - (c) 1996-2005 VideoLAN", [Copyright string])
+AC_DEFINE_UNQUOTED(COPYRIGHT_MESSAGE, "VLC media player - version ${VERSION} ${CODENAME} - (c) 1996-2005 the VideoLAN team", [Copyright string])
 AC_DEFINE_UNQUOTED(CONFIGURE_LINE, "${CONFIGURE_LINE}", [The ./configure command line])
 
 dnl Old definitions for version-dependant plugins
@@ -4325,6 +4325,9 @@ dnl New definitions with value matching 0.8.2 release
 AC_DEFINE_UNQUOTED(MODULE_SUFFIX, "__0_8_2", [String suffix for module functions])
 AC_DEFINE_UNQUOTED(MODULE_SYMBOL, 0_8_2, [Symbol suffix for module functions])
 
+dnl Version number for ActiveX INF
+VERSION32="`echo -n ${VERSION} | sed -e 's/@<:@a-z\-@:>@//g' | sed -e 'y/./,/'; echo ',0'`"
+AC_SUBST(VERSION32)
 
 DATA_PATH="${ac_tool_prefix}/share/vlc"
 AC_SUBST(DATA_PATH)
@@ -4373,6 +4376,7 @@ VLC_OUTPUT_VLC_CONFIG_IN
 AC_CONFIG_FILES([
   Makefile
   activex/Makefile
+  activex/axvlc.inf
   debian/Makefile
   doc/Makefile
   intl/Makefile