From eed019964c0a5f816de116f698afd3f0b6b6676c Mon Sep 17 00:00:00 2001 From: Paul Brossier Date: Thu, 28 Dec 2023 11:53:28 +0100 Subject: [PATCH] [scripts] do not build fat frameworks for ios --- scripts/build_apple_frameworks | 26 ++++++-------------------- 1 file changed, 6 insertions(+), 20 deletions(-) diff --git a/scripts/build_apple_frameworks b/scripts/build_apple_frameworks index d884c3bb..da9418ae 100755 --- a/scripts/build_apple_frameworks +++ b/scripts/build_apple_frameworks @@ -45,19 +45,6 @@ function create_framework() { popd } -function create_framework_fat() { - rm -rf $AUBIO_TMPDIR/framework-$3 - mkdir -p $AUBIO_TMPDIR/framework-$3/$1-$2.$3_framework/$1.framework - cp -pr COPYING README.md $AUBIO_TMPDIR/framework-$3/$1-$2.$3_framework - pushd $AUBIO_TMPDIR/framework-$3 - cp -pr $AUBIO_TMPDIR/framework-ios/$1-$2.ios_framework/$1.framework/Headers $1-$2.$3_framework/$1.framework - cp -pr $AUBIO_TMPDIR/framework-ios/$1-$2.ios_framework/$1.framework/Modules $1-$2.$3_framework/$1.framework - lipo $AUBIO_TMPDIR/framework-ios/$1-$2.ios_framework/$1.framework/$1 \ - $AUBIO_TMPDIR/framework-iosimulator/$1-$2.iosimulator_framework/$1.framework/$1 \ - -output $1-$2.$3_framework/$1.framework/$1 -create - popd -} - function create_framework_zip() { # create zip pushd $AUBIO_TMPDIR/framework-$3 @@ -84,19 +71,18 @@ do create_framework $PACKAGE $VERSION $PLATFORM if [ $PLATFORM == 'darwin' ] then - # on darwin, build a .tar.bz2 of /usr and a .zip of aubio.framework + # on darwin, build a .tar.bz2 of /usr create_tarballs $PACKAGE $VERSION $PLATFORM - create_framework_zip $PACKAGE $VERSION $PLATFORM fi + + # build a .zip of aubio.framework + create_framework_zip $PACKAGE $VERSION $PLATFORM + + # clean up ./waf uninstall $WAF_OPTIONS done -# after both ios and iosimulator have been built -PLATFORM=iosuniversal -create_framework_fat $PACKAGE $VERSION $PLATFORM -create_framework_zip $PACKAGE $VERSION $PLATFORM - ./waf clean ./waf distclean -- 2.11.0