Merge branch 'master' into simdutf-strings

Author: Aidan Lee

.github/workflows/main.yml

@@ -2,6 +2,23 @@ name: main
 on: [push, pull_request]
 
 jobs:
+  check-headers:
+    name: Check headers
+    runs-on: ubuntu-latest
+    steps:
+    - name: checkout
+      uses: actions/checkout@v4
+
+    - name: Install pcre2grep
+      run: sudo apt-get update && sudo apt-get install -y pcre2-utils
+
+    - run: |
+        # macros in public headers must use the global namespace to qualify types
+        ! pcre2grep --buffer-size=1M --recursive --multiline --line-number --include='.*\.h$' \
+          '#define\s+(?:.*\\\r?\n)*.*?\K(?<!:)\b(Enum|String|StringOffset|Array|ArrayClassID|Math|Math_obj|Void|null|Dynamic|hx::|cpp::)\b' \
+          include
+      name: Check public headers
+
   Windows32:
     strategy:
       fail-fast: false

.github/workflows/package.yml

@@ -135,8 +135,8 @@ jobs:
           uses: ncipollo/release-action@v1
           with:
             tag: v${{ env.hxcpp_release }}
-            commit: ${{ github.head_ref }}
+            commit: ${{ github.ref }}
             name: Release ${{ env.hxcpp_release }}
             draft: false
             prerelease: false
-            artifacts: ./hxcpp-${{ env.hxcpp_release }}.zip
+            artifacts: ./hxcpp-${{ env.hxcpp_release }}.zip

.github/workflows/test.yml

@@ -196,10 +196,30 @@ jobs:
     steps:
       - name: checkout
         uses: actions/checkout@v4
+      - name: setup
+        uses: ./.github/workflows/setup
+        with:
+          haxe: ${{ inputs.haxe }}
+      - name: Get Haxe commit SHA
+        if: inputs.haxe == 'latest'
+        id: haxe_sha
+        shell: bash
+        working-directory:
+          ${{github.workspace}}
+        env:
+          GH_TOKEN: ${{ github.token }}
+        run: |
+          version=$(haxe --version)
+          short_sha=${version##*+}
+          full_sha=$(gh api repos/HaxeFoundation/haxe/commits/$short_sha --jq '.sha')
+          echo "Haxe version: $version"
+          echo "sha=$full_sha" >> "$GITHUB_OUTPUT"
+          echo "Commit SHA: $short_sha, Full SHA: $full_sha"
       - name: checkout haxe (latest)
         if: inputs.haxe == 'latest'
         uses: actions/checkout@v4
         with:
+          ref: ${{ steps.haxe_sha.outputs.sha }}
           repository: HaxeFoundation/haxe
           path: haxe
       - name: checkout haxe (stable)
@@ -209,10 +229,6 @@ jobs:
           repository: HaxeFoundation/haxe
           path: haxe
           ref: ${{ inputs.haxe }}
-      - name: setup
-        uses: ./.github/workflows/setup
-        with:
-          haxe: ${{ inputs.haxe }}
       - name: install haxe libs
         run: haxelib install compile-cpp.hxml --always
         # haxe 4 tests don't build with latest utest
@@ -221,3 +237,21 @@ jobs:
         run: haxe compile-cpp.hxml -D ${{ env.HXCPP_ARCH_FLAG }} -D no_http
       - name: run
         run: bin${{ inputs.sep }}cpp${{ inputs.sep }}TestMain-debug
+  build_tool:
+    runs-on: ${{ inputs.os }}
+    name: build tool tests
+    steps:
+      - name: checkout
+        uses: actions/checkout@v4
+      - name: setup
+        uses: ./.github/workflows/setup
+        with:
+          haxe: ${{ inputs.haxe }}
+      - name: test c/cxx_standard attributes
+        working-directory: test/cxx_standard
+        shell: bash
+        run: |
+          for xml in *.xml; do
+            haxelib run hxcpp $xml
+            haxelib run hxcpp $xml clean
+          done

.gitignore

@@ -29,6 +29,11 @@ hxcpp.n
 
 .vscode
 
+test/cxx_standard/main
+test/cxx_standard/main.hash
+test/cxx_standard/main.exe
+test/cxx_standard/main.exe.hash
+
 # Created by https://www.toptal.com/developers/gitignore/api/visualstudio
 # Edit at https://www.toptal.com/developers/gitignore?templates=visualstudio
 

docs/build_xml/Defines.md

@@ -37,8 +37,10 @@ Defines affecting how the code is compiled.  These can be on the command line wh
 | *HXCPP_CHECK_POINTER*   | Add null-pointer checks,even in release mode. |
 | *HXCPP_PROFILER*        | Add profiler support |
 | *HXCPP_TELEMETRY*       | Add telemetry support |
-| *HXCPP_CPP11*           | Use c++11 features and link libraries |
-| *HXCPP_CPP17*           | Use c++17 features and link libraries |
+| *HXCPP_C_STANDARD*      | Set default C standard |
+| *HXCPP_CXX_STANDARD*    | Set default C++ standard |
+| *HXCPP_OBJC_STANDARD*   | Set default Objective-C standard |
+| *HXCPP_OBJCXX_STANDARD* | Set default Objective-C++ standard |
 | *exe_link*              | Generate executable file (rather than dynamic library on android) |
 | *static_link*           | Generate static library |
 | *dll_link*              | Generate dynamic library |

docs/build_xml/Files.md

@@ -2,6 +2,20 @@ Files
 ------
 The files node defines a group of files that all share the same attributes, including relative directory, default compiler flags and dependencies.  The node can be used to define a set of header files on which other files can depend, or a set of source files to be compiled and included in a target.
 
+```xml
+<files id="foo" cxx_standard="14">
+  <file name="foo.cpp"/>
+  <file name="bar.c"/>
+</files>
+```
+
+#### Attributes
+
+  + `c_standard` = Default C standard for the file group
+  + `cxx_standard` = Default C++ standard for the file group
+  + `objc_standard` = Default Objective-C standard for the file group
+  + `objcxx_standard` = Default Objective-C++ standard for the file group
+#### Nodes
 - *depend* - Declare that all files in the group depend on another file or another file group.
   ```xml
   <depend name="filename" />
@@ -80,13 +94,17 @@ The files node defines a group of files that all share the same attributes, incl
 
 - *file* - Add file to group, with optional attributes
   ```xml
-  <file name="filename" tags="tag,tag1" filterout="define" embedName="embed" >
+  <file name="filename" tags="tag,tag1" filterout="define" embedName="embed" cxx_standard="17">
      <depend name="filename1" />
      <depend name="filename2" />
   </file>
   ```
      + name = name of file - may be absolute or relative to files.dir
      + tags = optional override of group tags.  See [Tags.md](Tags.md).
+     + `c_standard` = C standard for the file
+     + `cxx_standard` = C++ standard for the file
+     + `objc_standard` = Objective-C standard for the file
+     + `objcxx_standard` = Objective-C++ standard for the file
      + filterout = allows files to be skipped at compile-time if the named define exists.
        This is useful when the define is set sometime after the file list is parsed.
      + depend name = filename of additional dependency