[1/2] Add Android xcompile on macos and windows.

Macos and windows profiles will be wrong
opendocument-app · Jun 16, 2024 · 0237c2d · 0237c2d
1 parent 996c520
commit 0237c2d
Show file tree

Hide file tree

Showing 14 changed files with 75 additions and 21 deletions.
diff --git a/.github/config/macos-13-ndk-26.3.11579264/conan/profiles/armv7 b/.github/config/macos-13-ndk-26.3.11579264/conan/profiles/armv7
@@ -0,0 +1,4 @@
+include(host)
+
+[settings]
+arch=armv7
diff --git a/.github/config/macos-13-ndk-26.3.11579264/conan/profiles/armv8 b/.github/config/macos-13-ndk-26.3.11579264/conan/profiles/armv8
@@ -0,0 +1,4 @@
+include(host)
+
+[settings]
+arch=armv8
diff --git a/.github/config/macos-13-ndk-26.3.11579264/conan/profiles/default b/.github/config/macos-13-ndk-26.3.11579264/conan/profiles/default
@@ -0,0 +1 @@
+../../../ubuntu-22.04-clang-15/conan/profiles/default
diff --git a/.github/config/macos-13-ndk-26.3.11579264/conan/profiles/host b/.github/config/macos-13-ndk-26.3.11579264/conan/profiles/host
@@ -0,0 +1,13 @@
+include(default)
+
+[settings]
+os=Android
+os.api_level=23
+arch=armv8
+compiler=clang
+compiler.version=17
+compiler.libcxx=c++_static
+compiler.cppstd=20
+
+[conf]
+tools.android:ndk_path=$ANDROID_HOME/ndk/26.3.11579264
diff --git a/.github/config/macos-13-ndk-26.3.11579264/conan/profiles/x86 b/.github/config/macos-13-ndk-26.3.11579264/conan/profiles/x86
@@ -0,0 +1,4 @@
+include(host)
+
+[settings]
+arch=x86
diff --git a/.github/config/macos-13-ndk-26.3.11579264/conan/profiles/x86_64 b/.github/config/macos-13-ndk-26.3.11579264/conan/profiles/x86_64
@@ -0,0 +1,4 @@
+include(host)
+
+[settings]
+arch=x86_64
diff --git a/.github/config/ubuntu-22.04-clang-15/conan/profiles/default b/.github/config/ubuntu-22.04-clang-15/conan/profiles/default
@@ -9,20 +9,3 @@ os=Linux
 
 [conf]
 tools.build:compiler_executables={'c': 'clang-15', 'cpp': 'clang++-15'}
-
-[options]
-*/*:shared=False
-cryptopp/[>8.6.9]:shared=False
-
-glib/*:with_elf=False
-glib/*:with_mount=False
-glib/*:with_selinux=False
-freetype/*:with_bzip2=False
-freetype/*:with_brotli=False
-poppler/*:with_tiff=False
-poppler/*:shared=False
-poppler/*:with_gobject_introspection=False
-
-[replace_requires]
-libjpeg/9e: libjpeg/9f
-libdeflate/1.19: libdeflate/1.20
diff --git a/.github/config/windows-2022-ndk-26.3.11579264/conan/profiles/armv7 b/.github/config/windows-2022-ndk-26.3.11579264/conan/profiles/armv7
@@ -0,0 +1,4 @@
+include(host)
+
+[settings]
+arch=armv7
diff --git a/.github/config/windows-2022-ndk-26.3.11579264/conan/profiles/armv8 b/.github/config/windows-2022-ndk-26.3.11579264/conan/profiles/armv8
@@ -0,0 +1,4 @@
+include(host)
+
+[settings]
+arch=armv8
diff --git a/.github/config/windows-2022-ndk-26.3.11579264/conan/profiles/default b/.github/config/windows-2022-ndk-26.3.11579264/conan/profiles/default
@@ -0,0 +1 @@
+../../../ubuntu-22.04-clang-15/conan/profiles/default
diff --git a/.github/config/windows-2022-ndk-26.3.11579264/conan/profiles/host b/.github/config/windows-2022-ndk-26.3.11579264/conan/profiles/host
@@ -0,0 +1,13 @@
+include(default)
+
+[settings]
+os=Android
+os.api_level=23
+arch=armv8
+compiler=clang
+compiler.version=17
+compiler.libcxx=c++_static
+compiler.cppstd=20
+
+[conf]
+tools.android:ndk_path=$ANDROID_HOME/ndk/26.3.11579264
diff --git a/.github/config/windows-2022-ndk-26.3.11579264/conan/profiles/x86 b/.github/config/windows-2022-ndk-26.3.11579264/conan/profiles/x86
@@ -0,0 +1,4 @@
+include(host)
+
+[settings]
+arch=x86
diff --git a/.github/config/windows-2022-ndk-26.3.11579264/conan/profiles/x86_64 b/.github/config/windows-2022-ndk-26.3.11579264/conan/profiles/x86_64
@@ -0,0 +1,4 @@
+include(host)
+
+[settings]
+arch=x86_64
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -49,10 +49,18 @@ jobs:
       matrix:
         package: ${{ fromJson(needs.find-all-packages.outputs.packages) }}
         config:
-          - { os: ubuntu-22.04, compiler: ndk-26.3.11579264, host-profile: armv8 }
-          - { os: ubuntu-22.04, compiler: ndk-26.3.11579264, host-profile: x86_64 }
-          - { os: ubuntu-22.04, compiler: ndk-26.3.11579264, host-profile: armv7 }
-          - { os: ubuntu-22.04, compiler: ndk-26.3.11579264, host-profile: x86 }
+#          - { os: ubuntu-22.04, compiler: ndk-26.3.11579264, host-profile: armv8 }
+#          - { os: ubuntu-22.04, compiler: ndk-26.3.11579264, host-profile: x86_64 }
+#          - { os: ubuntu-22.04, compiler: ndk-26.3.11579264, host-profile: armv7 }
+#          - { os: ubuntu-22.04, compiler: ndk-26.3.11579264, host-profile: x86 }
+          - { os: macos-13, compiler: ndk-26.3.11579264, host-profile: armv8 }
+#          - { os: macos-13, compiler: ndk-26.3.11579264, host-profile: x86_64 }
+#          - { os: macos-13, compiler: ndk-26.3.11579264, host-profile: armv7 }
+#          - { os: macos-13, compiler: ndk-26.3.11579264, host-profile: x86 }
+          - { os: windows-2022, compiler: ndk-26.3.11579264, host-profile: armv8 }
+#          - { os: windows-2022, compiler: ndk-26.3.11579264, host-profile: x86_64 }
+#          - { os: windows-2022, compiler: ndk-26.3.11579264, host-profile: armv7 }
+#          - { os: windows-2022, compiler: ndk-26.3.11579264, host-profile: x86 }
     steps:
       - name: checkout
         uses: actions/checkout@v4
@@ -71,6 +79,9 @@ jobs:
       - name: install python dependencies
         run: pip install --upgrade pip conan setuptools
 
+      - run: conan profile detect
+      - run: cat ~./conan2/profile/default
+
       - name: conan config
         run: conan config install .github/config/${{ matrix.config.os }}-${{ matrix.config.compiler }}/conan