macos: set .plist version in autoconf

Set the libcurl version in libcurl.plist like how libcurl.vers is
created.

Closes: #8692
Reviewed-by: Daniel Stenberg <daniel@haxx.se>
Reviewed-by: Nick Zitzmann <nickzman@gmail.com>

diff --git a/MacOSX-Framework b/MacOSX-Framework
index 3c8452774dc835b98354b3001633d04e987ab7c6..69a4f477a3305740eaa4cebdb56158d208cf2ad8 100755 (executable)
--- a/MacOSX-Framework
+++ b/MacOSX-Framework
@@ -116,7 +116,7 @@ if test ! -z $SDK32; then
   mkdir -p libcurl.framework/${FRAMEWORK_VERSION}/Resources
   cp lib/.libs/libcurl.dylib libcurl.framework/${FRAMEWORK_VERSION}/libcurl
   install_name_tool -id @rpath/libcurl.framework/${FRAMEWORK_VERSION}/libcurl libcurl.framework/${FRAMEWORK_VERSION}/libcurl
-  /usr/bin/sed -e "s/7\.12\.3/$VERSION/" lib/libcurl.plist >libcurl.framework/${FRAMEWORK_VERSION}/Resources/Info.plist
+  cp lib/libcurl.plist >libcurl.framework/${FRAMEWORK_VERSION}/Resources/Info.plist
   mkdir -p libcurl.framework/${FRAMEWORK_VERSION}/Headers/curl
   cp include/curl/*.h libcurl.framework/${FRAMEWORK_VERSION}/Headers/curl
   pushd libcurl.framework

diff --git a/configure.ac b/configure.ac
index 2580f6a8d117dd089b52882dc3bb4060707718b6..d24daeab80f63ed25e412dc6d17e696f17d7d4a5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2333,6 +2333,10 @@ AC_SUBST([CURL_LT_SHLIB_VERSIONED_FLAVOUR],
 AM_CONDITIONAL([CURL_LT_SHLIB_USE_VERSIONED_SYMBOLS],
   [test "x$versioned_symbols" = 'xyes'])
 
+dnl Update .plist file with current version
+AC_SUBST([CURL_PLIST_VERSION],
+  ["$CURLVERSION"])
+
 dnl -------------------------------------------------
 dnl check winidn option before other IDN libraries
 dnl -------------------------------------------------
@@ -4382,6 +4386,7 @@ AC_CONFIG_FILES([Makefile \
            lib/Makefile \
            scripts/Makefile \
            lib/libcurl.vers \
+           lib/libcurl.plist \
            tests/Makefile \
            tests/certs/Makefile \
            tests/certs/scripts/Makefile \

diff --git a/lib/.gitignore b/lib/.gitignore
index 719fc977f3ce6973bf9fc25809b542b4cb0cdd57..93ae0dec591a612bc88acf3102e24f58d48f190d 100644 (file)
--- a/lib/.gitignore
+++ b/lib/.gitignore
@@ -8,5 +8,6 @@ TAGS
 curl_config.h
 curl_config.h.in
 libcurl.plist.dist
+libcurl.plist
 libcurl.vers
 stamp-h1

diff --git a/lib/libcurl.plist b/lib/libcurl.plist.in
similarity index 83%
rename from lib/libcurl.plist
rename to lib/libcurl.plist.in
index c5df75e1f6de902448015d232e21005b653b4389..d2e6492f6941e90b77744e976b9fa979315229ad 100644 (file)
--- a/lib/libcurl.plist
+++ b/lib/libcurl.plist.in
@@ -15,7 +15,7 @@
        <string>se.curl.libcurl</string>
 
        <key>CFBundleVersion</key>
-       <string>7.12.3</string>
+       <string>@CURL_PLIST_VERSION@</string>
 
        <key>CFBundleName</key>
        <string>libcurl</string>
@@ -27,9 +27,9 @@
        <string>????</string>
 
        <key>CFBundleShortVersionString</key>
-       <string>libcurl 7.12.3</string>
+       <string>libcurl @CURL_PLIST_VERSION@</string>
 
        <key>CFBundleGetInfoString</key>
-       <string>libcurl.plist 7.12.3</string>
+       <string>libcurl.plist @CURL_PLIST_VERSION@</string>
 </dict>
 </plist>

diff --git a/maketgz b/maketgz
index c8ab8a2891311c12bb7b5033cf4f4ea7917ca4f7..9869aa105db0aa5cbf04248e1395b25ff25cbe7a 100755 (executable)
--- a/maketgz
+++ b/maketgz
@@ -92,10 +92,6 @@ rm -f "$HEADER.bak"
 sed -i.bak 's/#define CURL_VERSION .*/#define CURL_VERSION "'$curlversion'"/g' $CHEADER
 rm -f "$CHEADER.bak"
 
-# Replace version number in plist file:
-sed -i.bak "s/7\.12\.3/$libversion/g" $PLIST
-rm -f "$PLIST.bak"
-
 if test -n "$only"; then
   # done!
   exit;

diff --git a/packages/vms/clean_gnv_curl.com b/packages/vms/clean_gnv_curl.com
index 5846739e4a572e36753c6fbb5acc51ea9f90d60d..fa79193f556acf29553a8db19f8133552cd35b5e 100644 (file)
--- a/packages/vms/clean_gnv_curl.com
+++ b/packages/vms/clean_gnv_curl.com
@@ -181,6 +181,9 @@ $!
 $ file = "lcl_root:[.lib]libcurl.vers"
 $ if f$search(file) .nes. "" then delete 'file';*
 $!
+$ file = "lcl_root:[.lib]libcurl.plist"
+$ if f$search(file) .nes. "" then delete 'file';*
+$!
 $ file = "lcl_root:[]ca-bundle.h"
 $ if f$search(file) .nes. "" then delete 'file';*
 $!

diff --git a/scripts/copyright.pl b/scripts/copyright.pl
index d0e886b64f7795779e6e61a403c54b22b2ff9ffc..a5f7264f5810cf352e7e96461d42c01340360fe4 100755 (executable)
--- a/scripts/copyright.pl
+++ b/scripts/copyright.pl
@@ -60,7 +60,7 @@ my @skiplist=(
     'options-in-versions',
 
     # macos-framework files
-    '^lib\/libcurl.plist',
+    '^lib\/libcurl.plist.in',
     '^lib\/libcurl.vers.in',
 
     # vms files