Commit 3695af46 authored by Christophe Mutricy's avatar Christophe Mutricy
Browse files

macosx: Use autoconf to handle version strings

parent 8e13f257
......@@ -5695,17 +5695,22 @@ AS_IF([test "${SYS}" = "mingw32"], [
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) ${COPYRIGHT_YEARS} the VideoLAN team", [Copyright string])
VERSION_MESSAGE="${VERSION} ${CODENAME}"
COPYRIGHT_MESSAGE="VLC media player - version ${VERSION_MESSAGE} - (c) ${COPYRIGHT_YEARS} the VideoLAN team"
AC_DEFINE_UNQUOTED(VERSION_MESSAGE, "${VERSION_MESSAGE}", [Simple version string])
AC_DEFINE_UNQUOTED(COPYRIGHT_MESSAGE, "${COPYRIGHT_MESSAGE}", [Copyright string])
AC_DEFINE_UNQUOTED(COPYRIGHT_YEARS, "${COPYRIGHT_YEARS}", [The copyright years])
AC_DEFINE_UNQUOTED(CONFIGURE_LINE, "${CONFIGURE_LINE}", [The ./configure command line])
AC_DEFINE_UNQUOTED(PACKAGE_VERSION_MAJOR,"${VERSION_MAJOR}", [version major number])
AC_DEFINE_UNQUOTED(PACKAGE_VERSION_MINOR,"${VERSION_MINOR}", [version minor number])
AC_DEFINE_UNQUOTED(PACKAGE_VERSION_REVISION,"${VERSION_REVISION}", [version minor number])
AC_DEFINE_UNQUOTED(PACKAGE_VERSION_EXTRA,"${VERSION_EXTRA}", [version minor number])
AC_SUBST(COPYRIGHT_MESSAGE)
AC_SUBST(VERSION_MESSAGE)
AC_SUBST(VERSION_MAJOR)
AC_SUBST(VERSION_MINOR)
AC_SUBST(VERSION_REVISION)
AC_SUBST(COPYRIGHT_YEARS)
AC_DEFINE_UNQUOTED(VLC_COMPILE_BY, "`whoami`", [user who ran configure])
if test "${build_os}" = "cygwin"
then
......@@ -5757,6 +5762,11 @@ VLC_OUTPUT_VLC_CONFIG_IN
AC_CONFIG_FILES([
extras/package/win32/vlc.win32.nsi
extras/package/macosx/Info.plist
extras/package/macosx/Resources/English.lproj/About.nib/keyedobjects.nib
extras/package/macosx/Resources/English.lproj/InfoPlist.strings
extras/package/macosx/plugin/Info.plist
extras/package/macosx/plugin/InstallerInfo.plist
Makefile
projects/activex/Makefile
projects/activex/axvlc.inf
......
......@@ -724,7 +724,7 @@
<key>CFBundleExecutable</key>
<string>VLC</string>
<key>CFBundleGetInfoString</key>
<string>VLC media player 0.9.0-test2, Copyright (c) 1996-2008 the VideoLAN Team</string>
<string>@COPYRIGHT_MESSAGE@</string>
<key>CFBundleIconFile</key>
<string>vlc.icns</string>
<key>CFBundleIdentifier</key>
......@@ -736,7 +736,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>0.9.0-test2</string>
<string>@VERSION@</string>
<key>CFBundleSignature</key>
<string>VLC#</string>
<key>CFBundleURLTypes</key>
......@@ -793,7 +793,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>0.9.0-test2</string>
<string>@VERSION@</string>
<key>NSAppleScriptEnabled</key>
<string>YES</string>
<key>NSMainNibFile</key>
......
/* Localized versions of Info.plist keys */
CFBundleName = "VLC";
CFBundleShortVersionString = "0.9.0-test2";
CFBundleGetInfoString = "VLC media player 0.9.0-test2 Copyright (c) 1996-2008 the VideoLAN Team";
NSHumanReadableCopyright = "Copyright (c) 1996-2008 the VideoLAN Team";
/* Localized versions of Info.plist keys */
CFBundleName = "VLC";
CFBundleShortVersionString = "@VERSION@";
CFBundleGetInfoString = "@COPYRIGHT_MESSAGE@";
NSHumanReadableCopyright = "Copyright (c) @COPYRIGHT_YEARS@ the VideoLAN Team";
......@@ -7,7 +7,7 @@
<key>CFBundleExecutable</key>
<string>VLC Plugin</string>
<key>CFBundleGetInfoString</key>
<string>Copyright 2002-2008 The VideoLAN Team. All Rights Reserved</string>
<string>Copyright @COPYRIGHT_YEARS@ The VideoLAN Team.</string>
<key>CFBundleIdentifier</key>
<string>com.netscape.vlc</string>
<key>CFBundleInfoDictionaryVersion</key>
......@@ -19,9 +19,9 @@
<key>CFBundleSignature</key>
<string>MOSS</string>
<key>CFBundleVersion</key>
<string>0.9.0-test2</string>
<string>@VERSION@</string>
<key>CFBundleShortVersionString</key>
<string>0.9.0-test2</string>
<string>@VERSION@</string>
<key>CSResourcesFileMapped</key>
<true/>
</dict>
......
......@@ -3,11 +3,11 @@
<plist version="1.0">
<dict>
<key>CFBundleGetInfoString</key>
<string>0.9.0-test2, The VideoLAN Team, All Rights Reserved.</string>
<string>@VERSION@, The VideoLAN Team</string>
<key>CFBundleIdentifier</key>
<string>org.videolan.vlc</string>
<key>CFBundleShortVersionString</key>
<string>0.9.0-test2</string>
<string>@VERSION@</string>
<key>IFMajorVersion</key>
<integer>0</integer>
<key>IFMinorVersion</key>
......
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