[feature] fmt (#350)

* fmt (cherry picked from commit dae3420) * FMT to fomulas to build * Fix tar.gz download * fmt rm tar * libfmt emscripten / fixed * Updating CMake Linux Toolchains to folder and code * fmt updated for all platforms * GitHub Actions * Actions Update / Android FMT * linux arm install firmware off * FMT Android * GitHub Actions * FMT Android * fmt android * fmt Android config * GitHub Actions catos off * GitHub Actions android only test * Android cmake fixes * GitHub Workflow all standard -a * GitHub Actions * GitHub Actions
openframeworks · Feb 18, 2024 · d9c882c · d9c882c
1 parent ddb6acc
commit d9c882c
Show file tree

Hide file tree

Showing 35 changed files with 911 additions and 163 deletions.
diff --git a/.github/disabled/build-android.yml b/.github/disabled/build-android.yml
diff --git a/.github/workflows/build-emscripten.yml → .github/disabled/build-emscripten.yml b/.github/workflows/build-emscripten.yml → .github/disabled/build-emscripten.yml
diff --git a/.github/disabled/build-linux-arm.yml b/.github/disabled/build-linux-arm.yml
@@ -42,15 +42,16 @@ jobs:
          TOOLCHAIN_PREFIX: "aarch64-linux-gnu"
         steps:
         - name: Determine Release
-        id: vars
-        run: |
-          if [[ "${{ github.ref }}" == "refs/heads/master" ]]; then
-            echo "::set-output name=tag::nightly"
-            echo "::set-output name=release::nightly"
-          elif [[ "${{ github.ref }}" == "refs/heads/bleeding" ]]; then
-            echo "::set-output name=tag::bleeding"
-            echo "::set-output name=release::bleeding"
-          fi
+          id: vars
+          shell: bash
+          run: |
+            if [[ "${{ github.ref }}" == "refs/heads/master" ]]; then
+              echo "release=nightly" >> $GITHUB_ENV
+              echo "prerelease=false" >> $GITHUB_ENV
+            elif [[ "${{ github.ref }}" == "refs/heads/bleeding" ]]; then
+              echo "release=bleeding" >> $GITHUB_ENV
+              echo "prerelease=true" >> $GITHUB_ENV
+            fi
         - uses: actions/checkout@v4
         - name: Scripts Calc Formula
           run: ./scripts/calculate_formulas.sh

diff --git a/.github/disabled/build-linux64.yml b/.github/disabled/build-linux64.yml
@@ -14,35 +14,36 @@ jobs:
     strategy:
         matrix:
           cfg:
-          - {target: linux, opt: gcc6}
+          - {target: linux64, opt: gcc6}
     env:
      TARGET: ${{matrix.cfg.target}}
      OPT: ${{matrix.cfg.opt}}
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v4.1.1
     - name: Scripts Calc Formula - ${{matrix.cfg.target}} - ${{matrix.cfg.opt}}
       run: ./scripts/calculate_formulas.sh
     - name: Scripts Install
       run: ./scripts/$TARGET/install.sh
     - name: Determine Release
-      id: vars
-      shell: bash
-      run: |
-        if [[ "${{ github.ref }}" == "refs/heads/master" ]]; then
-          echo "release=nightly" >> $GITHUB_ENV
-          echo "prerelease=false" >> $GITHUB_ENV
-        elif [[ "${{ github.ref }}" == "refs/heads/bleeding" ]]; then
-          echo "release=bleeding" >> $GITHUB_ENV
-          echo "prerelease=true" >> $GITHUB_ENV
-        fi
+        id: vars
+        shell: bash
+        run: |
+          if [[ "${{ github.ref }}" == "refs/heads/master" ]]; then
+            echo "release=nightly" >> $GITHUB_ENV
+            echo "prerelease=false" >> $GITHUB_ENV
+          elif [[ "${{ github.ref }}" == "refs/heads/bleeding" ]]; then
+            echo "release=bleeding" >> $GITHUB_ENV
+            echo "prerelease=true" >> $GITHUB_ENV
+          fi
     - name: build
       run: ./scripts/build.sh
       env:
         GA_CI_SECRET: ${{ secrets.CI_SECRET }}
-    - name: Package
+    - name: Package 
         working-directory: ${{ env.GITHUB_WORKSPACE }}
         run: scripts/package.sh
         env:
+          TARGET: "linux64"
           BUNDLE: ${{ matrix.bundle }}
           GA_CI_SECRET: ${{ secrets.CI_SECRET }}
     - name: Update Release 

diff --git a/apothecary/aarch64-linux-gnu.toolchain.cmake b/apothecary/aarch64-linux-gnu.toolchain.cmake
diff --git a/apothecary/android_configure.sh b/apothecary/android_configure.sh
@@ -139,17 +139,17 @@ if [ "$ABI" = "armeabi-v7a" ]; then
     export CFLAGS="$CFLAGS $MAKE_TARGET "
     export CPPFLAGS="$CPPFLAGS $MAKE_TARGET  "
     #export CPPFLAGS="$CPPFLAGS -isystem ${SYSROOT}/usr/include/arm-linux-androideabi"
-    export LDFLAGS="$LDFLAGS $MAKE_TARGET -march=armv7-a -mfloat-abi=softfp -Wl,--fix-cortex-a8 -Wl,--no-undefined"
+    export LDFLAGS="$LDFLAGS $MAKE_TARGET -Wl,--fix-cortex-a8 -Wl,--no-undefined"
 elif [ $ABI = "arm64-v8a" ]; then
     export CFLAGS="$CFLAGS $MAKE_TARGET " 
     export CPPFLAGS="$CPPFLAGS $MAKE_TARGET"
     #export CPPFLAGS="$CPPFLAGS -isystem ${SYSROOT}/usr/include/aarch64-linux-android" # for ASM includes
-    export LDFLAGS="$LDFLAGS"
+    export LDFLAGS="$LDFLAGS -Wl,--fix-cortex-a8 -Wl,--no-undefined"
 elif [ "$ABI" = "x86-64" ]; then
     export CFLAGS="$CFLAGS $MAKE_TARGET"
     export CPPFLAGS="$CPPFLAGS $MAKE_TARGET "
     #export CPPFLAGS="$CPPFLAGS -isystem ${SYSROOT}/usr/include/x86_64-linux-android" # for ASM includes
-    export LDFLAGS="$LDFLAGS $MAKE_TARGET -Wl,--fix-cortex-a8 -shared -Wl,--no-undefined"
+    export LDFLAGS="$LDFLAGS $MAKE_TARGET -Wl,--fix-cortex-a8 -Wl,--no-undefined"
 elif [ "$ABI" = "x86" ]; then
     export CFLAGS="$CFLAGS $MAKE_TARGET"  #march=i686  -target i686-linux-android 
     export CPPFLAGS="$CPPFLAGS $MAKE_TARGET" #  -target i686-none-linux-android

diff --git a/apothecary/formulas/FreeImage/FreeImage.sh b/apothecary/formulas/FreeImage/FreeImage.sh
@@ -101,7 +101,7 @@ function build() {
 				-DENABLE_ARC=OFF \
 				-DCMAKE_POSITION_INDEPENDENT_CODE=TRUE \
 				-DENABLE_VISIBILITY=OFF \
-				-DCMAKE_TOOLCHAIN_FILE=$APOTHECARY_DIR/ios.toolchain.cmake
+				-DCMAKE_TOOLCHAIN_FILE=$APOTHECARY_DIR/toolchains/ios.toolchain.cmake
 		        "         
 		cmake  .. ${DEFS} \
 			-DCMAKE_C_STANDARD=17 \
@@ -175,6 +175,7 @@ function build() {
         	-DCMAKE_SYSROOT=$SYSROOT \
             -DANDROID_NDK=$NDK_ROOT \
             -DANDROID_ABI=$ABI \
+			-DCMAKE_ANDROID_ARCH_ABI=$ABI \
             -DANDROID_STL=c++_shared \
         	-DCMAKE_C_STANDARD=17 \
         	-DCMAKE_CXX_STANDARD=17 \

diff --git a/apothecary/formulas/_depends/pixman.sh b/apothecary/formulas/_depends/pixman.sh
@@ -69,7 +69,7 @@ function build() {
 		    -DCMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE=lib \
 		    -DCMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE=bin \
             -D CMAKE_VERBOSE_MAKEFILE=OFF \
-            -DCMAKE_TOOLCHAIN_FILE=$APOTHECARY_DIR/ios.toolchain.cmake \
+            -DCMAKE_TOOLCHAIN_FILE=$APOTHECARY_DIR/toolchains/ios.toolchain.cmake \
             -DPLATFORM=$PLATFORM \
             -DENABLE_BITCODE=OFF \
             -DENABLE_ARC=OFF \

diff --git a/apothecary/formulas/_depends/zlib.sh b/apothecary/formulas/_depends/zlib.sh
@@ -75,7 +75,7 @@ function build() {
             -DCMAKE_CXX_STANDARD=17 \
             -DCMAKE_CXX_STANDARD_REQUIRED=ON \
             -DCMAKE_CXX_EXTENSIONS=OFF \
-            -DCMAKE_TOOLCHAIN_FILE=$APOTHECARY_DIR/ios.toolchain.cmake \
+            -DCMAKE_TOOLCHAIN_FILE=$APOTHECARY_DIR/toolchains/ios.toolchain.cmake \
             -DCMAKE_INSTALL_PREFIX=Release \
             -DCMAKE_CXX_FLAGS_RELEASE="-DUSE_PTHREADS=1 ${FLAG_RELEASE} " \
             -DCMAKE_C_FLAGS_RELEASE="-DUSE_PTHREADS=1 ${FLAG_RELEASE} " \

diff --git a/apothecary/formulas/assimp.sh b/apothecary/formulas/assimp.sh
@@ -76,7 +76,7 @@ function build() {
             -DCMAKE_INSTALL_PREFIX=Release \
             -DCMAKE_INCLUDE_OUTPUT_DIRECTORY=include \
             -DCMAKE_INSTALL_INCLUDEDIR=include \
-            -DCMAKE_TOOLCHAIN_FILE=$APOTHECARY_DIR/ios.toolchain.cmake \
+            -DCMAKE_TOOLCHAIN_FILE=$APOTHECARY_DIR/toolchains/ios.toolchain.cmake \
             -DPLATFORM=$PLATFORM \
             -DENABLE_BITCODE=OFF \
             -DENABLE_ARC=OFF \
@@ -186,6 +186,7 @@ function build() {
                 -DCMAKE_TOOLCHAIN_FILE=$ANDROID_CMAKE_TOOLCHAIN
                 -DCMAKE_BUILD_TYPE=Release
                 -DANDROID_ABI=$ABI
+                -DCMAKE_ANDROID_ARCH_ABI=$ABI 
                 -DANDROID_STL=c++_static
                 -DANDROID_NATIVE_API_LEVEL=$ANDROID_PLATFORM
                 -DANDROID_FORCE_ARM_BUILD=TRUE
@@ -203,6 +204,7 @@ function build() {
                 -DCMAKE_TOOLCHAIN_FILE=$ANDROID_CMAKE_TOOLCHAIN
                 -DCMAKE_BUILD_TYPE=Release
                 -DANDROID_ABI=$ABI
+                -DCMAKE_ANDROID_ARCH_ABI=$ABI 
                 -DANDROID_STL=c++_static
                 -DANDROID_NATIVE_API_LEVEL=$ANDROID_PLATFORM
                 -DANDROID_FORCE_ARM_BUILD=TRUE
@@ -219,6 +221,7 @@ function build() {
                 -DCMAKE_TOOLCHAIN_FILE=$ANDROID_CMAKE_TOOLCHAIN
                 -DCMAKE_BUILD_TYPE=Release
                 -DANDROID_ABI=$ABI
+                -DCMAKE_ANDROID_ARCH_ABI=$ABI 
                 -DANDROID_STL=c++_static
                 -DANDROID_NATIVE_API_LEVEL=$ANDROID_PLATFORM
                 -DCMAKE_INSTALL_PREFIX=install"
@@ -234,6 +237,7 @@ function build() {
                 -DCMAKE_TOOLCHAIN_FILE=$ANDROID_CMAKE_TOOLCHAIN
                 -DCMAKE_BUILD_TYPE=Release
                 -DANDROID_ABI=$ABI
+                -DCMAKE_ANDROID_ARCH_ABI=$ABI
                 -DANDROID_STL=c++_static
                 -DANDROID_NATIVE_API_LEVEL=$ANDROID_PLATFORM
                 -DCMAKE_INSTALL_PREFIX=install"
@@ -287,6 +291,7 @@ function build() {
             -DANDROID_NDK=$NDK_ROOT \
             -DCMAKE_BUILD_TYPE=Release \
             -DANDROID_ABI=$ABI \
+            -DCMAKE_ANDROID_ARCH_ABI=$ABI \
             -DANDROID_STL=c++_shared \
             -DANDROID_PLATFORM=$ANDROID_PLATFORM \
             -DANDROID_NATIVE_API_LEVEL=$ANDROID_PLATFORM \

diff --git a/apothecary/formulas/cairo/cairo.sh b/apothecary/formulas/cairo/cairo.sh
@@ -238,7 +238,7 @@ function build() {
         	-DBUILD_GTK_DOC=OFF -DNO_BUILD_TESTS=ON -DNO_DEPENDENCY_TRACKING=ON -DBUILD_XLIB=OFF -DNO_QT=ON -DBUILD_SHARED_LIBS=OFF -DNO_QUARTZ_FONT=OFF -DNO_QUARTZ=OFF -DNO_QUARTZ_IMAGE=OFF"
 
         cmake .. ${DEFS} \
-            -DCMAKE_TOOLCHAIN_FILE=$APOTHECARY_DIR/ios.toolchain.cmake \
+            -DCMAKE_TOOLCHAIN_FILE=$APOTHECARY_DIR/toolchains/ios.toolchain.cmake \
             -DPLATFORM=$PLATFORM \
             -DENABLE_BITCODE=OFF \
             -DENABLE_ARC=OFF \

diff --git a/apothecary/formulas/curl/curl.sh b/apothecary/formulas/curl/curl.sh
@@ -244,7 +244,7 @@ function build() {
             -DCMAKE_INSTALL_PREFIX=Release \
             -DCMAKE_INCLUDE_OUTPUT_DIRECTORY=include \
             -DCMAKE_INSTALL_INCLUDEDIR=include \
-            -DCMAKE_TOOLCHAIN_FILE=$APOTHECARY_DIR/ios.toolchain.cmake \
+            -DCMAKE_TOOLCHAIN_FILE=$APOTHECARY_DIR/toolchains/ios.toolchain.cmake \
             -DPLATFORM=$PLATFORM \
             -DENABLE_BITCODE=OFF \
             -DENABLE_ARC=OFF \
@@ -291,7 +291,7 @@ function build() {
             -DCMAKE_INSTALL_PREFIX=Release \
             -DCMAKE_INCLUDE_OUTPUT_DIRECTORY=include \
             -DCMAKE_INSTALL_INCLUDEDIR=include \
-            -DCMAKE_TOOLCHAIN_FILE=$APOTHECARY_DIR/ios.toolchain.cmake \
+            -DCMAKE_TOOLCHAIN_FILE=$APOTHECARY_DIR/toolchains/ios.toolchain.cmake \
             -DPLATFORM=$PLATFORM \
             -DENABLE_BITCODE=OFF \
             -DENABLE_ARC=OFF \