Merge pull request #5 from weslleymurdock/feature/release

Feature/release

Author: weslleymurdock

Diff for: .github/workflows/pjsua2.yml

@@ -9,18 +9,26 @@ on:
 
 jobs:
   libpjsua2-ios:
-    runs-on: macos-latest
+    runs-on: macos-13
+    name: iOS Build
     permissions:
           contents: write
-    steps:  
-      - uses: actions/checkout@v4
+    steps:
+      - name: Setup Xcode
+        uses: maxim-lobanov/[email protected]
+        with:
+          xcode-version: '15.1'
+      - name: Checkout
+        uses: actions/checkout@v4
         with:
           submodules: recursive
       - name: build all ios archs
         run: |
-          brew install nasm autoconf automake libtool
-          ./build --ssl --opus --h264 -a=armv7,armv7s,arm64
+          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 --ssl --opus --h264 -a=x86_64,arm64
       - uses: actions/upload-artifact@v3
         with:
-          name: lipjsua2-ios
-          path: ${{ github.workspace }}/lib
+          name: libpjsua2-ios
+          path: ${{ github.workspace }}/libpjsua2

Diff for: .github/workflows/release.yml

@@ -0,0 +1,47 @@
+name: Release
+run-name: Release libpjsua2 🚀
+
+on: 
+  push:
+    tags:
+      '*'
+jobs:
+  release:
+    runs-on: macos-13
+    permissions:
+      contents: write
+    steps:  
+    - name: Setup Xcode
+      uses: maxim-lobanov/[email protected]
+      with:
+        xcode-version: '15.1'
+    - name: Checkout
+      uses: actions/checkout@v4
+      with:
+        submodules: recursive 
+    - name: build pjsip with opus 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 -a=x86_64,arm64
+        tar -zcvf libpjsua2.tar.gz ./libpjsua2
+    - name: release
+      uses: actions/create-release@v1
+      id: create_release
+      with:
+        draft: false
+        prerelease: false
+        release_name: ${{ github.ref }}
+        tag_name: ${{ github.ref }}
+        body_path: CHANGELOG.md
+      env: 
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    - name: upload ios artifact
+      uses: actions/upload-release-asset@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: ${{ steps.create_release.outputs.upload_url }}
+        asset_path: ./libpjsua2.tar.gz
+        asset_name: libpjsua2.tar.gz
+        asset_content_type: application/gzip

Diff for: CHANGELOG.md

@@ -0,0 +1 @@
+- First Release

Diff for: README.md

@@ -38,8 +38,7 @@ An android version is available [here](https://github.com/weslleymurdock/libpjsu
 ### Remaining TODO
 
 - [ ] Workflow for Xamarin app build.
-- [ ] Port PJSIP Xamarin app to MAUI
-- [ ] Release c# bindings
+- [ ] Port PJSIP Xamarin app to MAUI 
 
 ### ACKNOWLEDGEMENTS
 

Diff for: build

@@ -13,8 +13,8 @@ export PATH_REPO="/Users/runner/work/libpjsua2-ios/libpjsua2-ios"
 #export BASE_DIR=`pwd -P`
 export BASE_DIR="$PATH_REPO"
 
-export MIN_IOS_VERSION="10.0"
-export IOS_SDK_VERSION="16.2"
+export MIN_IOS_VERSION="11.0"
+export IOS_SDK_VERSION="17.2"
 export AVAILABLE_ARCHS
 export USE_ARCHS=()
 
@@ -28,7 +28,7 @@ export ENABLE_ZRTP=false
 export HAS_BITCODE=true
 export HAS_IPV6=false
 export SHOW_HELP=false
-export PJSIP_VERSION="2.13.1"
+export PJSIP_VERSION="2.14"
 export PJSIP_BASE_URL="https://github.com/pjsip/pjproject.git"
 export PJSIP_DIR="$BASE_DIR/pjsip"
 export PJSIP_FINAL_LIB_DIR="$BASE_DIR/lib"
@@ -245,7 +245,8 @@ function build_ssl () {
     mv include2/openssl include/openssl
     popd > /dev/null
     echo "Using SSL..."
-
+    rm -rf lib 
+     
     if [ $ENABLE_ZRTP = true ]; then
         build_zrtp
     fi
@@ -393,6 +394,10 @@ function config_site () {
     if [ $HAS_IPV6 = true ]; then
         echo " #define PJ_HAS_IPV6 1" >> $PJSIP_CONFIG_SITE_H
     fi
+    
+    if [ $OPUS_SUPPORT = true ]; then
+        echo "#define PJMEDIA_HAS_OPUS_CODEC 1" >> "$PJSIP_CONFIG_SITE_H"
+    fi
 
     while IFS=',' read -ra CONFIG_SITE_OPTION; do
         for i in "${CONFIG_SITE_OPTION[@]}"; do
@@ -412,6 +417,7 @@ function build_archs () {
         configure_"$arch"
         _build $arch
         _collect $arch
+        _merge_archs $arch
     done
 
     echo "Done building the ABIs"
@@ -470,14 +476,25 @@ function _build () {
         export CFLAGS="${CFLAGS} -fembed-bitcode"
     fi
 
-    if [ $SSL_SUPPORT = true ]; then
-        configure="$configure --with-ssl=${SSL_BUILD_DIR}"
-        export CFLAGS="${CFLAGS} -I${SSL_BUILD_DIR}/include"
-        export LDFLAGS="${LDFLAGS} -L${SSL_BUILD_DIR}/lib"
+    
+    if [ $SSL_SUPPORT = true ]; then 
+        if [ "$arch" != "i386" ] && [ "$arch" != "x86_64" ]; then
+            configure="$configure --with-ssl=${SSL_BUILD_DIR}/bin/iPhoneOS${IOS_SDK_VERSION}-${arch}.sdk"
+            export CFLAGS="${CFLAGS} -I${SSL_BUILD_DIR}/bin/iPhoneOS${IOS_SDK_VERSION}-${arch}.sdk/include"
+            export LDFLAGS="${LDFLAGS} -L${SSL_BUILD_DIR}/bin/iPhoneOS${IOS_SDK_VERSION}-${arch}.sdk/lib"
+        else
+            configure="$configure --with-ssl=${SSL_BUILD_DIR}/bin/iPhoneSimulator${IOS_SDK_VERSION}-${arch}.sdk"
+            export CFLAGS="${CFLAGS} -I${SSL_BUILD_DIR}/bin/iPhoneSimulator${IOS_SDK_VERSION}-${arch}.sdk/include"
+            export LDFLAGS="${LDFLAGS} -L${SSL_BUILD_DIR}/bin/iPhoneSimulator${IOS_SDK_VERSION}-${arch}.sdk/lib"
+        fi
     fi
 
     if [ $OPUS_SUPPORT = true ]; then
-        configure="$configure --with-opus=${OPUS_BUILD_DIR}/dependencies"
+        if [ "$arch" != "i386" ] && [ "$arch" != "x86_64" ]; then
+            configure="$configure --with-opus=${OPUS_BUILD_DIR}/build/built/iPhoneOS${IOS_SDK_VERSION}-${arch}.sdk/"
+        else
+            configure="$configure --with-opus=${OPUS_BUILD_DIR}/build/built/iPhoneSimulator${IOS_SDK_VERSION}-${arch}.sdk/"
+        fi
     fi
 
     if [ $H264_SUPPORT = true ]; then
@@ -487,7 +504,6 @@ function _build () {
     fi
 
     export LDFLAGS="${LDFLAGS} -lstdc++"
-    #export MIN_IOS="-miphoneos-version-min=${MIN_IOS_VERSION}"
 
     if [ "$arch" == "i386" ] || [ "$arch" == "x86_64" ]; then
         export MIN_IOS="-mios-simulator-version-min=${MIN_IOS_VERSION}"
@@ -499,11 +515,11 @@ function _build () {
 
     cp $PJSIP_CONFIG_SITE_H "$PJSIP_SRC_DIR/pjlib/include/pj"
 
-    ARCH="-arch $arch" $configure >> $arch_log 2>&1 || exit
+    ARCH="-arch $arch" $configure #>> $arch_log 2>&1 || exit
     echo "make dep"
-    make dep    
+    make dep  >> $arch_log 2>&1  
     echo "make " 
-    make  
+    make  >> $arch_log 2>&1
 
     if [ $SSL_SUPPORT = true ]; then
         if [ $ENABLE_ZRTP = true ]; then
@@ -522,7 +538,7 @@ function _build () {
     cd "$PJSIP_SRC_DIR/pjsip-apps/src/swig"
     make clean
     make
-
+    
     echo "Done building for $arch"
     echo "============================="
 
@@ -535,75 +551,34 @@ function _collect () {
     cd $BASE_DIR
     mkdir -p "lib/$1"
 
-    if [ -d "$PJSIP_SRC_DIR/pjsip-apps/src/swig/csharp/pjsua2xamarin/pjsua2xamarin.iOS/lib/" ]; then
-        cp -v "$PJSIP_SRC_DIR/pjsip-apps/src/swig/csharp/pjsua2xamarin/pjsua2xamarin.iOS/lib/$1/libpjsua2.a" ./lib/$1
+    if [ -d "$PJSIP_SRC_DIR/pjsip-apps/src/swig/csharp/pjsua2maui/pjsua2maui.iOS/lib/" ]; then
+        cp -v "$PJSIP_SRC_DIR/pjsip-apps/src/swig/csharp/pjsua2maui/pjsua2maui.iOS/lib/$1/libpjsua2.a" $BASE_DIR/lib/$1
     fi
 
-    if [ -d ./pjsip/external/openh264/build/$1/lib ]; then
-        cp -v ./pjsip/external/openh264/build/$1/lib/*.a  ./lib/$1
+    if [ -d ./external/openh264/builds/$1/lib ]; then
+        cp -v ./external/openh264/builds/$1/lib/*.a  $BASE_DIR/lib/$1
     fi
 
-    if [ -d ./pjsip/external/opus/build/built/*$1.sdk/lib ]; then
-        cp -v ./pjsip/external/opus/build/built/*$1.sdk/lib/*.a  ./lib/$1
+    if [ -d ./external/opus/build/built/*$1.sdk/lib ]; then
+        cp -v ./external/opus/build/built/*$1.sdk/lib/*.a  $BASE_DIR/lib/$1
     fi
 
-    if [ -d ./pjsip/external/openssl_ios/bin/*$1.sdk/lib ]; then
-        cp -v ./pjsip/external/openssl_ios/bin/*$1.sdk/lib/*.a  ./lib/$1
+    if [ -d ./external/openssl_ios/bin/*$1.sdk/lib ]; then
+        cp -v ./external/openssl_ios/bin/*$1.sdk/lib/*.a  $BASE_DIR/lib/$1
     fi
 
     # if [ $INDEPENDENT_WEBRTC = true ]; then
-    #     rm ./pjsip/temp/$1/libsrtp*.a
+    #     rm ./pjproject/third_party/lib/libsrtp*.a
     # fi
 }
 
-function _copy_built_files () {
-    echo "copy"
+function _merge_archs () {
+    echo "============================="
+    echo "======== MERGE LIBS ========="
     cd $BASE_DIR
-    lipo_args=""
-    mkdir -p "$PJSIP_FINAL_LIB_DIR"
-    a_files=`find ./pjproject -name *.a -exec printf '%s ' {} +`
-
-    for arch in "${USE_ARCHS[@]}"; do
-
-        mkdir -p "$PJSIP_FINAL_LIB_DIR/$arch"
-
-        if [ -d ./pjsip/external/openh264/build/$arch/lib ]; then
-            cp -v ./pjsip/external/openh264/build/$arch/lib/*.a  ${PJSIP_FINAL_LIB_DIR}/$arch
-        fi
-
-        if [ -d ./pjsip/external/opus/build/built/*$arch.sdk/lib ]; then
-            cp -v ./pjsip/external/opus/build/built/*$arch.sdk/lib/*.a  ${PJSIP_FINAL_LIB_DIR}/$arch
-        fi
-        
-        if [ -d ./pjsip/external/openssl_ios/bin/*$arch.sdk/lib ]; then
-            cp -v ./pjsip/external/openssl_ios/bin/*$arch.sdk/lib/*.a  ${PJSIP_FINAL_LIB_DIR}/$arch
-        fi
-        
-    done
-     
-    if [ ! -d "${PJSIP_FINAL_LIB_DIR}/fat" ]; then
-        mkdir -p "${PJSIP_FINAL_LIB_DIR}/fat"
-    fi
-
-    if [ ! -d "${PJSIP_FINAL_LIB_DIR}/pjsua2xamarin" ]; then
-        mkdir -p "${PJSIP_FINAL_LIB_DIR}/pjsua2xamarin"
-    fi
-
-    if [ -d "$PJSIP_SRC_DIR/pjsip-apps/src/swig/csharp/pjsua2xamarin" ]; then 
-        cp -v -r "$PJSIP_SRC_DIR/pjsip-apps/src/swig/csharp/pjsua2xamarin" "${PJSIP_FINAL_LIB_DIR}/pjsua2xamarin"
-    fi
-    echo "--- libtool fat pjsua2"
-
-
-
-    libtool -o "$PJSIP_FINAL_LIB_DIR/fat/libpjsua2.a" $a_files
-
-
-
-    #echo "--- Lipo pjsua2"
-    #xcrun -sdk iphoneos lipo ${lipo_args} -create -output "${PJSIP_FINAL_LIB_DIR}/fat/libpjsua2.a" || exit
-
-    #cp -v "$PJSIP_FINAL_LIB_DIR/libpjsua2.a" ./Pod
+    mkdir -p "libpjsua2/lib/$1"
+    libtool -static -o ./libpjsua2/lib/$1/libpjsua2.a $BASE_DIR/lib/$1/*
+    echo "============================="
 }
 
 function clean_pjsip_libs () {
@@ -734,7 +709,12 @@ function create_framework {
     echo "============================="
 }
 
-
+function copy_swig_bindings () {
+    cd $BASE_DIR
+    if [ -d "$PJSIP_SRC_DIR/pjsip-apps/src/swig/csharp/pjsua2maui/pjsua2maui" ]; then 
+        cp -v -r "$PJSIP_SRC_DIR/pjsip-apps/src/swig/csharp/pjsua2maui/pjsua2maui" "libpjsua2/lib/"
+    fi
+}
 start=`date +%s`
 
 export -f copy_to_lib_dir
@@ -752,7 +732,8 @@ else
     build_ssl
     build_opus
     config_site
-    build_archs
+    build_archs 
+    copy_swig_bindings
     #create_framework
 fi
 

Diff for: tag.sh

@@ -0,0 +1,48 @@
+#!/bin/bash
+set -e
+
+export VERSION="v"
+ 
+function release_tag () {
+
+    if [ "$VERSION" == "v" ]; then 
+        echo "please set a version with 'v=*' parameter"
+        exit 1
+    fi
+     
+    git tag $VERSION
+    git push origin --tags
+}
+
+function reset_tag () {
+    echo "git tag -d ${VERSION}"
+    git tag -d $VERSION
+    
+    echo "git push --delete origin ${VERSION}"
+    git push --delete origin $VERSION
+}
+
+
+for i in "$@"; do
+    case $i in
+    --version=*| v=*)
+    VERSION_NUMBERS="${i#*=}"
+    VERSION+="${VERSION_NUMBERS}"
+    shift
+    ;;
+    --reset)
+    reset_tag 
+    shift
+    ;;
+    --release)
+    release_tag
+    shift
+    ;;
+    --help)
+    show_help
+    shift
+    ;;
+    *)
+    ;;
+    esac
+done