Backporting from v3

Author: gershnik

.github/workflows/test.yml

@@ -13,38 +13,90 @@ on:
       - 'doc/**'
       - 'tools/**'
 
-env:
-  BUILD_TYPE: MinSizeRel
-  NDK_VER: 21.3.6528147
-  NDK_ARCH: x86_64
-  NDK_API: 29
-
 jobs:
+  define-matrix:
+    runs-on: ubuntu-latest
+
+    outputs:
+      hosts: ${{ steps.matrix.outputs.hosts }}
+      containers: ${{ steps.matrix.outputs.containers }}
+
+    steps:
+      - name: Define Matrix
+        id: matrix
+        shell: python
+        run: |
+          import json
+          import os
+
+          macos_map = {
+            'macos-14': "15.4",
+            'macos-15': "16.2"
+          }
+
+          win_paltforms = ["x64", "Win32"]
+          win_clang_archs = ["x64", "x86"]
+
+          gcc_map = {
+            11: 'ubuntu-22.04',
+            12: 'ubuntu-latest', 
+            13: 'ubuntu-latest',
+            14: 'ubuntu-24.04'
+          }
+          gcc_cont_map = {
+            15: 'gcc:15.1'
+          }
+          clang_map = {
+            13: 'ubuntu-22.04',
+            14: 'ubuntu-22.04',
+            15: 'ubuntu-22.04',
+            16: 'ubuntu-22.04',
+            17: 'ubuntu-latest', 
+            18: 'ubuntu-latest', 
+            19: 'ubuntu-latest', 
+            20: 'ubuntu-latest',
+            21: 'ubuntu-latest'
+          }
+          
+          hosts = []
+          containers=[]
+          
+          #macOS
+          for runon, xcode in macos_map.items():
+            hosts.append({'os': runon, 'version': xcode, 'jobname': f'macOS - Xcode{xcode}'})
+          
+          #windows
+          for platform in win_paltforms:
+            hosts.append({'os': 'windows-latest', 'platform': platform, 'nopython': platform == "Win32", 'jobname': f'Windows - {platform}'})
+              
+          for arch in win_clang_archs:
+            hosts.append({'os': 'windows-latest', 'arch': arch, 'compiler': 'clang-cl', 'nopython': arch == "x86", 'jobname': f'Windows - clang - {arch}'})
+          
+          #gcc hosts
+          for gcc, runon in gcc_map.items():
+            hosts.append({'os': runon, 'compiler': 'gcc', 'version': gcc, 'jobname': f'Linux - GCC{gcc}'})
+
+          #gcc containers
+          for gcc, container in gcc_cont_map.items():
+              containers.append({'container': container, 'jobname': f'Linux - GCC{gcc}'})
+
+
+          #clang
+          for clang, runon in clang_map.items():
+            hosts.append({'os': runon, 'compiler': 'clang', 'version': clang, 'jobname': f'Linux - Clang{clang}'})
+
+          with open(os.environ['GITHUB_OUTPUT'], 'w') as env:
+            print('hosts=' + json.dumps(hosts), file=env) 
+            print('containers=' + json.dumps(containers), file=env)
+
   desktop:
+    needs: define-matrix
+    name: ${{ matrix.jobname }}
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
-        include:
-        - {os: macos-15, version: 16 }
-        - {os: macos-14, version: "15.4" }
-        
-        - os: windows-latest
-
-        - {os: ubuntu-22.04, compiler: gcc, version: 11 }
-        - {os: ubuntu-22.04, compiler: gcc, version: 12 }
-        - {os: ubuntu-22.04, compiler: gcc, version: 13 }
-        - {os: ubuntu-24.04, compiler: gcc, version: 14 }
-        #- {os: ubuntu-24.04, compiler: gcc, version: 15 }
-
-        - {os: ubuntu-22.04, compiler: clang, version: 13 }
-        - {os: ubuntu-22.04, compiler: clang, version: 14 }
-        - {os: ubuntu-22.04, compiler: clang, version: 15 }
-        - {os: ubuntu-22.04, compiler: clang, version: 16 }
-        - {os: ubuntu-latest, compiler: clang, version: 17 }
-        - {os: ubuntu-latest, compiler: clang, version: 18 }
-        - {os: ubuntu-latest, compiler: clang, version: 19 }
-        - {os: ubuntu-latest, compiler: clang, version: 20 }
+        include: ${{ fromJSON(needs.define-matrix.outputs.hosts) }}
 
     steps:
     - name: Checkout
@@ -72,29 +124,61 @@ jobs:
             echo "CXX=g++-${{ matrix.version }}" >> $GITHUB_ENV
           fi
 
+          mkdir bin
+          wget -qO- https://github.com/ninja-build/ninja/releases/download/v1.12.1/ninja-linux.zip | \
+                gunzip > bin/ninja
+          chmod a+x bin/ninja
+          echo PATH=`pwd`/bin:$PATH >> $GITHUB_ENV
+          echo "CMAKE_GENERATOR=-GNinja" >> $GITHUB_ENV
         fi
+
         if [[ '${{ matrix.os }}' == macos-* ]]; then
           brew install icu4c
           echo "DEVELOPER_DIR=/Applications/Xcode_${{ matrix.version }}.app" >> $GITHUB_ENV
           echo "ICU_ROOT=$(brew --cellar icu4c)/$(brew info --json icu4c | jq -r '.[0].installed[0].version')" >> $GITHUB_ENV
         fi
 
+        if [[ '${{ matrix.os }}' == windows-* ]]; then
+            if [[ '${{ matrix.compiler }}' != '' ]]; then
+                if [[ '${{ matrix.arch }}' == "x64" ]]; then
+                    VCPREFIX="C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise\\VC\\Tools\\Llvm\\x64\\bin"
+                else
+                    VCPREFIX="C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise\\VC\\Tools\\Llvm\\bin"
+                fi
+                echo "CC=$VCPREFIX\\${{ matrix.compiler }}" >> $GITHUB_ENV
+                echo "CXX=$VCPREFIX\\${{ matrix.compiler }}" >> $GITHUB_ENV
+                echo "CMAKE_GENERATOR=Ninja" >> $GITHUB_ENV
+            fi
+        fi
+
+        CMAKE_ARGS=( )
+
+        if [[ '${{ matrix.platform }}' != "" ]]; then
+          CMAKE_ARGS+=(-DCMAKE_GENERATOR_PLATFORM=${{ matrix.platform }})
+        fi
+
+        if [[ ${#CMAKE_ARGS[@]} != 0 ]]; then
+          echo "CMAKE_ARGS=${CMAKE_ARGS[@]}" >> $GITHUB_ENV
+        fi
+
     - name: Configure
       shell: bash
       run: |
-        cmake -S . -B out -DCMAKE_BUILD_TYPE=$BUILD_TYPE 
+        cmake $CMAKE_GENERATOR -S . -B out $CMAKE_ARGS -DCMAKE_BUILD_TYPE=MinSizeRel
 
     - name: Build and Test
       shell: bash
-      run: cmake --build out --config $BUILD_TYPE --target run-test
+      run: cmake --build out --config MinSizeRel --target run-test
 
   container:
+    needs: define-matrix
+    name: ${{ matrix.jobname }}
     runs-on: ubuntu-latest
     container: ${{ matrix.container }}
     strategy:
       fail-fast: false
       matrix: 
-        container: [gcc:15.1]
+        include: ${{ fromJSON(needs.define-matrix.outputs.containers) }}
 
     steps:
     - name: Checkout
@@ -109,14 +193,46 @@ jobs:
     - name: Configure
       shell: bash
       run: |
-        cmake -S . -B out -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} 
+        cmake -S . -B out -DCMAKE_BUILD_TYPE=MinSizeRel
+
+    - name: Build and Test
+      shell: bash
+      run: cmake --build out --config MinSizeRel --target run-test
+
+
+  big-endian:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v4
+
+    - name: Setup
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y gcc-powerpc-linux-gnu g++-powerpc-linux-gnu qemu-user-binfmt
+
+    - name: Configure
+      run: |
+        export CC=powerpc-linux-gnu-gcc
+        export CXX=powerpc-linux-gnu-g++
+        export QEMU_LD_PREFIX=/usr/powerpc-linux-gnu/
+        cmake -S . -B out -DCMAKE_BUILD_TYPE=MinSizeRel -DCMAKE_SYSTEM_PROCESSOR=powerpc
 
     - name: Build and Test
       shell: bash
-      run: cmake --build out --config ${{env.BUILD_TYPE}} --target run-test
+      run: |
+        export QEMU_LD_PREFIX=/usr/powerpc-linux-gnu/
+        cmake --build out --config MinSizeRel --target run-test
 
   android:
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        version: [27.2.12479018]
+        api: [29, 30]    
+        arch: [x86_64]
 
     steps:
     - name: Checkout
@@ -135,36 +251,36 @@ jobs:
         path: |
           ~/.android/avd/*
           ~/.android/adb*
-        key: avd-${{env.NDK_VER}}-${{env.NDK_ARCH}}-${{env.NDK_API}}
+        key: avd-${{ matrix.version }}-${{ matrix.arch }}-${{ matrix.api }}
 
     - name: Create AVD and generate snapshot for caching
       if: steps.avd-cache.outputs.cache-hit != 'true'
       uses: reactivecircus/android-emulator-runner@v2
       with:
-        api-level: ${{env.NDK_API}}
-        arch: ${{env.NDK_ARCH}}
+        api-level: ${{ matrix.api }}
+        arch: ${{ matrix.arch }}
         target: google_apis
-        ndk: ${{env.NDK_VER}}
+        ndk: ${{ matrix.version }}
         force-avd-creation: false
-        emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
+        emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none -no-metrics
         disable-animations: false
         script: echo "Generated AVD snapshot for caching."
 
     - name: Configure, Build and Test
       uses: reactivecircus/android-emulator-runner@v2
       with:
-        api-level: ${{env.NDK_API}}
-        arch: ${{env.NDK_ARCH}}
+        api-level: ${{ matrix.api }}
+        arch: ${{ matrix.arch }}
         target: google_apis
-        ndk: ${{env.NDK_VER}}
-        emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
+        ndk: ${{ matrix.version }}
+        emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none -no-metrics
         disable-animations: true
         script: |
             echo "::group::Configure"
-            cmake -S . -B out -DCMAKE_BUILD_TYPE:STRING=$BUILD_TYPE -DCMAKE_TOOLCHAIN_FILE:FILEPATH=$ANDROID_SDK_ROOT/ndk/$NDK_VER/build/cmake/android.toolchain.cmake -DANDROID_ABI:STRING=$NDK_ARCH -DANDROID_PLATFORM:STRING=19 -DANDROID_STL:STRING=c++_static
+            cmake -S . -B out -DCMAKE_BUILD_TYPE:STRING=MinSizeRel -DCMAKE_TOOLCHAIN_FILE:FILEPATH=$ANDROID_SDK_ROOT/ndk/${{ matrix.version }}/build/cmake/android.toolchain.cmake -DANDROID_ABI:STRING=${{ matrix.arch }} -DANDROID_PLATFORM:STRING=${{ matrix.version }} -DANDROID_STL:STRING=c++_static
             echo "::endgroup::"
             echo "::group::Build and Test"
-            cmake --build out --config $BUILD_TYPE --target run-test
+            cmake --build out --config MinSizeRel --target run-test
             echo "::endgroup::"
 
   emscripten:
@@ -190,12 +306,12 @@ jobs:
 
     - name: Configure
       shell: bash
-      run: cmake -S . -B out -DCMAKE_TOOLCHAIN_FILE=$EMSDK/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
+      run: cmake -S . -B out -DCMAKE_TOOLCHAIN_FILE=$EMSDK/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake -DCMAKE_BUILD_TYPE=MinSizeRel
 
 
     - name: Build and Test
       shell: bash
-      run: cmake --build out --config ${{env.BUILD_TYPE}} --target run-test
+      run: cmake --build out --config MinSizeRel --target run-test
 
   pythons:
     runs-on: ubuntu-latest
@@ -219,13 +335,13 @@ jobs:
     - name: Configure
       shell: bash
       run: |
-        cmake -S . -B out -DCMAKE_BUILD_TYPE=$BUILD_TYPE 
+        cmake -S . -B out -DCMAKE_BUILD_TYPE=MinSizeRel
 
     - name: Build and Test
       shell: bash
       run: |
-        cmake --build out --config $BUILD_TYPE --target test-17python test-20python
+        cmake --build out --config MinSizeRel --target test-17python test-20python
         echo Running test-17python
-        out/test/test-17python
+        out/test/test-17python -ni -fc
         echo Running test-20python
-        out/test/test-20python
+        out/test/test-20python -ni -fc

CMakeLists.txt

@@ -57,11 +57,17 @@ if(${Python3_Interpreter_FOUND} AND "${Python3_VERSION}" VERSION_GREATER_EQUAL "
             ${UNICODE_GENERATED_FILES}
     )
 
+    target_sources(generate_unicode_mappings
+    PRIVATE
+        ${UNICODE_SCRIPTS}
+    )
+
+    set_source_files_properties(${UNICODE_SCRIPTS} PROPERTIES XCODE_EXPLICIT_FILE_TYPE text.script.python)
+
     add_dependencies(sys_string generate_unicode_mappings)
 
 endif()
 
-
 if (PROJECT_IS_TOP_LEVEL)
 
     add_subdirectory(test)

lib/CMakeLists.txt

@@ -36,11 +36,22 @@ PUBLIC
 target_compile_options(${LIBNAME} 
 PRIVATE
     $<$<CXX_COMPILER_ID:MSVC>:/W4;/WX>
-    $<$<CXX_COMPILER_ID:Clang>:-Wall;-Wextra;-pedantic>
     $<$<CXX_COMPILER_ID:AppleClang>:-Wall;-Wextra;-pedantic>
     $<$<CXX_COMPILER_ID:GNU>:-Wall;-Wextra;-pedantic>
 )
 
+if ("${CMAKE_CXX_COMPILER_FRONTEND_VARIANT}" STREQUAL "MSVC")
+    target_compile_options(${LIBNAME} 
+    PRIVATE
+        $<$<CXX_COMPILER_ID:Clang>:/W4;/WX;-Wno-self-assign-overloaded;-Wno-self-move>
+    )
+else()
+    target_compile_options(${LIBNAME} 
+    PRIVATE
+        $<$<CXX_COMPILER_ID:Clang>:-Wall;-Wextra;-pedantic;-Wno-self-assign-overloaded;-Wno-self-move>
+    )
+endif()
+
 target_link_libraries(${LIBNAME} 
 PUBLIC
     "$<$<PLATFORM_ID:Darwin>:-framework CoreFoundation>"

lib/inc/sys_string/impl/platforms/python_any.h

@@ -472,7 +472,7 @@ namespace sysstr::util
     template<PyUnicode_Kind Kind>
     struct PyUnicodeObject_wrapper : PyUnicodeObject
     {
-        #ifdef __GNUC__
+        #if defined(__GNUC__) || defined(__clang__)
         #pragma GCC diagnostic push
         #pragma GCC diagnostic ignored "-Wmissing-field-initializers"
         #endif
@@ -491,7 +491,7 @@ namespace sysstr::util
                 this->_base.utf8_length = size;
             }
         }
-        #ifdef __GNUC__
+        #if defined(__GNUC__) || defined(__clang__)
         #pragma GCC diagnostic pop
         #endif