Update actions

.github/workflows/ios.yml

@@ -31,36 +31,12 @@ jobs:
     - name: Install software
       run: |
         brew install cmake ninja
-    - name: Configure and compile zlib
-      run: |
-        $Qt6_DIR/bin/qt-cmake \
-        -G Ninja \
-        -S zlib \
-        -B build-zlib-ios \
-        -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" \
-        -DCMAKE_INSTALL_PREFIX=ios
-        cmake --build build-zlib-ios
-        cmake --install build-zlib-ios
-        cp -rv ios/* $Qt6_DIR
-    - name: Configure and compile libzip
-      run: |
-        $Qt6_DIR/bin/qt-cmake \
-        -G Ninja  \
-        -S libzip \
-        -B build-libzip-ios \
-        -DBUILD_DOC=OFF \
-        -DBUILD_EXAMPLES=OFF \
-        -DBUILD_REGRESS=OFF \
-        -DBUILD_SHARED_LIBS=OFF \
-        -DBUILD_TOOLS=OFF \
-        -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" \
-        -DCMAKE_PREFIX_PATH=ios \
-        -DCMAKE_INSTALL_PREFIX=ios
-        cmake --build build-libzip-ios
-        cmake --install build-libzip-ios
+        - name: Compile and Install
+        run: |
+          Qt6_DIR_BASE=$(dirname "$Qt6_DIR") ./buildscript-linux.sh
     - name: Package
       run: |
-        tar cvfz enrouteDependencies_ios.tar.gz ios
+        tar cvfz enrouteDependencies_ios.tar.gz Qt
     - name: Upload to developerBuilds
       run: |
         gh release upload --clobber developerBuilds *.tar.gz

.gitmodules

@@ -7,3 +7,6 @@
 [submodule "zlib"]
 	path = zlib
 	url = https://github.com/madler/zlib.git
+[submodule "bzip2"]
+	path = bzip2
+	url = https://gitlab.com/bzip2/bzip2.git

buildscript-android.sh

@@ -6,6 +6,26 @@ set -e
 
 for PLATFORM in android_armv7 android_arm64_v8a android_x86 android_x86_64
 do
+	echo
+	echo "libzip - static for arm64 and x86_64 on iOS"
+
+	$Qt6_DIR_BASE/$PLATFORM/bin/qt-cmake \
+    	-G Ninja  \
+	    -S libzip \
+    	-B build-libzip-$PLATFORM \
+	    -DBUILD_DOC=OFF \
+    	-DBUILD_EXAMPLES=OFF \
+	    -DBUILD_REGRESS=OFF \
+    	-DBUILD_SHARED_LIBS=OFF \
+	    -DBUILD_TOOLS=OFF \
+    	-DENABLE_BZIP2=OFF \
+	    -DENABLE_LZMA=OFF \
+    	-DENABLE_ZSTD=OFF \
+    	-DCMAKE_INSTALL_PREFIX=$Qt6_DIR_BASE/$PLATFORM
+	cmake --build build-libzip-$PLATFORM
+	cmake --install build-libzip-$PLATFORM
+
+
     echo
     echo "Android ARMv7"
 

buildscript-ios.sh

@@ -2,6 +2,24 @@
 
 # Fail on first error
 set -e
+installDir=Qt/$(basename "$Qt6_DIR_BASE")/ios
+
+
+echo
+echo "bzip2 - static for arm64 and x86_64 on iOS"
+
+$Qt6_DIR_BASE/ios/bin/qt-cmake \
+    -G Ninja  \
+    -S bzip2 \
+    -B build-bzip2-iOS \
+    -DENABLE_APP=OFF \
+    -DENABLE_DOCS=OFF \
+    -DENABLE_SHARED_LIB=OFF \
+    -DENABLE_STATIC_LIB=ON \
+    -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" \
+    -DCMAKE_INSTALL_PREFIX=$installDir
+cmake --build build-bzip2-iOS
+cmake --install build-bzip2-iOS
 
 
 echo
@@ -12,10 +30,17 @@ $Qt6_DIR_BASE/ios/bin/qt-cmake \
     -S zlib \
     -B build-zlib-iOS \
     -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" \
-    -DCMAKE_INSTALL_PREFIX=$Qt6_DIR_BASE/ios
+    -DCMAKE_INSTALL_PREFIX=$installDir
 cmake --build build-zlib-iOS
 cmake --install build-zlib-iOS
 
+
+echo
+echo "copy static bzip2 and zlib to development directory, so cmake can find it"
+
+cp -rv $installDir $Qt6_DIR_BASE
+
+
 echo
 echo "libzip - static for arm64 and x86_64 on iOS"
 
@@ -32,6 +57,6 @@ $Qt6_DIR_BASE/ios/bin/qt-cmake \
     -DENABLE_LZMA=OFF \
     -DENABLE_ZSTD=OFF \
     -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" \
-    -DCMAKE_INSTALL_PREFIX=$Qt6_DIR_BASE/ios
+    -DCMAKE_INSTALL_PREFIX=$installDir
 cmake --build build-libzip-iOS
 cmake --install build-libzip-iOS