From 4321cdcfc56cd1d8d6b65c6311e6bdb9cc511392 Mon Sep 17 00:00:00 2001 From: halx99 Date: Sun, 31 Mar 2024 22:11:51 +0800 Subject: [PATCH] Try xcframework --- .github/workflows/build.yml | 49 ++++++++++++++++++++- src/cares/dist1.sh | 65 ++++++++++++++++------------ src/curl/dist1.sh | 65 ++++++++++++++++------------ src/jpeg-turbo/dist1.sh | 61 +++++++++++++++----------- src/luajit/dist1.sh | 49 +++++++++++++-------- src/openssl/dist1.sh | 86 +++++++++++++++++++++++-------------- src/zlib/dist1.sh | 49 +++++++++++++-------- 7 files changed, 273 insertions(+), 151 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c13c2f7..0e9956b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -128,6 +128,30 @@ jobs: with: path: ./${{ env.install_path }}/** name: ${{ env.install_path }} + ios-arm64-sim: + # The type of runner that the job will run on + runs-on: macos-12 + # Steps represent a sequence of tasks that will be executed as part of the job + steps: + # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it + - uses: actions/checkout@v4 + - name: Setup Xcode version + uses: maxim-lobanov/setup-xcode@v1 + id: setup-xcode + with: + xcode-version: '${{ env.GH_XCODE_VER }}' + - name: Setup Python + uses: actions/setup-python@v5 + with: + python-version: '3.10' + - name: Build + shell: pwsh + run: ./build.ps1 -p ios -a arm64 -sdk simulator + - name: Upload + uses: actions/upload-artifact@v4 + with: + path: ./${{ env.install_path }}/** + name: ${{ env.install_path }} tvos: # The type of runner that the job will run on @@ -167,7 +191,30 @@ jobs: with: path: ./${{ env.install_path }}/** name: ${{ env.install_path }} - + tvos-arm64-sim: + # The type of runner that the job will run on + runs-on: macos-12 + # Steps represent a sequence of tasks that will be executed as part of the job + steps: + # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it + - uses: actions/checkout@v4 + - name: Setup Xcode version + uses: maxim-lobanov/setup-xcode@v1 + id: setup-xcode + with: + xcode-version: '${{ env.GH_XCODE_VER }}' + - name: Setup Python + uses: actions/setup-python@v5 + with: + python-version: '3.10' + - name: Build + shell: pwsh + run: ./build.ps1 -p tvos -a arm64 -sdk simulator + - name: Upload + uses: actions/upload-artifact@v4 + with: + path: ./${{ env.install_path }}/** + name: ${{ env.install_path }} android: # The type of runner that the job will run on runs-on: ubuntu-latest diff --git a/src/cares/dist1.sh b/src/cares/dist1.sh index ed7f84d..a382614 100644 --- a/src/cares/dist1.sh +++ b/src/cares/dist1.sh @@ -4,33 +4,44 @@ DIST_DIR="${DIST_ROOT}/${LIB_NAME}" dist_lib ${LIB_NAME} ${DIST_DIR} $DISTF_NATIVES -# create flat lib for ios -if [ -f "install_ios_arm/${LIB_NAME}/lib/libcares.a" ] ; then - lipo -create install_ios_arm/${LIB_NAME}/lib/libcares.a install_ios_arm64/${LIB_NAME}/lib/libcares.a install_ios_x64/${LIB_NAME}/lib/libcares.a -output ${DIST_DIR}/lib/ios/libcares.a -else - lipo -create install_ios_arm64/${LIB_NAME}/lib/libcares.a install_ios_x64/${LIB_NAME}/lib/libcares.a -output ${DIST_DIR}/lib/ios/libcares.a -fi - -# create flat lib for tvos -if [ -f "install_tvos_arm/${LIB_NAME}/lib/libcares.a" ] ; then - lipo -create install_tvos_arm/${LIB_NAME}/lib/libcares.a install_tvos_arm64/${LIB_NAME}/lib/libcares.a install_tvos_x64/${LIB_NAME}/lib/libcares.a -output ${DIST_DIR}/lib/tvos/libcares.a -else - lipo -create install_tvos_arm64/${LIB_NAME}/lib/libcares.a install_tvos_x64/${LIB_NAME}/lib/libcares.a -output ${DIST_DIR}/lib/tvos/libcares.a -fi - -# check the flat lib -lipo -info ${DIST_DIR}/lib/ios/libcares.a - -# check the flat lib -lipo -info ${DIST_DIR}/lib/tvos/libcares.a - - -# create fat lib for mac -lipo -create install_osx_arm64/${LIB_NAME}/lib/libcares.a install_osx_x64/${LIB_NAME}/lib/libcares.a -output ${DIST_DIR}/lib/mac/libcares.a - - -# check the fat lib -lipo -info ${DIST_DIR}/lib/mac/libcares.a +# # create flat lib for ios +# if [ -f "install_ios_arm/${LIB_NAME}/lib/libcares.a" ] ; then +# lipo -create install_ios_arm/${LIB_NAME}/lib/libcares.a install_ios_arm64/${LIB_NAME}/lib/libcares.a install_ios_x64/${LIB_NAME}/lib/libcares.a -output ${DIST_DIR}/lib/ios/libcares.a +# else +# lipo -create install_ios_arm64/${LIB_NAME}/lib/libcares.a install_ios_x64/${LIB_NAME}/lib/libcares.a -output ${DIST_DIR}/lib/ios/libcares.a +# fi + +# # create flat lib for tvos +# if [ -f "install_tvos_arm/${LIB_NAME}/lib/libcares.a" ] ; then +# lipo -create install_tvos_arm/${LIB_NAME}/lib/libcares.a install_tvos_arm64/${LIB_NAME}/lib/libcares.a install_tvos_x64/${LIB_NAME}/lib/libcares.a -output ${DIST_DIR}/lib/tvos/libcares.a +# else +# lipo -create install_tvos_arm64/${LIB_NAME}/lib/libcares.a install_tvos_x64/${LIB_NAME}/lib/libcares.a -output ${DIST_DIR}/lib/tvos/libcares.a +# fi + +# # check the flat lib +# lipo -info ${DIST_DIR}/lib/ios/libcares.a + +# # check the flat lib +# lipo -info ${DIST_DIR}/lib/tvos/libcares.a + + +# # create fat lib for mac +# lipo -create install_osx_arm64/${LIB_NAME}/lib/libcares.a install_osx_x64/${LIB_NAME}/lib/libcares.a -output ${DIST_DIR}/lib/mac/libcares.a + + +# # check the fat lib +# lipo -info ${DIST_DIR}/lib/mac/libcares.a + +xcodebuild -create-xcframework \ + -library install_ios_arm64/${LIB_NAME}/lib/libcares.a \ + -library install_ios_x64/${LIB_NAME}/lib/libcares.a \ + -library install_ios_arm64_sim/${LIB_NAME}/lib/libcares.a \ + -library install_tvos_arm64/${LIB_NAME}/lib/libcares.a \ + -library install_tvos_x64/${LIB_NAME}/lib/libcares.a \ + -library install_tvos_arm64_sim/${LIB_NAME}/lib/libcares.a \ + -library install_osx_x64/${LIB_NAME}/lib/libcares.a \ + -library install_osx_arm64/${LIB_NAME}/lib/libcares.a \ + -output ${DIST_DIR}/lib/cares.xcframework # overrite ares_build.h with common header cp -f src/cares/ares_build.h ${DIST_DIR}/include/ diff --git a/src/curl/dist1.sh b/src/curl/dist1.sh index 7a9c538..1c71ae3 100644 --- a/src/curl/dist1.sh +++ b/src/curl/dist1.sh @@ -4,30 +4,41 @@ DIST_DIR="${DIST_ROOT}/${LIB_NAME}" dist_lib ${LIB_NAME} ${DIST_DIR} $DISTF_NATIVES -# create flat lib for ios -if [ -f "install_ios_arm/${LIB_NAME}/lib/libcurl.a" ] ; then - lipo -create install_ios_arm/${LIB_NAME}/lib/libcurl.a install_ios_arm64/${LIB_NAME}/lib/libcurl.a install_ios_x64/${LIB_NAME}/lib/libcurl.a -output ${DIST_DIR}/lib/ios/libcurl.a -else - lipo -create install_ios_arm64/${LIB_NAME}/lib/libcurl.a install_ios_x64/${LIB_NAME}/lib/libcurl.a -output ${DIST_DIR}/lib/ios/libcurl.a -fi - -# create flat lib for tvos -if [ -f "install_tvos_arm/${LIB_NAME}/lib/libcurl.a" ] ; then - lipo -create install_tvos_arm/${LIB_NAME}/lib/libcurl.a install_tvos_arm64/${LIB_NAME}/lib/libcurl.a install_tvos_x64/${LIB_NAME}/lib/libcurl.a -output ${DIST_DIR}/lib/tvos/libcurl.a -else - lipo -create install_tvos_arm64/${LIB_NAME}/lib/libcurl.a install_tvos_x64/${LIB_NAME}/lib/libcurl.a -output ${DIST_DIR}/lib/tvos/libcurl.a -fi - -# check the flat lib -lipo -info ${DIST_DIR}/lib/ios/libcurl.a - -# check the flat lib -lipo -info ${DIST_DIR}/lib/tvos/libcurl.a - - -# create fat lib for mac -lipo -create install_osx_arm64/${LIB_NAME}/lib/libcurl.a install_osx_x64/${LIB_NAME}/lib/libcurl.a -output ${DIST_DIR}/lib/mac/libcurl.a - - -# check the fat lib -lipo -info ${DIST_DIR}/lib/mac/libcurl.a +# # create flat lib for ios +# if [ -f "install_ios_arm/${LIB_NAME}/lib/libcurl.a" ] ; then +# lipo -create install_ios_arm/${LIB_NAME}/lib/libcurl.a install_ios_arm64/${LIB_NAME}/lib/libcurl.a install_ios_x64/${LIB_NAME}/lib/libcurl.a -output ${DIST_DIR}/lib/ios/libcurl.a +# else +# lipo -create install_ios_arm64/${LIB_NAME}/lib/libcurl.a install_ios_x64/${LIB_NAME}/lib/libcurl.a -output ${DIST_DIR}/lib/ios/libcurl.a +# fi + +# # create flat lib for tvos +# if [ -f "install_tvos_arm/${LIB_NAME}/lib/libcurl.a" ] ; then +# lipo -create install_tvos_arm/${LIB_NAME}/lib/libcurl.a install_tvos_arm64/${LIB_NAME}/lib/libcurl.a install_tvos_x64/${LIB_NAME}/lib/libcurl.a -output ${DIST_DIR}/lib/tvos/libcurl.a +# else +# lipo -create install_tvos_arm64/${LIB_NAME}/lib/libcurl.a install_tvos_x64/${LIB_NAME}/lib/libcurl.a -output ${DIST_DIR}/lib/tvos/libcurl.a +# fi + +# # check the flat lib +# lipo -info ${DIST_DIR}/lib/ios/libcurl.a + +# # check the flat lib +# lipo -info ${DIST_DIR}/lib/tvos/libcurl.a + + +# # create fat lib for mac +# lipo -create install_osx_arm64/${LIB_NAME}/lib/libcurl.a install_osx_x64/${LIB_NAME}/lib/libcurl.a -output ${DIST_DIR}/lib/mac/libcurl.a + + +# # check the fat lib +# lipo -info ${DIST_DIR}/lib/mac/libcurl.a + +xcodebuild -create-xcframework \ + -library install_ios_arm64/${LIB_NAME}/lib/libcurl.a \ + -library install_ios_x64/${LIB_NAME}/lib/libcurl.a \ + -library install_ios_arm64_sim/${LIB_NAME}/lib/libcurl.a \ + -library install_tvos_arm64/${LIB_NAME}/lib/libcurl.a \ + -library install_tvos_x64/${LIB_NAME}/lib/libcurl.a \ + -library install_tvos_arm64_sim/${LIB_NAME}/lib/libcurl.a \ + -library install_osx_x64/${LIB_NAME}/lib/libcurl.a \ + -library install_osx_arm64/${LIB_NAME}/lib/libcurl.a \ + -output ${DIST_DIR}/lib/curl.xcframework diff --git a/src/jpeg-turbo/dist1.sh b/src/jpeg-turbo/dist1.sh index 01b37b5..10f7adb 100644 --- a/src/jpeg-turbo/dist1.sh +++ b/src/jpeg-turbo/dist1.sh @@ -4,28 +4,39 @@ DIST_DIR="${DIST_ROOT}/${LIB_NAME}" dist_lib ${LIB_NAME} ${DIST_DIR} $DISTF_NO_WINRT jconfig.h config_ab.h.in -# create flat lib for ios -if [ -f "install_ios_arm/${LIB_NAME}/lib/libjpeg.a" ] ; then - lipo -create install_ios_arm/${LIB_NAME}/lib/libjpeg.a install_ios_arm64/${LIB_NAME}/lib/libjpeg.a install_ios_x64/${LIB_NAME}/lib/libjpeg.a -output ${DIST_DIR}/lib/ios/libjpeg.a -else - lipo -create install_ios_arm64/${LIB_NAME}/lib/libjpeg.a install_ios_x64/${LIB_NAME}/lib/libjpeg.a -output ${DIST_DIR}/lib/ios/libjpeg.a -fi - -# create flat lib for tvos -if [ -f "install_tvos_arm/${LIB_NAME}/lib/libjpeg.a" ] ; then - lipo -create install_tvos_arm/${LIB_NAME}/lib/libjpeg.a install_tvos_arm64/${LIB_NAME}/lib/libjpeg.a install_tvos_x64/${LIB_NAME}/lib/libjpeg.a -output ${DIST_DIR}/lib/tvos/libjpeg.a -else - lipo -create install_tvos_arm64/${LIB_NAME}/lib/libjpeg.a install_tvos_x64/${LIB_NAME}/lib/libjpeg.a -output ${DIST_DIR}/lib/tvos/libjpeg.a -fi - -# check the flat lib -lipo -info ${DIST_DIR}/lib/ios/libjpeg.a - -# check the flat lib -lipo -info ${DIST_DIR}/lib/tvos/libjpeg.a - -# create fat lib for mac -lipo -create install_osx_arm64/${LIB_NAME}/lib/libjpeg.a install_osx_x64/${LIB_NAME}/lib/libjpeg.a -output ${DIST_DIR}/lib/mac/libjpeg.a - -# check the fat lib -lipo -info ${DIST_DIR}/lib/mac/libjpeg.a +# # create flat lib for ios +# if [ -f "install_ios_arm/${LIB_NAME}/lib/libjpeg.a" ] ; then +# lipo -create install_ios_arm/${LIB_NAME}/lib/libjpeg.a install_ios_arm64/${LIB_NAME}/lib/libjpeg.a install_ios_x64/${LIB_NAME}/lib/libjpeg.a -output ${DIST_DIR}/lib/ios/libjpeg.a +# else +# lipo -create install_ios_arm64/${LIB_NAME}/lib/libjpeg.a install_ios_x64/${LIB_NAME}/lib/libjpeg.a -output ${DIST_DIR}/lib/ios/libjpeg.a +# fi + +# # create flat lib for tvos +# if [ -f "install_tvos_arm/${LIB_NAME}/lib/libjpeg.a" ] ; then +# lipo -create install_tvos_arm/${LIB_NAME}/lib/libjpeg.a install_tvos_arm64/${LIB_NAME}/lib/libjpeg.a install_tvos_x64/${LIB_NAME}/lib/libjpeg.a -output ${DIST_DIR}/lib/tvos/libjpeg.a +# else +# lipo -create install_tvos_arm64/${LIB_NAME}/lib/libjpeg.a install_tvos_x64/${LIB_NAME}/lib/libjpeg.a -output ${DIST_DIR}/lib/tvos/libjpeg.a +# fi + +# # check the flat lib +# lipo -info ${DIST_DIR}/lib/ios/libjpeg.a + +# # check the flat lib +# lipo -info ${DIST_DIR}/lib/tvos/libjpeg.a + +# # create fat lib for mac +# lipo -create install_osx_arm64/${LIB_NAME}/lib/libjpeg.a install_osx_x64/${LIB_NAME}/lib/libjpeg.a -output ${DIST_DIR}/lib/mac/libjpeg.a + +# # check the fat lib +# lipo -info ${DIST_DIR}/lib/mac/libjpeg.a + +xcodebuild -create-xcframework \ + -library install_ios_arm64/${LIB_NAME}/lib/libjpeg.a \ + -library install_ios_x64/${LIB_NAME}/lib/libjpeg.a \ + -library install_ios_arm64_sim/${LIB_NAME}/lib/libjpeg.a \ + -library install_tvos_arm64/${LIB_NAME}/lib/libjpeg.a \ + -library install_tvos_x64/${LIB_NAME}/lib/libjpeg.a \ + -library install_tvos_arm64_sim/${LIB_NAME}/lib/libjpeg.a \ + -library install_osx_x64/${LIB_NAME}/lib/libjpeg.a \ + -library install_osx_arm64/${LIB_NAME}/lib/libjpeg.a \ + -output ${DIST_DIR}/lib/jpeg.xcframework diff --git a/src/luajit/dist1.sh b/src/luajit/dist1.sh index 12d3d8d..d280748 100644 --- a/src/luajit/dist1.sh +++ b/src/luajit/dist1.sh @@ -5,26 +5,37 @@ DIST_DIR="${DIST_ROOT}/${LIB_NAME}" dist_lib ${LIB_NAME} ${DIST_DIR} $DISTF_NO_WINRT # create flat lib for ios -if [ -f "install_ios_arm/${LIB_NAME}/lib/libluajit.a" ] ; then - echo "Creating flat libluajit.a with armv7,arm64,x86_64" - lipo -create install_ios_arm/${LIB_NAME}/lib/libluajit.a install_ios_arm64/${LIB_NAME}/lib/libluajit.a install_ios_x64/${LIB_NAME}/lib/libluajit.a -output ${DIST_DIR}/lib/ios/libluajit.a -else - echo "Creating flat libluajit.a with arm64,x86_64" - lipo -create install_ios_arm64/${LIB_NAME}/lib/libluajit.a install_ios_x64/${LIB_NAME}/lib/libluajit.a -output ${DIST_DIR}/lib/ios/libluajit.a -fi +# if [ -f "install_ios_arm/${LIB_NAME}/lib/libluajit.a" ] ; then +# echo "Creating flat libluajit.a with armv7,arm64,x86_64" +# lipo -create install_ios_arm/${LIB_NAME}/lib/libluajit.a install_ios_arm64/${LIB_NAME}/lib/libluajit.a install_ios_x64/${LIB_NAME}/lib/libluajit.a -output ${DIST_DIR}/lib/ios/libluajit.a +# else +# echo "Creating flat libluajit.a with arm64,x86_64" +# lipo -create install_ios_arm64/${LIB_NAME}/lib/libluajit.a install_ios_x64/${LIB_NAME}/lib/libluajit.a -output ${DIST_DIR}/lib/ios/libluajit.a +# fi -# create flat lib for tvos -if [ -f "install_tvos_arm/${LIB_NAME}/lib/libluajit.a" ] ; then - echo "Creating flat libluajit.a with armv7,arm64,x86_64" - lipo -create install_tvos_arm/${LIB_NAME}/lib/libluajit.a install_tvos_arm64/${LIB_NAME}/lib/libluajit.a install_tvos_x64/${LIB_NAME}/lib/libluajit.a -output ${DIST_DIR}/lib/tvos/libluajit.a -else - echo "Creating flat libluajit.a with arm64,x86_64" - lipo -create install_tvos_arm64/${LIB_NAME}/lib/libluajit.a install_tvos_x64/${LIB_NAME}/lib/libluajit.a -output ${DIST_DIR}/lib/tvos/libluajit.a -fi +# # create flat lib for tvos +# if [ -f "install_tvos_arm/${LIB_NAME}/lib/libluajit.a" ] ; then +# echo "Creating flat libluajit.a with armv7,arm64,x86_64" +# lipo -create install_tvos_arm/${LIB_NAME}/lib/libluajit.a install_tvos_arm64/${LIB_NAME}/lib/libluajit.a install_tvos_x64/${LIB_NAME}/lib/libluajit.a -output ${DIST_DIR}/lib/tvos/libluajit.a +# else +# echo "Creating flat libluajit.a with arm64,x86_64" +# lipo -create install_tvos_arm64/${LIB_NAME}/lib/libluajit.a install_tvos_x64/${LIB_NAME}/lib/libluajit.a -output ${DIST_DIR}/lib/tvos/libluajit.a +# fi -# create fat lib for mac -lipo -create install_osx_arm64/${LIB_NAME}/lib/libluajit.a install_osx_x64/${LIB_NAME}/lib/libluajit.a -output ${DIST_DIR}/lib/mac/libluajit.a +# # create fat lib for mac +# lipo -create install_osx_arm64/${LIB_NAME}/lib/libluajit.a install_osx_x64/${LIB_NAME}/lib/libluajit.a -output ${DIST_DIR}/lib/mac/libluajit.a -# check the fat lib -lipo -info ${DIST_DIR}/lib/mac/libluajit.a +# # check the fat lib +# lipo -info ${DIST_DIR}/lib/mac/libluajit.a + +xcodebuild -create-xcframework \ + -library install_ios_arm64/${LIB_NAME}/lib/libluajit.a \ + -library install_ios_x64/${LIB_NAME}/lib/libluajit.a \ + -library install_ios_arm64_sim/${LIB_NAME}/lib/libluajit.a \ + -library install_tvos_arm64/${LIB_NAME}/lib/libluajit.a \ + -library install_tvos_x64/${LIB_NAME}/lib/libluajit.a \ + -library install_tvos_arm64_sim/${LIB_NAME}/lib/libluajit.a \ + -library install_osx_x64/${LIB_NAME}/lib/libluajit.a \ + -library install_osx_arm64/${LIB_NAME}/lib/libluajit.a \ + -output ${DIST_DIR}/lib/luajit.xcframework diff --git a/src/openssl/dist1.sh b/src/openssl/dist1.sh index d9b85d2..2171079 100644 --- a/src/openssl/dist1.sh +++ b/src/openssl/dist1.sh @@ -4,36 +4,56 @@ DIST_DIR="${DIST_ROOT}/${LIB_NAME}" dist_lib ${LIB_NAME} ${DIST_DIR} $DISTF_ALL configuration.h config.h.in openssl/ -# create flat lib for ios -if [ -f "install_ios_arm/${LIB_NAME}/lib/libssl.a" ] ; then - lipo -create install_ios_arm/${LIB_NAME}/lib/libssl.a install_ios_arm64/${LIB_NAME}/lib/libssl.a install_ios_x64/${LIB_NAME}/lib/libssl.a -output ${DIST_DIR}/lib/ios/libssl.a - lipo -create install_ios_arm/${LIB_NAME}/lib/libcrypto.a install_ios_arm64/${LIB_NAME}/lib/libcrypto.a install_ios_x64/${LIB_NAME}/lib/libcrypto.a -output ${DIST_DIR}/lib/ios/libcrypto.a -else - lipo -create install_ios_arm64/${LIB_NAME}/lib/libssl.a install_ios_x64/${LIB_NAME}/lib/libssl.a -output ${DIST_DIR}/lib/ios/libssl.a - lipo -create install_ios_arm64/${LIB_NAME}/lib/libcrypto.a install_ios_x64/${LIB_NAME}/lib/libcrypto.a -output ${DIST_DIR}/lib/ios/libcrypto.a -fi - -# create flat lib for tvos -if [ -f "install_tvos_arm/${LIB_NAME}/lib/libssl.a" ] ; then - lipo -create install_tvos_arm/${LIB_NAME}/lib/libssl.a install_tvos_arm64/${LIB_NAME}/lib/libssl.a install_tvos_x64/${LIB_NAME}/lib/libssl.a -output ${DIST_DIR}/lib/tvos/libssl.a - lipo -create install_tvos_arm/${LIB_NAME}/lib/libcrypto.a install_tvos_arm64/${LIB_NAME}/lib/libcrypto.a install_tvos_x64/${LIB_NAME}/lib/libcrypto.a -output ${DIST_DIR}/lib/tvos/libcrypto.a -else - lipo -create install_tvos_arm64/${LIB_NAME}/lib/libssl.a install_tvos_x64/${LIB_NAME}/lib/libssl.a -output ${DIST_DIR}/lib/tvos/libssl.a - lipo -create install_tvos_arm64/${LIB_NAME}/lib/libcrypto.a install_tvos_x64/${LIB_NAME}/lib/libcrypto.a -output ${DIST_DIR}/lib/tvos/libcrypto.a -fi - -# check the flat lib -lipo -info ${DIST_DIR}/lib/ios/libssl.a -lipo -info ${DIST_DIR}/lib/ios/libcrypto.a - -# check the flat lib -lipo -info ${DIST_DIR}/lib/tvos/libssl.a -lipo -info ${DIST_DIR}/lib/tvos/libcrypto.a - -# create fat lib for mac -lipo -create install_osx_arm64/${LIB_NAME}/lib/libssl.a install_osx_x64/${LIB_NAME}/lib/libssl.a -output ${DIST_DIR}/lib/mac/libssl.a -lipo -create install_osx_arm64/${LIB_NAME}/lib/libcrypto.a install_osx_x64/${LIB_NAME}/lib/libcrypto.a -output ${DIST_DIR}/lib/mac/libcrypto.a - -# check the fat lib -lipo -info ${DIST_DIR}/lib/mac/libssl.a -lipo -info ${DIST_DIR}/lib/mac/libcrypto.a +# # create flat lib for ios +# if [ -f "install_ios_arm/${LIB_NAME}/lib/libssl.a" ] ; then +# lipo -create install_ios_arm/${LIB_NAME}/lib/libssl.a install_ios_arm64/${LIB_NAME}/lib/libssl.a install_ios_x64/${LIB_NAME}/lib/libssl.a -output ${DIST_DIR}/lib/ios/libssl.a +# lipo -create install_ios_arm/${LIB_NAME}/lib/libcrypto.a install_ios_arm64/${LIB_NAME}/lib/libcrypto.a install_ios_x64/${LIB_NAME}/lib/libcrypto.a -output ${DIST_DIR}/lib/ios/libcrypto.a +# else +# lipo -create install_ios_arm64/${LIB_NAME}/lib/libssl.a install_ios_x64/${LIB_NAME}/lib/libssl.a -output ${DIST_DIR}/lib/ios/libssl.a +# lipo -create install_ios_arm64/${LIB_NAME}/lib/libcrypto.a install_ios_x64/${LIB_NAME}/lib/libcrypto.a -output ${DIST_DIR}/lib/ios/libcrypto.a +# fi + +# # create flat lib for tvos +# if [ -f "install_tvos_arm/${LIB_NAME}/lib/libssl.a" ] ; then +# lipo -create install_tvos_arm/${LIB_NAME}/lib/libssl.a install_tvos_arm64/${LIB_NAME}/lib/libssl.a install_tvos_x64/${LIB_NAME}/lib/libssl.a -output ${DIST_DIR}/lib/tvos/libssl.a +# lipo -create install_tvos_arm/${LIB_NAME}/lib/libcrypto.a install_tvos_arm64/${LIB_NAME}/lib/libcrypto.a install_tvos_x64/${LIB_NAME}/lib/libcrypto.a -output ${DIST_DIR}/lib/tvos/libcrypto.a +# else +# lipo -create install_tvos_arm64/${LIB_NAME}/lib/libssl.a install_tvos_x64/${LIB_NAME}/lib/libssl.a -output ${DIST_DIR}/lib/tvos/libssl.a +# lipo -create install_tvos_arm64/${LIB_NAME}/lib/libcrypto.a install_tvos_x64/${LIB_NAME}/lib/libcrypto.a -output ${DIST_DIR}/lib/tvos/libcrypto.a +# fi + +# # check the flat lib +# lipo -info ${DIST_DIR}/lib/ios/libssl.a +# lipo -info ${DIST_DIR}/lib/ios/libcrypto.a + +# # check the flat lib +# lipo -info ${DIST_DIR}/lib/tvos/libssl.a +# lipo -info ${DIST_DIR}/lib/tvos/libcrypto.a + +# # create fat lib for mac +# lipo -create install_osx_arm64/${LIB_NAME}/lib/libssl.a install_osx_x64/${LIB_NAME}/lib/libssl.a -output ${DIST_DIR}/lib/mac/libssl.a +# lipo -create install_osx_arm64/${LIB_NAME}/lib/libcrypto.a install_osx_x64/${LIB_NAME}/lib/libcrypto.a -output ${DIST_DIR}/lib/mac/libcrypto.a + +# # check the fat lib +# lipo -info ${DIST_DIR}/lib/mac/libssl.a +# lipo -info ${DIST_DIR}/lib/mac/libcrypto.a + + +xcodebuild -create-xcframework \ + -library install_ios_arm64/${LIB_NAME}/lib/libssl.a \ + -library install_ios_x64/${LIB_NAME}/lib/libssl.a \ + -library install_ios_arm64_sim/${LIB_NAME}/lib/libssl.a \ + -library install_tvos_arm64/${LIB_NAME}/lib/libssl.a \ + -library install_tvos_x64/${LIB_NAME}/lib/libssl.a \ + -library install_tvos_arm64_sim/${LIB_NAME}/lib/libssl.a \ + -library install_osx_x64/${LIB_NAME}/lib/libssl.a \ + -library install_osx_arm64/${LIB_NAME}/lib/libssl.a \ + -library install_ios_arm64/${LIB_NAME}/lib/libcrypto.a \ + -library install_ios_x64/${LIB_NAME}/lib/libcrypto.a \ + -library install_ios_arm64_sim/${LIB_NAME}/lib/libcrypto.a \ + -library install_tvos_arm64/${LIB_NAME}/lib/libcrypto.a \ + -library install_tvos_x64/${LIB_NAME}/lib/libcrypto.a \ + -library install_tvos_arm64_sim/${LIB_NAME}/lib/libcrypto.a \ + -library install_osx_x64/${LIB_NAME}/lib/libcrypto.a \ + -library install_osx_arm64/${LIB_NAME}/lib/libcrypto.a \ + -output ${DIST_DIR}/lib/openssl.xcframework diff --git a/src/zlib/dist1.sh b/src/zlib/dist1.sh index d6bc603..4f1675a 100644 --- a/src/zlib/dist1.sh +++ b/src/zlib/dist1.sh @@ -4,31 +4,42 @@ DIST_DIR="${DIST_ROOT}/${LIB_NAME}" dist_lib ${LIB_NAME} ${DIST_DIR} $DISTF_NATIVES -# create flat lib for ios -if [ -f "install_ios_arm/${LIB_NAME}/lib/libz.a" ] ; then - lipo -create install_ios_arm/${LIB_NAME}/lib/libz.a install_ios_arm64/${LIB_NAME}/lib/libz.a install_ios_x64/${LIB_NAME}/lib/libz.a -output ${DIST_DIR}/lib/ios/libz.a -else - lipo -create install_ios_arm64/${LIB_NAME}/lib/libz.a install_ios_x64/${LIB_NAME}/lib/libz.a -output ${DIST_DIR}/lib/ios/libz.a -fi +# # create flat lib for ios +# if [ -f "install_ios_arm/${LIB_NAME}/lib/libz.a" ] ; then +# lipo -create install_ios_arm/${LIB_NAME}/lib/libz.a install_ios_arm64/${LIB_NAME}/lib/libz.a install_ios_x64/${LIB_NAME}/lib/libz.a -output ${DIST_DIR}/lib/ios/libz.a +# else +# lipo -create install_ios_arm64/${LIB_NAME}/lib/libz.a install_ios_x64/${LIB_NAME}/lib/libz.a -output ${DIST_DIR}/lib/ios/libz.a +# fi -# create flat lib for tvos -if [ -f "install_tvos_arm/${LIB_NAME}/lib/libz.a" ] ; then - lipo -create install_tvos_arm/${LIB_NAME}/lib/libz.a install_tvos_arm64/${LIB_NAME}/lib/libz.a install_tvos_x64/${LIB_NAME}/lib/libz.a -output ${DIST_DIR}/lib/tvos/libz.a -else - lipo -create install_tvos_arm64/${LIB_NAME}/lib/libz.a install_tvos_x64/${LIB_NAME}/lib/libz.a -output ${DIST_DIR}/lib/tvos/libz.a -fi +# # create flat lib for tvos +# if [ -f "install_tvos_arm/${LIB_NAME}/lib/libz.a" ] ; then +# lipo -create install_tvos_arm/${LIB_NAME}/lib/libz.a install_tvos_arm64/${LIB_NAME}/lib/libz.a install_tvos_x64/${LIB_NAME}/lib/libz.a -output ${DIST_DIR}/lib/tvos/libz.a +# else +# lipo -create install_tvos_arm64/${LIB_NAME}/lib/libz.a install_tvos_x64/${LIB_NAME}/lib/libz.a -output ${DIST_DIR}/lib/tvos/libz.a +# fi -# check the flat lib -lipo -info ${DIST_DIR}/lib/ios/libz.a +# # check the flat lib +# lipo -info ${DIST_DIR}/lib/ios/libz.a -# check the flat lib -lipo -info ${DIST_DIR}/lib/tvos/libz.a +# # check the flat lib +# lipo -info ${DIST_DIR}/lib/tvos/libz.a -# create fat lib for mac -lipo -create install_osx_arm64/${LIB_NAME}/lib/libz.a install_osx_x64/${LIB_NAME}/lib/libz.a -output ${DIST_DIR}/lib/mac/libz.a +# # create fat lib for mac +# lipo -create install_osx_arm64/${LIB_NAME}/lib/libz.a install_osx_x64/${LIB_NAME}/lib/libz.a -output ${DIST_DIR}/lib/mac/libz.a # check the fat lib -lipo -info ${DIST_DIR}/lib/ios/libz.a +# lipo -info ${DIST_DIR}/lib/ios/libz.a + +xcodebuild -create-xcframework \ + -library install_ios_arm64/${LIB_NAME}/lib/libz.a \ + -library install_ios_x64/${LIB_NAME}/lib/libz.a \ + -library install_ios_arm64_sim/${LIB_NAME}/lib/libz.a \ + -library install_tvos_arm64/${LIB_NAME}/lib/libz.a \ + -library install_tvos_x64/${LIB_NAME}/lib/libz.a \ + -library install_tvos_arm64_sim/${LIB_NAME}/lib/libz.a \ + -library install_osx_x64/${LIB_NAME}/lib/libz.a \ + -library install_osx_arm64/${LIB_NAME}/lib/libz.a \ + -output ${DIST_DIR}/lib/zlib.xcframework # overrite zconf.h with common header cp -f src/zlib/zconf.h ${DIST_DIR}/include/