curl/curl
1
1
Fork 0
mirror of https://github.com/curl/curl.git synced 2025-09-17 09:32:48 +03:00
Code Issues Packages Projects Releases Wiki Activity

macos: set .plist version in autoconf

Browse Source 
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>
This commit is contained in:
Daniel Gustafsson 2022-04-20 15:26:13 +02:00
parent a6cdfd24ee
commit e498a9b1fe
7 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MacOSX-Framework
View File

@ -116,7 +116,7 @@ if test ! -z $SDK32; then
mkdir -p libcurl.framework/${FRAMEWORK_VERSION}/Resources mkdir -p libcurl.framework/${FRAMEWORK_VERSION}/Resources
cp lib/.libs/libcurl.dylib libcurl.framework/${FRAMEWORK_VERSION}/libcurl 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 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 mkdir -p libcurl.framework/${FRAMEWORK_VERSION}/Headers/curl
cp include/curl/*.h libcurl.framework/${FRAMEWORK_VERSION}/Headers/curl cp include/curl/*.h libcurl.framework/${FRAMEWORK_VERSION}/Headers/curl
pushd libcurl.framework pushd libcurl.framework

5
configure.ac
View File

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

1
lib/.gitignore vendored
View File

@ -8,5 +8,6 @@ TAGS
curl_config.h curl_config.h
curl_config.h.in curl_config.h.in
libcurl.plist.dist libcurl.plist.dist
libcurl.plist
libcurl.vers libcurl.vers
stamp-h1 stamp-h1

6
lib/libcurl.plist → lib/libcurl.plist.in
View File

@ -15,7 +15,7 @@
<string>se.curl.libcurl</string> <string>se.curl.libcurl</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>7.12.3</string> <string>@CURL_PLIST_VERSION@</string>
<key>CFBundleName</key> <key>CFBundleName</key>
<string>libcurl</string> <string>libcurl</string>
@ -27,9 +27,9 @@
<string>????</string> <string>????</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>libcurl 7.12.3</string> <string>libcurl @CURL_PLIST_VERSION@</string>
<key>CFBundleGetInfoString</key> <key>CFBundleGetInfoString</key>
<string>libcurl.plist 7.12.3</string> <string>libcurl.plist @CURL_PLIST_VERSION@</string>
</dict> </dict>
</plist> </plist>

4
maketgz
View File

@ -92,10 +92,6 @@ rm -f "$HEADER.bak"
sed -i.bak 's/#define CURL_VERSION .*/#define CURL_VERSION "'$curlversion'"/g' $CHEADER sed -i.bak 's/#define CURL_VERSION .*/#define CURL_VERSION "'$curlversion'"/g' $CHEADER
rm -f "$CHEADER.bak" 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 if test -n "$only"; then
# done! # done!
exit; exit;

3
packages/vms/clean_gnv_curl.com
View File

@ -181,6 +181,9 @@ $!
$ file = "lcl_root:[.lib]libcurl.vers" $ file = "lcl_root:[.lib]libcurl.vers"
$ if f$search(file) .nes. "" then delete 'file';* $ 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" $ file = "lcl_root:[]ca-bundle.h"
$ if f$search(file) .nes. "" then delete 'file';* $ if f$search(file) .nes. "" then delete 'file';*
$! $!

2
scripts/copyright.pl
View File

@ -60,7 +60,7 @@ my @skiplist=(
'options-in-versions', 'options-in-versions',
# macos-framework files # macos-framework files
'^lib\/libcurl.plist', '^lib\/libcurl.plist.in',
'^lib\/libcurl.vers.in', '^lib\/libcurl.vers.in',
# vms files # vms files