diff options
author | Daniel Gustafsson <daniel@yesql.se> | 2022-04-20 15:26:13 +0200 |
---|---|---|
committer | Daniel Gustafsson <daniel@yesql.se> | 2022-04-20 15:26:13 +0200 |
commit | e498a9b1fe5964a18eb2a3a99dc52160d2768261 (patch) | |
tree | ad9661cbbb5724be2a034728b5740da3decfa361 | |
parent | a6cdfd24eed5778da4d080e7c139a00ba9282ca0 (diff) | |
download | curl-e498a9b1fe5964a18eb2a3a99dc52160d2768261.tar.gz |
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>
-rwxr-xr-x | MacOSX-Framework | 2 | ||||
-rw-r--r-- | configure.ac | 5 | ||||
-rw-r--r-- | lib/.gitignore | 1 | ||||
-rw-r--r-- | lib/libcurl.plist.in (renamed from lib/libcurl.plist) | 6 | ||||
-rwxr-xr-x | maketgz | 4 | ||||
-rw-r--r-- | packages/vms/clean_gnv_curl.com | 3 | ||||
-rwxr-xr-x | scripts/copyright.pl | 2 |
7 files changed, 14 insertions, 9 deletions
diff --git a/MacOSX-Framework b/MacOSX-Framework index 3c8452774..69a4f477a 100755 --- 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 2580f6a8d..d24daeab8 100644 --- 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 719fc977f..93ae0dec5 100644 --- 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 index c5df75e1f..d2e6492f6 100644 --- 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> @@ -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 5846739e4..fa79193f5 100644 --- 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 d0e886b64..a5f7264f5 100755 --- 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 |