macosx: Use autoconf to handle version strings

diff --git a/configure.ac b/configure.ac
index bfbe3ced8abbffeeefa6bbe64d9e7adcaf38ac61..ad47540760c7bafe23f4e95d79a50e33cd18ba64 100644 (file)
--- 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 8f6e0d37713a6640b13db1da54fdafa0c99dc369..fd0218e550ffbaa293910a22ee53733f65fdfe9c 100644 (file)
--- a/extras/package/macosx/Info.plist
+++ b/extras/package/macosx/Info.plist.in
@@ -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>

diff --git a/extras/package/macosx/Resources/English.lproj/InfoPlist.strings b/extras/package/macosx/Resources/English.lproj/InfoPlist.strings
deleted file mode 100644 (file)
index 03a702d..0000000
--- 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 (file)
index 0000000..6e3f4ea
--- /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 5ab5ac917d5c981431e2633f22883f6c51671a0a..79aa41b9fd2a8282decdec36a4ec000632d65eee 100644 (file)
--- a/extras/package/macosx/plugin/Info.plist
+++ b/extras/package/macosx/plugin/Info.plist.in
@@ -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>

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 88fbc3409d291a33a593e14bfdfc06c1eca21a4b..461437a1fd09a0c4968f89a206e968d15c2b11a6 100644 (file)
--- a/extras/package/macosx/plugin/InstallerInfo.plist
+++ b/extras/package/macosx/plugin/InstallerInfo.plist.in
@@ -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>