Backporting relevant changes from v3

Author: gershnik

.gitattributes

@@ -0,0 +1,3 @@
+*.h linguist-language=cpp
+unicode/data/* -linguist-detectable
+doc/* linguist-documentation

.github/workflows/test.yml

@@ -14,7 +14,7 @@ on:
       - 'tools/**'
 
 env:
-  BUILD_TYPE: Release
+  BUILD_TYPE: MinSizeRel
   NDK_VER: 21.3.6528147
   NDK_ARCH: x86_64
   NDK_API: 29
@@ -26,19 +26,25 @@ jobs:
       fail-fast: false
       matrix:
         include:
-        - os: macos-latest
+        - {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-24.04, compiler: clang, version: 17 }
-        - {os: ubuntu-24.04, compiler: clang, version: 18 }
+        - {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 }
 
     steps:
     - name: Checkout
@@ -47,23 +53,30 @@ jobs:
     - name: System Setup
       shell: bash
       run: |
-        if [[ '${{ matrix.os }}' == 'ubuntu-latest' ]]; then
+        if [[ '${{ matrix.os }}' == ubuntu-* ]]; then
           if [[ '${{ matrix.compiler }}' == 'clang' ]]; then
             wget https://apt.llvm.org/llvm.sh
             chmod u+x llvm.sh
-            sudo ./llvm.sh ${{ matrix.version }}
+            sudo ./llvm.sh ${{ matrix.version }} 
             sudo apt-get install -y clang-tools-${{ matrix.version }} libc++-${{ matrix.version }}-dev libc++abi-${{ matrix.version }}-dev
             echo "CC=clang-${{ matrix.version }}" >> $GITHUB_ENV
             echo "CXX=clang++-${{ matrix.version }}" >> $GITHUB_ENV
             echo "CXXFLAGS=-stdlib=libc++" >> $GITHUB_ENV
           fi
 
           if [[ '${{ matrix.compiler }}' == 'gcc' ]]; then
+            sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
             sudo apt-get update
             sudo apt-get install -y gcc-${{ matrix.version }} g++-${{ matrix.version }}
             echo "CC=gcc-${{ matrix.version }}" >> $GITHUB_ENV
             echo "CXX=g++-${{ matrix.version }}" >> $GITHUB_ENV
           fi
+
+        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
 
     - name: Configure
@@ -75,6 +88,33 @@ jobs:
       shell: bash
       run: cmake --build out --config $BUILD_TYPE --target run-test
 
+  container:
+    runs-on: ubuntu-latest
+    container: ${{ matrix.container }}
+    strategy:
+      fail-fast: false
+      matrix: 
+        container: [gcc:15.1]
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v4
+
+    - name: Install pre-requisites
+      run: |
+        apt-get update
+        apt-get install -y ninja-build cmake
+        apt-get install -y python3-dev
+
+    - name: Configure
+      shell: bash
+      run: |
+        cmake -S . -B out -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} 
+
+    - name: Build and Test
+      shell: bash
+      run: cmake --build out --config ${{env.BUILD_TYPE}} --target run-test
+
   android:
     runs-on: ubuntu-latest
 
@@ -129,24 +169,63 @@ jobs:
 
   emscripten:
     runs-on: ubuntu-latest
+    container: emscripten/emsdk:3.1.70
 
     steps:
     - name: Checkout
       uses: actions/checkout@v4
 
-    - name: Set Up Emscripten
-      uses: mymindstorm/setup-emsdk@v14
-      with:
-        version: 3.1.26
-        actions-cache-folder: 'emsdk-cache'
+    - name: Install pre-requisites
+      run: |
+        apt-get update
+        apt-get install -y ninja-build
+        apt-get install -y python3-dev
+
+        export CMAKE_VERSION=3.27.1
+        wget https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}-Linux-x86_64.sh \
+          -q -O /tmp/cmake-install.sh \
+        && chmod u+x /tmp/cmake-install.sh \
+        && /tmp/cmake-install.sh --skip-license --prefix=/usr \
+        rm -f /tmp/cmake-install.sh
 
     - name: Configure
       shell: bash
-      run: cmake -S . -B out -DCMAKE_TOOLCHAIN_FILE=$EMSDK/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE
+      run: cmake -S . -B out -DCMAKE_TOOLCHAIN_FILE=$EMSDK/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
 
 
     - name: Build and Test
       shell: bash
-      run: cmake --build out --config $BUILD_TYPE --target run-test
+      run: cmake --build out --config ${{env.BUILD_TYPE}} --target run-test
 
+  pythons:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version: [
+          "3.8", "3.9", "3.10", "3.11", "3.12", "3.13", "3.13t",
+          "pypy-3.9", "pypy-3.10", "pypy-3.11"
+        ]
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v4
+
+    - name: Set up Python
+      uses: actions/setup-python@v5
+      id: setup-python
+      with:
+        python-version: ${{matrix.python-version}}
 
+    - name: Configure
+      shell: bash
+      run: |
+        cmake -S . -B out -DCMAKE_BUILD_TYPE=$BUILD_TYPE 
+
+    - name: Build and Test
+      shell: bash
+      run: |
+        cmake --build out --config $BUILD_TYPE --target test-17python test-20python
+        echo Running test-17python
+        out/test/test-17python
+        echo Running test-20python
+        out/test/test-20python

.gitignore

@@ -8,5 +8,5 @@ out/
 
 *.pyc
 
-
+CMakeSettings.json
 test/android

tools/create-release renamed to .tools/create-release

@@ -18,10 +18,19 @@ project(sys_string VERSION ${SYSSTR_VERSION} LANGUAGES CXX)
 
 find_package (Python3 COMPONENTS Interpreter Development)
 
+if (PROJECT_IS_TOP_LEVEL)
+
+    set(SYS_STRING_CONFIGURE_INSTALL ON)
+
+else()
+
+    set(SYS_STRING_CONFIGURE_INSTALL ON)
+
+endif()
 
 add_subdirectory(lib)
 
-if(${Python3_Interpreter_FOUND})
+if(${Python3_Interpreter_FOUND} AND ${Python3_VERSION} VERSION_GREATER_EQUAL "3.9")
 
     file(GLOB UNICODE_DATA ${CMAKE_CURRENT_LIST_DIR}/unicode/data/*.txt)
     file(GLOB UNICODE_SCRIPTS ${CMAKE_CURRENT_LIST_DIR}/unicode/scripts/*.py)
@@ -55,7 +64,6 @@ endif()
 
 if (PROJECT_IS_TOP_LEVEL)
 
-    include(lib/cmake/install.cmake)
     add_subdirectory(test)
 
 endif()

CMakeLists.txt

@@ -128,7 +128,7 @@ PRIVATE
 add_library(${LIBNAME}::${LIBNAME} ALIAS ${LIBNAME})
 
 
-if (PROJECT_IS_TOP_LEVEL)
+if (PROJECT_IS_TOP_LEVEL OR SYS_STRING_CONFIGURE_INSTALL)
 
     include(cmake/install.cmake)
 

lib/CMakeLists.txt

@@ -70,22 +70,38 @@ JNIEnv * g_env;
 
 #endif
 
+#if defined(SYS_STRING_USE_PYTHON) && defined(PYPY_VERSION)
+
+extern "C" {
+    void rpython_startup_code(void);
+    int pypy_setup_home(char *home, int verbose);
+}
+
+#endif
+
 int main(int argc, char** argv)
 {
     #if defined(__ANDROID__)
         auto [vm, env] = load_jvm();
         g_vm = vm;
         g_env = env;
     #endif
-
+    
     #if defined (_WIN32)
         SetConsoleOutputCP(CP_UTF8);
     #endif
 
     #if defined(SYS_STRING_USE_PYTHON)
-        Py_Initialize();
+        #if !defined(PYPY_VERSION)
+            Py_Initialize();
+        #else
+            rpython_startup_code();
+            pypy_setup_home(nullptr, 1);
+        #endif
     #endif
 
+    
+    
     return Catch::Session().run( argc, argv );
 }
 

test/CMakeSettings.json

@@ -0,0 +1,39 @@
+UNICODE LICENSE V3
+
+COPYRIGHT AND PERMISSION NOTICE
+
+Copyright © 1991-2024 Unicode, Inc.
+
+NOTICE TO USER: Carefully read the following legal agreement. BY
+DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING DATA FILES, AND/OR
+SOFTWARE, YOU UNEQUIVOCALLY ACCEPT, AND AGREE TO BE BOUND BY, ALL OF THE
+TERMS AND CONDITIONS OF THIS AGREEMENT. IF YOU DO NOT AGREE, DO NOT
+DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE THE DATA FILES OR SOFTWARE.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of data files and any associated documentation (the "Data Files") or
+software and any associated documentation (the "Software") to deal in the
+Data Files or Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, and/or sell
+copies of the Data Files or Software, and to permit persons to whom the
+Data Files or Software are furnished to do so, provided that either (a)
+this copyright and permission notice appear with all copies of the Data
+Files or Software, or (b) this copyright and permission notice appear in
+associated Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
+THIRD PARTY RIGHTS.
+
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE
+BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES,
+OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE DATA
+FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder shall
+not be used in advertising or otherwise to promote the sale, use or other
+dealings in these Data Files or Software without prior written
+authorization of the copyright holder.