From 3695af464c9cd9ee12402fc64a099494f8970bb8 Mon Sep 17 00:00:00 2001 From: Christophe Mutricy Date: Sun, 27 Jul 2008 01:11:47 +0100 Subject: [PATCH] macosx: Use autoconf to handle version strings --- configure.ac | 14 ++++++++++++-- .../package/macosx/{Info.plist => Info.plist.in} | 6 +++--- .../Resources/English.lproj/InfoPlist.strings | 6 ------ .../Resources/English.lproj/InfoPlist.strings.in | 6 ++++++ .../macosx/plugin/{Info.plist => Info.plist.in} | 6 +++--- ...{InstallerInfo.plist => InstallerInfo.plist.in} | 4 ++-- 6 files changed, 26 insertions(+), 16 deletions(-) rename extras/package/macosx/{Info.plist => Info.plist.in} (99%) delete mode 100644 extras/package/macosx/Resources/English.lproj/InfoPlist.strings create mode 100644 extras/package/macosx/Resources/English.lproj/InfoPlist.strings.in rename extras/package/macosx/plugin/{Info.plist => Info.plist.in} (84%) rename extras/package/macosx/plugin/{InstallerInfo.plist => InstallerInfo.plist.in} (92%) diff --git a/configure.ac b/configure.ac index bfbe3ced8a..ad47540760 100644 --- a/configure.ac +++ b/configure.ac @@ -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 diff --git a/extras/package/macosx/Info.plist b/extras/package/macosx/Info.plist.in similarity index 99% rename from extras/package/macosx/Info.plist rename to extras/package/macosx/Info.plist.in index 8f6e0d3771..fd0218e550 100644 --- a/extras/package/macosx/Info.plist +++ b/extras/package/macosx/Info.plist.in @@ -724,7 +724,7 @@ CFBundleExecutable VLC CFBundleGetInfoString - VLC media player 0.9.0-test2, Copyright (c) 1996-2008 the VideoLAN Team + @COPYRIGHT_MESSAGE@ CFBundleIconFile vlc.icns CFBundleIdentifier @@ -736,7 +736,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 0.9.0-test2 + @VERSION@ CFBundleSignature VLC# CFBundleURLTypes @@ -793,7 +793,7 @@ CFBundleVersion - 0.9.0-test2 + @VERSION@ NSAppleScriptEnabled YES NSMainNibFile diff --git a/extras/package/macosx/Resources/English.lproj/InfoPlist.strings b/extras/package/macosx/Resources/English.lproj/InfoPlist.strings deleted file mode 100644 index 03a702dc9d..0000000000 --- a/extras/package/macosx/Resources/English.lproj/InfoPlist.strings +++ /dev/null @@ -1,6 +0,0 @@ -/* 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"; diff --git a/extras/package/macosx/Resources/English.lproj/InfoPlist.strings.in b/extras/package/macosx/Resources/English.lproj/InfoPlist.strings.in new file mode 100644 index 0000000000..6e3f4ea0e6 --- /dev/null +++ b/extras/package/macosx/Resources/English.lproj/InfoPlist.strings.in @@ -0,0 +1,6 @@ +/* Localized versions of Info.plist keys */ + +CFBundleName = "VLC"; +CFBundleShortVersionString = "@VERSION@"; +CFBundleGetInfoString = "@COPYRIGHT_MESSAGE@"; +NSHumanReadableCopyright = "Copyright (c) @COPYRIGHT_YEARS@ the VideoLAN Team"; diff --git a/extras/package/macosx/plugin/Info.plist b/extras/package/macosx/plugin/Info.plist.in similarity index 84% rename from extras/package/macosx/plugin/Info.plist rename to extras/package/macosx/plugin/Info.plist.in index 5ab5ac917d..79aa41b9fd 100644 --- a/extras/package/macosx/plugin/Info.plist +++ b/extras/package/macosx/plugin/Info.plist.in @@ -7,7 +7,7 @@ CFBundleExecutable VLC Plugin CFBundleGetInfoString - Copyright 2002-2008 The VideoLAN Team. All Rights Reserved + Copyright @COPYRIGHT_YEARS@ The VideoLAN Team. CFBundleIdentifier com.netscape.vlc CFBundleInfoDictionaryVersion @@ -19,9 +19,9 @@ CFBundleSignature MOSS CFBundleVersion - 0.9.0-test2 + @VERSION@ CFBundleShortVersionString - 0.9.0-test2 + @VERSION@ CSResourcesFileMapped diff --git a/extras/package/macosx/plugin/InstallerInfo.plist b/extras/package/macosx/plugin/InstallerInfo.plist.in similarity index 92% rename from extras/package/macosx/plugin/InstallerInfo.plist rename to extras/package/macosx/plugin/InstallerInfo.plist.in index 88fbc3409d..461437a1fd 100644 --- a/extras/package/macosx/plugin/InstallerInfo.plist +++ b/extras/package/macosx/plugin/InstallerInfo.plist.in @@ -3,11 +3,11 @@ CFBundleGetInfoString - 0.9.0-test2, The VideoLAN Team, All Rights Reserved. + @VERSION@, The VideoLAN Team CFBundleIdentifier org.videolan.vlc CFBundleShortVersionString - 0.9.0-test2 + @VERSION@ IFMajorVersion 0 IFMinorVersion -- 2.39.2