Commit 629d9dda authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

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

- Also include the inf in the distribution
parent 2d38c37c
......@@ -48,6 +48,7 @@ DIST_rsrc = \
DIST_misc = \
README.TXT \
axvlc.inf.in \
axvlc.def \
axvlc.idl \
axvlc.tlb \
......
......@@ -5,19 +5,19 @@
AdvancedINF=2.0
[Add.Code]
vlc-0.8.2-win32.exe
vlc-@VERSION@-win32.exe
axvlc.dll=axvlc.dll
[axvlc.dll]
FileVersion=0,8,2,0
FileVersion=@VERSION32@
clsid={E23FE9C6-778E-49d4-B537-38FCDE4887D8}
RegisterServer=no
hook=nsiinstaller
[vlc-0.8.2-win32.exe]
FileVersion=0,8,2,0
[vlc-@VERSION@-win32.exe]
FileVersion=@VERSION32@
file-win32-x86=thiscab
[nsiinstaller]
run=%EXTRACT_DIR%\vlc-0.8.2-win32.exe
run=%EXTRACT_DIR%\vlc-@VERSION@-win32.exe
......@@ -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
......
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