mirror of
https://github.com/curl/curl.git
synced 2025-03-31 16:00:35 +08:00
build: remove MacOSX-Framework script
I don't think this is much used these days. Also remove the libcurl.plist file used (only) by this script Closes #13313
This commit is contained in:
Daniel Stenberg
parent
fd6c16c345
commit
9eafc11552
4
.github/labeler.yml
vendored
4
.github/labeler.yml
vendored
@ -24,7 +24,7 @@ appleOS:
|
||||
- all:
|
||||
- changed-files:
|
||||
- any-glob-to-all-files:
|
||||
- '{.github/workflows/macos.yml,lib/config-mac.h,lib/macos*,lib/vtls/sectransp*,m4/curl-sectransp.m4,MacOSX-Framework}'
|
||||
- '{.github/workflows/macos.yml,lib/config-mac.h,lib/macos*,lib/vtls/sectransp*,m4/curl-sectransp.m4}'
|
||||
|
||||
authentication:
|
||||
- all:
|
||||
@ -36,7 +36,7 @@ build:
|
||||
- all:
|
||||
- changed-files:
|
||||
- any-glob-to-all-files:
|
||||
- '{**/CMakeLists.txt,**/Makefile.am,**/Makefile.inc,**/Makefile.mk,**/*.m4,**/*.mk,*.m4,docs/INSTALL.cmake,lib/curl_config.h.cmake,lib/libcurl*.in,CMake/**,CMakeLists.txt,configure.ac,m4/**,MacOSX-Framework,Makefile.*,packages/**,plan9/**,projects/**,winbuild/**,libcurl.def}'
|
||||
- '{**/CMakeLists.txt,**/Makefile.am,**/Makefile.inc,**/Makefile.mk,**/*.m4,**/*.mk,*.m4,docs/INSTALL.cmake,lib/curl_config.h.cmake,lib/libcurl*.in,CMake/**,CMakeLists.txt,configure.ac,m4/**,Makefile.*,packages/**,plan9/**,projects/**,winbuild/**,libcurl.def}'
|
||||
|
||||
CI:
|
||||
- all:
|
||||
|
||||
@ -40,10 +40,6 @@ Files: lib/.checksrc src/.checksrc docs/examples/.checksrc tests/libtest/.checks
|
||||
Copyright: Daniel Stenberg, <daniel@haxx.se>, et al.
|
||||
License: curl
|
||||
|
||||
Files: lib/libcurl.plist.in
|
||||
Copyright: Daniel Stenberg, <daniel@haxx.se>, et al.
|
||||
License: curl
|
||||
|
||||
Files: lib/libcurl.vers.in
|
||||
Copyright: Daniel Stenberg, <daniel@haxx.se>, et al.
|
||||
License: curl
|
||||
|
||||
164
MacOSX-Framework
164
MacOSX-Framework
@ -1,164 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
#***************************************************************************
|
||||
# _ _ ____ _
|
||||
# Project ___| | | | _ \| |
|
||||
# / __| | | | |_) | |
|
||||
# | (__| |_| | _ <| |___
|
||||
# \___|\___/|_| \_\_____|
|
||||
#
|
||||
# Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.
|
||||
#
|
||||
# This software is licensed as described in the file COPYING, which
|
||||
# you should have received as part of this distribution. The terms
|
||||
# are also available at https://curl.se/docs/copyright.html.
|
||||
#
|
||||
# You may opt to use, copy, modify, merge, publish, distribute and/or sell
|
||||
# copies of the Software, and permit persons to whom the Software is
|
||||
# furnished to do so, under the terms of the COPYING file.
|
||||
#
|
||||
# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
|
||||
# KIND, either express or implied.
|
||||
#
|
||||
# SPDX-License-Identifier: curl
|
||||
#
|
||||
###########################################################################
|
||||
|
||||
set -eu
|
||||
|
||||
# This script performs all of the steps needed to build a
|
||||
# universal binary libcurl.framework for Mac OS X 10.4 or greater.
|
||||
#
|
||||
# Hendrik Visage:
|
||||
# Generalizations added since Snow Leopard (10.6) do not include the 10.4 SDK.
|
||||
#
|
||||
# Also note:
|
||||
# 10.5 is the *ONLY* SDK that support PPC64 :( -- 10.6 do not have PPC64 support
|
||||
# If you need to have PPC64 support then change below to 1
|
||||
PPC64_NEEDED=0
|
||||
# Apple does not support building for PPC anymore in Xcode 4 and later.
|
||||
# If you are using Xcode 3 or earlier and need PPC support, then change
|
||||
# the setting below to 1
|
||||
PPC_NEEDED=0
|
||||
|
||||
# For me the default is to develop for the platform I am on, and if you
|
||||
# desire compatibility with older versions then change USE_OLD to 1 :)
|
||||
USE_OLD=0
|
||||
|
||||
VERSION=$(/usr/bin/sed -ne \
|
||||
's/^#define LIBCURL_VERSION "\(.*\)"/\1/p' include/curl/curlver.h)
|
||||
FRAMEWORK_VERSION=Versions/Release-$VERSION
|
||||
|
||||
# I also wanted to "copy over" the system, and thus the reason I added the
|
||||
# version to Versions/Release-7.20.1 etc.
|
||||
# now a simple rsync -vaP libcurl.framework /Library/Frameworks will install it
|
||||
# and setup the right paths to this version, leaving the system version
|
||||
# "intact", so you can "fix" it later with the links to Versions/A/...
|
||||
|
||||
DEVELOPER_PATH=$(xcode-select --print-path)
|
||||
# Around Xcode 4.3, SDKs were moved from the Developer folder into the
|
||||
# MacOSX.platform folder
|
||||
if test -d "$DEVELOPER_PATH/Platforms/MacOSX.platform/Developer/SDKs"; then
|
||||
SDK_PATH="$DEVELOPER_PATH/Platforms/MacOSX.platform/Developer/SDKs"
|
||||
else
|
||||
SDK_PATH="$DEVELOPER_PATH/SDKs"
|
||||
fi
|
||||
# FIXME
|
||||
# shellcheck disable=SC2012
|
||||
OLD_SDK=$(ls "$SDK_PATH" | head -1)
|
||||
# FIXME
|
||||
# shellcheck disable=SC2012
|
||||
NEW_SDK=$(ls -r "$SDK_PATH" | head -1)
|
||||
|
||||
if test "0$USE_OLD" -gt 0; then
|
||||
SDK32=$OLD_SDK
|
||||
else
|
||||
SDK32=$NEW_SDK
|
||||
fi
|
||||
|
||||
SDK32_DIR=$SDK_PATH/$SDK32
|
||||
if test "$PPC_NEEDED" -gt 0; then
|
||||
ARCHES32='-arch i386 -arch ppc'
|
||||
else
|
||||
ARCHES32='-arch i386'
|
||||
fi
|
||||
|
||||
if test "$PPC64_NEEDED" -gt 0; then
|
||||
SDK64=10.5
|
||||
ARCHES64='-arch x86_64 -arch ppc64'
|
||||
# FIXME
|
||||
# shellcheck disable=SC2010
|
||||
SDK64=$(ls "$SDK_PATH" | grep "10\.5" | head -1)
|
||||
else
|
||||
ARCHES64='-arch x86_64'
|
||||
# We "know" that 10.4 and earlier do not support 64-bit
|
||||
# FIXME
|
||||
# shellcheck disable=SC2010
|
||||
OLD_SDK64=$(ls "$SDK_PATH" | grep -v "10\.[0-4]" | head -1)
|
||||
# FIXME
|
||||
# shellcheck disable=SC2010
|
||||
NEW_SDK64=$(ls -r "$SDK_PATH" | grep -v "10\.[0-4][^0-9]" | head -1)
|
||||
if test "$USE_OLD" -gt 0; then
|
||||
SDK64=$OLD_SDK64
|
||||
else
|
||||
SDK64=$NEW_SDK64
|
||||
fi
|
||||
fi
|
||||
|
||||
SDK64_DIR=$SDK_PATH/$SDK64
|
||||
|
||||
if test ! -z "$SDK32"; then
|
||||
echo "----Configuring libcurl for 32-bit universal framework..."
|
||||
make clean
|
||||
./configure --disable-dependency-tracking --disable-static --with-gssapi --with-secure-transport \
|
||||
CFLAGS="-Os -isysroot $SDK32_DIR $ARCHES32" \
|
||||
LDFLAGS="-Wl,-syslibroot,$SDK32_DIR $ARCHES32 -Wl,-headerpad_max_install_names" \
|
||||
CC="$CC"
|
||||
|
||||
echo "----Building 32-bit libcurl..."
|
||||
make -j "$(sysctl -n hw.logicalcpu_max)"
|
||||
|
||||
echo "----Creating 32-bit framework..."
|
||||
rm -r libcurl.framework
|
||||
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"
|
||||
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
|
||||
ln -fs "${FRAMEWORK_VERSION}/libcurl" libcurl
|
||||
ln -fs "${FRAMEWORK_VERSION}/Resources" Resources
|
||||
ln -fs "${FRAMEWORK_VERSION}/Headers" Headers
|
||||
cd Versions
|
||||
ln -fs "$(basename "${FRAMEWORK_VERSION}")" Current
|
||||
popd
|
||||
|
||||
echo Testing for SDK64
|
||||
if test -d "$SDK64_DIR"; then
|
||||
echo entering...
|
||||
make clean
|
||||
echo "----Configuring libcurl for 64-bit universal framework..."
|
||||
./configure --disable-dependency-tracking --disable-static --with-gssapi --with-secure-transport \
|
||||
CFLAGS="-Os -isysroot $SDK64_DIR $ARCHES64" \
|
||||
LDFLAGS="-Wl,-syslibroot,$SDK64_DIR $ARCHES64 -Wl,-headerpad_max_install_names" \
|
||||
CC="$CC"
|
||||
|
||||
echo "----Building 64-bit libcurl..."
|
||||
make -j "$(sysctl -n hw.logicalcpu_max)"
|
||||
|
||||
echo "----Appending 64-bit framework to 32-bit framework..."
|
||||
cp lib/.libs/libcurl.dylib "libcurl.framework/${FRAMEWORK_VERSION}/libcurl64"
|
||||
install_name_tool -id "@rpath/libcurl.framework/${FRAMEWORK_VERSION}/libcurl" "libcurl.framework/${FRAMEWORK_VERSION}/libcurl64"
|
||||
cp "libcurl.framework/${FRAMEWORK_VERSION}/libcurl" "libcurl.framework/${FRAMEWORK_VERSION}/libcurl32"
|
||||
pwd
|
||||
lipo "libcurl.framework/${FRAMEWORK_VERSION}/libcurl32" "libcurl.framework/${FRAMEWORK_VERSION}/libcurl64" -create -output "libcurl.framework/${FRAMEWORK_VERSION}/libcurl"
|
||||
rm "libcurl.framework/${FRAMEWORK_VERSION}/libcurl32" "libcurl.framework/${FRAMEWORK_VERSION}/libcurl64"
|
||||
fi
|
||||
|
||||
pwd
|
||||
lipo -info "libcurl.framework/${FRAMEWORK_VERSION}/libcurl"
|
||||
echo "libcurl.framework is built and can now be included in other projects."
|
||||
echo "Copy libcurl.framework to your bundle's Contents/Frameworks folder, ~/Library/Frameworks or /Library/Frameworks."
|
||||
else
|
||||
echo "Building libcurl.framework requires Mac OS X 10.4 or later with Mac OS X 10.4/5/6 SDK installed."
|
||||
fi
|
||||
@ -122,9 +122,9 @@ PLAN9_DIST = plan9/include/mkfile \
|
||||
plan9/src/mkfile.inc \
|
||||
plan9/src/mkfile
|
||||
|
||||
EXTRA_DIST = CHANGES COPYING maketgz Makefile.dist curl-config.in \
|
||||
RELEASE-NOTES buildconf libcurl.pc.in MacOSX-Framework $(CMAKE_DIST) \
|
||||
$(VC_DIST) $(WINBUILD_DIST) $(PLAN9_DIST) lib/libcurl.vers.in buildconf.bat \
|
||||
EXTRA_DIST = CHANGES COPYING maketgz Makefile.dist curl-config.in \
|
||||
RELEASE-NOTES buildconf libcurl.pc.in $(CMAKE_DIST) $(VC_DIST) \
|
||||
$(WINBUILD_DIST) $(PLAN9_DIST) lib/libcurl.vers.in buildconf.bat \
|
||||
libcurl.def
|
||||
|
||||
CLEANFILES = $(VC14_LIBVCXPROJ) $(VC14_SRCVCXPROJ) \
|
||||
|
||||
@ -2498,10 +2498,6 @@ 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 -------------------------------------------------
|
||||
@ -4942,7 +4938,6 @@ AC_CONFIG_FILES([Makefile \
|
||||
lib/Makefile \
|
||||
scripts/Makefile \
|
||||
lib/libcurl.vers \
|
||||
lib/libcurl.plist \
|
||||
tests/Makefile \
|
||||
tests/config \
|
||||
tests/certs/Makefile \
|
||||
|
||||
2
lib/.gitignore
vendored
2
lib/.gitignore
vendored
@ -11,7 +11,5 @@
|
||||
TAGS
|
||||
curl_config.h
|
||||
curl_config.h.in
|
||||
libcurl.plist.dist
|
||||
libcurl.plist
|
||||
libcurl.vers
|
||||
stamp-h1
|
||||
|
||||
@ -25,11 +25,10 @@ AUTOMAKE_OPTIONS = foreign nostdinc
|
||||
|
||||
CMAKE_DIST = CMakeLists.txt curl_config.h.cmake
|
||||
|
||||
EXTRA_DIST = Makefile.mk config-win32.h config-win32ce.h config-plan9.h \
|
||||
config-riscos.h config-mac.h curl_config.h.in config-dos.h \
|
||||
libcurl.plist libcurl.rc config-amigaos.h config-win32ce.h \
|
||||
config-os400.h setup-os400.h $(CMAKE_DIST) setup-win32.h .checksrc \
|
||||
Makefile.soname
|
||||
EXTRA_DIST = Makefile.mk config-win32.h config-win32ce.h config-plan9.h \
|
||||
config-riscos.h config-mac.h curl_config.h.in config-dos.h libcurl.rc \
|
||||
config-amigaos.h config-win32ce.h config-os400.h setup-os400.h \
|
||||
$(CMAKE_DIST) setup-win32.h .checksrc Makefile.soname
|
||||
|
||||
lib_LTLIBRARIES = libcurl.la
|
||||
|
||||
|
||||
@ -1,35 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">
|
||||
<plist version="0.9">
|
||||
<dict>
|
||||
<key>CFBundleInfoDictionaryVersion</key>
|
||||
<string>6.0</string>
|
||||
|
||||
<key>CFBundleDevelopmentRegion</key>
|
||||
<string>English</string>
|
||||
|
||||
<key>CFBundleExecutable</key>
|
||||
<string>curl</string>
|
||||
|
||||
<key>CFBundleIdentifier</key>
|
||||
<string>se.curl.libcurl</string>
|
||||
|
||||
<key>CFBundleVersion</key>
|
||||
<string>@CURL_PLIST_VERSION@</string>
|
||||
|
||||
<key>CFBundleName</key>
|
||||
<string>libcurl</string>
|
||||
|
||||
<key>CFBundlePackageType</key>
|
||||
<string>FMWK</string>
|
||||
|
||||
<key>CFBundleSignature</key>
|
||||
<string>????</string>
|
||||
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>libcurl @CURL_PLIST_VERSION@</string>
|
||||
|
||||
<key>CFBundleGetInfoString</key>
|
||||
<string>libcurl.plist @CURL_PLIST_VERSION@</string>
|
||||
</dict>
|
||||
</plist>
|
||||
8
maketgz
8
maketgz
@ -70,18 +70,15 @@ numeric="$(printf "%02x%02x%02x\n" "$major" "$minor" "$patch")"
|
||||
|
||||
HEADER=include/curl/curlver.h
|
||||
CHEADER=src/tool_version.h
|
||||
PLIST=lib/libcurl.plist
|
||||
PLISTO=$PLIST
|
||||
|
||||
if test -z "$only"; then
|
||||
ext=".dist"
|
||||
# when not setting up version numbers locally
|
||||
for a in $HEADER $CHEADER $PLIST; do
|
||||
for a in $HEADER $CHEADER; do
|
||||
cp "$a" "$a$ext"
|
||||
done
|
||||
HEADER="$HEADER$ext"
|
||||
CHEADER="$CHEADER$ext"
|
||||
PLIST="$PLIST$ext"
|
||||
fi
|
||||
|
||||
# requires a date command that knows + for format and -d for date input
|
||||
@ -104,9 +101,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 "s/@CURL_PLIST_VERSION@/$curlversion/g" < "$PLISTO.in" > "$PLIST"
|
||||
|
||||
if test -n "$only"; then
|
||||
# done!
|
||||
exit
|
||||
|
||||
@ -179,9 +179,6 @@ $!
|
||||
$ 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';*
|
||||
$!
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user