Merge pull request #11 from vcmi/profiles-split

move system libs from profiles to separate files

Author: kambala-decapitator

.github/workflows/rebuildDependencies.yml

@@ -16,42 +16,42 @@ jobs:
           - platform: mac-intel
             os: macos-14
             before_install: macos.sh
-            conan_profile: macos-intel
+            conan_profiles: '["macos-intel", "base/apple-system"]'
             conan_system_libs: bzip2 libiconv sqlite3 zlib
           - platform: mac-arm
             os: macos-14
             before_install: macos.sh
-            conan_profile: macos-arm
+            conan_profiles: '["macos-arm", "base/apple-system"]'
             conan_system_libs: bzip2 libiconv sqlite3 zlib
           - platform: ios
             os: macos-14
             before_install: macos.sh
-            conan_profile: ios-arm64
+            conan_profiles: '["ios-arm64", "base/apple-system"]'
             conan_system_libs: bzip2 libiconv sqlite3 zlib
           - platform: android-armeabi-v7a
             os: ubuntu-latest
             before_install: android-32.sh
-            conan_profile: android-32-ndk
+            conan_profiles: '["android-32-ndk", "base/android-system"]'
             conan_system_libs: zlib
           - platform: android-arm64-v8a
             os: ubuntu-latest
-            conan_profile: android-64-ndk
+            conan_profiles: '["android-64-ndk", "base/android-system"]'
             conan_system_libs: zlib
           - platform: android-x64
             os: ubuntu-latest
-            conan_profile: android-x64-ndk
+            conan_profiles: '["android-x64-ndk", "base/android-system"]'
             conan_system_libs: zlib
           - platform: windows-x64
             os: windows-latest
-            conan_profile: msvc-x64
+            conan_profiles: '["msvc-x64"]'
             conan_options: -o "&:target_pre_windows10=True"
           - platform: windows-x86
             os: windows-latest
-            conan_profile: msvc-x86
+            conan_profiles: '["msvc-x86"]'
             conan_options: -o "&:target_pre_windows10=True"
           - platform: windows-arm64
             os: windows-11-arm
-            conan_profile: msvc-arm64
+            conan_profiles: '["msvc-arm64"]'
             conan_options: -o "&:lua_lib=lua"
     runs-on: ${{ matrix.os }}
     defaults:
@@ -63,10 +63,14 @@ jobs:
 
     - name: Define common variables
       run: |
-        echo CUSTOM_PATCHES_PATH="$(pwd)/conan_patches" >> "$GITHUB_ENV"
+        echo CUSTOM_PATCHES_PATH="$PWD/conan_patches" >> "$GITHUB_ENV"
         echo DEPS_FILE="dependencies-${{ matrix.platform }}.tgz" >> "$GITHUB_ENV"
         echo DEPS_LIST_FILE="dependencies-${{ matrix.platform }}.txt" >> "$GITHUB_ENV"
 
+        # builds a list of profile parameters, poor man's `map` function
+        profiles="${{ join(fromJSON(matrix.conan_profiles), ' --profile=$PWD/conan_profiles/') }}"
+        echo CONAN_PROFILES="--profile=$PWD/conan_profiles/$profiles" >> "$GITHUB_ENV"
+
     - name: Prepare CI
       if: ${{ matrix.before_install }}
       run: ci/${{ matrix.before_install }}
@@ -149,9 +153,9 @@ jobs:
           fi
 
           # Windows workaround for https://bugreports.qt.io/browse/QTBUG-84543
-          PATH="$WINDOWS_PERL_DIR:$PATH" conan create $packagePath \
+          PATH="$WINDOWS_PERL_DIR:$PATH" conan create "$packagePath" \
             --version=$version \
-            --profile=../conan_profiles/${{ matrix.conan_profile }} \
+            $CONAN_PROFILES \
             --build=missing \
             --test-folder= \
             --core-conf core.sources.patch:extra_path=$CUSTOM_PATCHES_PATH \
@@ -186,7 +190,7 @@ jobs:
 
           conan create "recipes/$package/all" \
             --version=$version \
-            --profile=../conan_profiles/${{ matrix.conan_profile }} \
+            $CONAN_PROFILES \
             --build=missing \
             --test-folder=
         done
@@ -196,7 +200,7 @@ jobs:
         conan install . \
           --output-folder=conan-generated \
           --build=missing \
-          --profile=conan_profiles/${{ matrix.conan_profile }} \
+          $CONAN_PROFILES \
           ${{ matrix.conan_options }}
 
     - name: Remove builds and source code
@@ -220,7 +224,7 @@ jobs:
         packageListFile='pkglist.json'
 
         conan graph info . \
-          --profile=conan_profiles/${{ matrix.conan_profile }} \
+          $CONAN_PROFILES \
           ${{ matrix.conan_options }} \
           --format=json \
           --build=never \

conan_profiles/base/android

@@ -9,9 +9,6 @@ compiler.libcxx=c++_shared
 compiler.version=14
 os=Android
 
-[replace_requires]
-zlib/*: zlib/[*]@system
-
 [conf]
 # https://github.com/conan-io/conan-center-index/issues/25342
 # https://github.com/conan-io/conan/issues/16468#issuecomment-2175877245

conan_profiles/base/android-system

@@ -0,0 +1,2 @@
+[replace_requires]
+zlib/*: zlib/[*]@system

conan_profiles/base/apple

@@ -8,12 +8,6 @@ compiler.cppstd={{ vars.cppstd }}
 compiler.libcxx=libc++
 compiler.version=16
 
-[replace_requires]
-bzip2/*: bzip2/[*]@system
-libiconv/*: libiconv/[*]@system
-sqlite3/*: sqlite3/[*]@system
-zlib/*: zlib/[*]@system
-
 [conf]
 tools.apple:enable_bitcode=False
 

conan_profiles/base/apple-system

@@ -0,0 +1,5 @@
+[replace_requires]
+bzip2/*: bzip2/[*]@system
+libiconv/*: libiconv/[*]@system
+sqlite3/*: sqlite3/[*]@system
+zlib/*: zlib/[*]@system