Skip to content

Commit 472b698

Browse files
committed
Merge remote-tracking branch 'Official_hxcpp/master'
2 parents 0af88f5 + be7ef02 commit 472b698

181 files changed

Lines changed: 49848 additions & 2175 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/package.yml

Lines changed: 21 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@ jobs:
1212
runs-on: ${{ matrix.os }}
1313
steps:
1414
- name: Checkout
15-
uses: actions/checkout@v3
15+
uses: actions/checkout@v4
16+
with:
17+
fetch-depth: 0
1618

1719
- uses: Aidan63/setup-haxe@3d3101bcd0a2001699fc8295f4d9eddd0724d3e9
1820
with:
@@ -22,16 +24,20 @@ jobs:
2224
run: |
2325
haxe -version
2426
haxelib dev hxcpp .
27+
28+
- name: 'Get Previous tag'
29+
id: previoustag
30+
uses: "WyriHaximus/github-action-get-previous-tag@v1"
31+
with:
32+
prefix: v
2533

2634
- name: Set Version
27-
run: haxe -cp tools/version --run Write ${{github.run_number}} > version.env
28-
35+
run: haxe -p tools/version --run Write ${{ steps.previoustag.outputs.tag }} > version.env
2936

3037
- name: Build Tool
3138
run: |
3239
cd tools/hxcpp
3340
haxe compile.hxml
34-
3541
3642
- name: Check XCode
3743
if: startsWith(matrix.os,'macos')
@@ -49,7 +55,7 @@ jobs:
4955
5056
- name: Archive Linux Results
5157
if: startsWith(matrix.os,'ubuntu')
52-
uses: actions/upload-artifact@v3
58+
uses: actions/upload-artifact@v4
5359
with:
5460
name: linux-64
5561
path: |
@@ -75,15 +81,15 @@ jobs:
7581
7682
- name: Archive Windows Results
7783
if: startsWith(matrix.os,'windows')
78-
uses: actions/upload-artifact@v3
84+
uses: actions/upload-artifact@v4
7985
with:
8086
name: windows-64
8187
path: |
8288
bin/Windows64/Cppia.exe
8389
8490
- name: Archive Mac Results
8591
if: startsWith(matrix.os,'macos')
86-
uses: actions/upload-artifact@v3
92+
uses: actions/upload-artifact@v4
8793
with:
8894
name: mac-64
8995
path: |
@@ -94,19 +100,19 @@ jobs:
94100
runs-on: ubuntu-latest
95101
steps:
96102
- name: Download Linux
97-
uses: actions/download-artifact@v3
103+
uses: actions/download-artifact@v4
98104
with:
99105
name: linux-64
100106
path: hxcpp
101107

102108
- name: Download Mac
103-
uses: actions/download-artifact@v3
109+
uses: actions/download-artifact@v4
104110
with:
105111
name: mac-64
106112
path: hxcpp/bin/Mac64/
107113

108114
- name: Download Windows
109-
uses: actions/download-artifact@v3
115+
uses: actions/download-artifact@v4
110116
with:
111117
name: windows-64
112118
path: hxcpp/bin/Windows64/
@@ -126,23 +132,11 @@ jobs:
126132
zip -r hxcpp-${{ env.hxcpp_release }}.zip hxcpp-${{ env.hxcpp_release }}
127133
128134
- name: Create Release
129-
id: create_release
130-
uses: actions/create-release@v1
131-
env:
132-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
135+
uses: ncipollo/release-action@v1
133136
with:
134-
tag_name: v${{ env.hxcpp_release }}
135-
release_name: Release ${{ env.hxcpp_release }}
137+
tag: v${{ env.hxcpp_release }}
138+
commit: ${{ github.head_ref }}
139+
name: Release ${{ env.hxcpp_release }}
136140
draft: false
137141
prerelease: false
138-
139-
- name: Upload Release Asset
140-
id: upload-release-asset
141-
uses: actions/upload-release-asset@v1
142-
env:
143-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
144-
with:
145-
upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
146-
asset_path: ./hxcpp-${{ env.hxcpp_release }}.zip
147-
asset_name: hxcpp-${{ env.hxcpp_release }}.zip
148-
asset_content_type: application/zip
142+
artifacts: ./hxcpp-${{ env.hxcpp_release }}.zip

.github/workflows/setup/action.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@ runs:
2222
- name: install native libraries
2323
if: runner.os == 'Linux'
2424
shell: pwsh
25-
run: sudo apt-get install -qqy gcc-multilib g++-multilib
25+
run: |
26+
sudo apt-get update -qqy
27+
sudo apt-get install -qqy gcc-multilib g++-multilib
2628
2729
- name: build run.n
2830
working-directory: tools/run

.github/workflows/test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,8 +152,8 @@ jobs:
152152
run: |
153153
set -ex
154154
sudo rm -R /var/lib/mysql/
155-
curl -sS https://downloads.mariadb.com/MariaDB/mariadb_repo_setup > mariadb_repo_setup
156-
curl -sS https://downloads.mariadb.com/MariaDB/mariadb_repo_setup.sha256 > mariadb_repo_setup.sha256
155+
curl -sSL https://downloads.mariadb.com/MariaDB/mariadb_repo_setup > mariadb_repo_setup
156+
curl -sSL https://downloads.mariadb.com/MariaDB/mariadb_repo_setup.sha256 > mariadb_repo_setup.sha256
157157
sha256sum --check mariadb_repo_setup.sha256
158158
sudo bash mariadb_repo_setup
159159
sudo apt-get update -qqy

Changes.md

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,40 @@
11

2+
4.3.xx
3+
------------------------------------------------------------
4+
5+
* Added support for killing processes on OS' other than Windows, Apple TV, and Apple Watch
6+
* Added register capturing on Linux
7+
* Added HXCPP_CPP17 define
8+
* Added ASM and NASM support to build xml
9+
* Added support for name and value entries to build xml
10+
* Added tracy profiler
11+
* Added support for Android NDKs higher than 21
12+
* Added x86_64 support to older Android NDKs
13+
* Added optional detaching of main thread
14+
15+
* Updated mbedtls to 2.28.2
16+
* Updated sqlite to 3.40.1
17+
* Updated zlib to 1.2.13
18+
19+
* Fixed SSL socket non blocking handshake throwing an exception on 64bit Windows
20+
* Fixed Windows 64bit architecture detection
21+
* Fixed critial error handler returning the wrong callstack
22+
* Fixed ARM64 library names on Mac
23+
* Fixed generational GC when used with HXCPP_ALIGN_ALLOC
24+
* Fixed pthread structured being unaligned
25+
* Fixed cppia crash on functions with empty bodies
26+
* Fixed regression parsing integers which wrap around
27+
* Fixed compilation with HXCPP_GC_DEBUG_LEVEL define
28+
* Fixed compilation with MinGW
29+
* Fixed enum parameters potentially returning null
30+
* Fixed HXCPP_CLANG not being set when using clang
31+
* Fixed pcre2 and mbedtls not being compiled with the c99 standard
32+
* Fixed behaviour of indexOf and lastIndexOf on empty strings not aligning with other targets
33+
* Fixed behaviour of directory reading function not aligning with other targets
34+
* Fixed haxelib not being invoked with the current working directory
35+
36+
* Removed Haxe 3 support
37+
238
4.3
339
------------------------------------------------------------
440

docs/build_xml/Defines.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ Defines affecting how the code is compiled. These can be on the command line wh
3838
| *HXCPP_PROFILER* | Add profiler support |
3939
| *HXCPP_TELEMETRY* | Add telemetry support |
4040
| *HXCPP_CPP11* | Use c++11 features and link libraries |
41+
| *HXCPP_CPP17* | Use c++17 features and link libraries |
4142
| *exe_link* | Generate executable file (rather than dynamic library on android) |
4243
| *static_link* | Generate static library |
4344
| *dll_link* | Generate dynamic library |
@@ -67,7 +68,7 @@ Defines affecting target architecture.
6768
| *HXCPP_LINUX_ARM64* | Run on a linux ARM64 device |
6869
| *winrt* | Compile for windowsRt/windows UWP |
6970
| *android* | Compile for android |
70-
| *PLATFORM* | Specify the android platform for NDK compilation |
71+
| *HXCPP_ANDROID_PLATFORM* | Specify the android platform for NDK compilation |
7172
| *ANDROID_NDK_ROOT* | Specify the location of the android NDK toolchain |
7273
| *ANDROID_NDK_DIR* | Specify the search location for finding the android NDK toolchain |
7374
| *HXCPP_X86* | Compile android for x86 architecture |

0 commit comments

Comments
 (0)