Merge pull request #11 from weslleymurdock/fix/build-script

Fix/build script

Author: weslleymurdock

.github/workflows/pjsua2.yml

@@ -9,13 +9,17 @@ on:
 
 jobs:
   libpjsua2-ios:
-    runs-on: macos-13
+    runs-on: self-hosted
     name: iOS Build
     permissions:
           contents: write
     steps:
+      - uses: maxim-lobanov/setup-xcode@v1
+        with:
+          xcode-version: latest-stable
+
       - name: Selecting Xcode Version
-        run: sudo xcode-select -switch /Applications/Xcode_15.2.app
+        run: sudo xcode-select -switch /Applications/Xcode.app
 
       - name: Running Xcode version Is?
         run: /usr/bin/xcodebuild -version
@@ -27,9 +31,8 @@ jobs:
       - name: build all ios archs
         run: |
           brew install nasm autoconf automake libtool swig
-          sudo mv /Applications/Xcode_15.1.app /Applications/Xcode.app
           sed -i'' -e 's/xamarin/maui/g' ${{ github.workspace }}/pjproject/pjsip-apps/src/swig/csharp/Makefile
-          ./build h264 opus ssl bcg729 -a=x86_64,arm64 --ci
+          ./build h264 opus ssl bcg729 -a=x86_64,arm64  
       - uses: actions/upload-artifact@v3
         with:
           name: libpjsua2-ios

.github/workflows/release.yml

@@ -7,12 +7,17 @@ on:
       '*'
 jobs:
   release:
-    runs-on: macos-13
+    runs-on: self-hosted
+    name: iOS Build
     permissions:
-      contents: write
-    steps:  
+          contents: write
+    steps:
+    - uses: maxim-lobanov/setup-xcode@v1
+      with:
+        xcode-version: latest-stable
+
     - name: Selecting Xcode Version
-      run: sudo xcode-select -switch /Applications/Xcode_15.2.app
+      run: sudo xcode-select -switch /Applications/Xcode.app
 
     - name: Running Xcode version Is?
       run: /usr/bin/xcodebuild -version
@@ -21,11 +26,11 @@ jobs:
       uses: actions/checkout@v4
       with:
         submodules: recursive 
-    - name: build pjsip with opus and h264
+    - name: build pjsip with opus bcg729 and h264
       run: |
         brew install nasm autoconf automake libtool swig
         sed -i'' -e 's/xamarin/maui/g' ${{ github.workspace }}/pjproject/pjsip-apps/src/swig/csharp/Makefile
-        ./build h264 opus ssl bcg729 -a=x86_64,arm64 --ci
+        ./build h264 opus ssl bcg729 -a=x86_64,arm64  
         tar -zcvf libpjsua2.tar.gz ./libpjsua2
     - name: release
       uses: actions/create-release@v1

.gitignore

@@ -1 +1,4 @@
 .DS_Store
+lib/**/*.a
+pjsip/logs/*
+pjsip/config_site.h

build

@@ -12,8 +12,8 @@ export PATH_REPO="/Users/runner/work/libpjsua2-ios/libpjsua2-ios"
 
 export BASE_DIR=`pwd -P`
 
-export MIN_IOS_VERSION="11.0"
-export IOS_SDK_VERSION="17.2"
+export MIN_IOS_VERSION="12.2"
+export IOS_SDK_VERSION="18.1"
 export AVAILABLE_ARCHS
 export USE_ARCHS=()
 
@@ -25,7 +25,7 @@ export H264_SUPPORT=false
 export BCG729_SUPPORT=false
 export INDEPENDENT_WEBRTC=false
 export ENABLE_ZRTP=false
-export HAS_BITCODE=true
+export HAS_BITCODE=false
 export HAS_IPV6=false
 export SHOW_HELP=false
 export PJSIP_VERSION="2.14.1"
@@ -208,21 +208,25 @@ function build_bcg729 () {
         echo "-- BCG729: Compiling $arch" 
         if [ "$arch" == "x86_64" ]; then
             os_platform="iPhoneSimulator" 
-            mkdir -p "${os_platform}${IOS_SDK_VERSION}-${arch}.sdk"        
-            cmake . -DCMAKE_INSTALL_PREFIX="${os_platform}${IOS_SDK_VERSION}-${arch}.sdk" -DCMAKE_SKIP_INSTALL_RPATH=ON
-            make C_FLAGS="$C_FLAGS -O2 -m64 -mios-simulator-version-min=${MIN_IOS_VERSION} -isysroot ${xcode_dev_path}/Platforms/${os_platform}.platform/Developer/SDKs/${os_platform}.sdk -march=x86-64" || exit  
-
-        else
+            C_FLAGS="$C_FLAGS -O2 -m64 -mios-simulator-version-min=${MIN_IOS_VERSION} -isysroot ${xcode_dev_path}/Platforms/${os_platform}.platform/Developer/SDKs/${os_platform}.sdk "
+        else 
             os_platform="iPhoneOS"  
-            mkdir -p "${os_platform}${IOS_SDK_VERSION}-${arch}.sdk"            
-            cmake . -DCMAKE_INSTALL_PREFIX="${os_platform}${IOS_SDK_VERSION}-${arch}.sdk" -DCMAKE_SKIP_INSTALL_RPATH=ON
-            make C_FLAGS="$C_FLAGS -miphoneos-version-min=${MIN_IOS_VERSION} -isysroot ${xcode_dev_path}/Platforms/${os_platform}.platform/Developer/SDKs/${os_platform}.sdk -march=${arch}" || exit  
         fi
+
+        if [ -d "${BCG729_BUILD_DIR}/${os_platform}${IOS_SDK_VERSION}-${arch}.sdk"] ]; then
+            rm -rf "${BCG729_BUILD_DIR}/${os_platform}${IOS_SDK_VERSION}-${arch}.sdk" 
+        fi
+
+        if [ -d "${BCG729_BUILD_DIR}/CMakeFiles" ]; then
+            rm -rf "${BCG729_BUILD_DIR}/CMakeFiles"
+            rm -rf "${BCG729_BUILD_DIR}/CMakeCache.txt"
+        fi
+        mkdir -p "${os_platform}${IOS_SDK_VERSION}-${arch}.sdk"        
+        cmake -DCMAKE_OSX_ARCHITECTURES=${arch} -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${os_platform}${IOS_SDK_VERSION}-${arch}.sdk" -DCMAKE_SKIP_INSTALL_RPATH="ON" -DCMAKE_MAKE_PROGRAM:PATH=$(which make) -D CMAKE_C_COMPILER=`which gcc` .
+        make  || exit 
         make install 
+        lipo -info "$BCG729_BUILD_DIR/${os_platform}${IOS_SDK_VERSION}-${arch}.sdk/lib/libbcg729.a"
     done
-    lipo -info "$BCG729_BUILD_DIR/iPhoneSimulator17.2-x86_64.sdk/lib/libbcg729.a"
-    lipo -info "$BCG729_BUILD_DIR/iPhoneOS17.2-arm64.sdk/lib/libbcg729.a"
-
 }
 
 function build_h264 () {
@@ -261,8 +265,6 @@ function build_h264 () {
     if [ ! -d "${H264_BUILD_DIR}/lib" ]; then
         mkdir -p "${H264_BUILD_DIR}/lib"
     fi
-    echo "--- Lipo openH264"
-    xcrun -sdk iphoneos lipo ${h264_lipo_args} -create -output "${H264_BUILD_DIR}/lib/libopenh264.a" || exit
     echo "Done compiling openh264"
 }
 
@@ -282,8 +284,8 @@ function build_ssl () {
             targets="${targets} ios-cross-$arch"
         fi
     done
-
-    ./build-libssl.sh --version=1.1.1d --archs="${USE_ARCHS[*]// /\s}" --ios-min-sdk=${MIN_IOS_VERSION} --targets="$targets"|| exit
+    
+    CURL_OPTIONS="-L" ./build-libssl.sh --version=1.1.1s --archs="${USE_ARCHS[*]// /\s}" --ios-sdk=${IOS_SDK_VERSION} --ios-min-sdk=${MIN_IOS_VERSION} --targets="$targets"|| exit
 
     popd > /dev/null
     echo "Using SSL..."
@@ -514,8 +516,6 @@ function _build () {
     arch=$1
     arch_log="$PJSIP_LOGS_DIR/$arch.log"
 
-    #clean_pjsip_libs $arch
-
     configure="./configure-iphone"
 
     if [ $HAS_BITCODE = true ]; then