Skip to content

Commit 15711be

Browse files
halx99halx99
committed
Version 2.3.1
1 parent c05e69a commit 15711be

File tree

7 files changed

+68
-46
lines changed

7 files changed

+68
-46
lines changed

‎.github/workflows/build.yml‎

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,7 @@ jobs:
2525
submodules: 'recursive'
2626
- name: Build
2727
shell: pwsh
28-
run: |
29-
.\tools\cmdline\axmol -p win32 -a x64
30-
.\tools\cmdline\axmol run -p win32 -a x64 -xb '--target,unit-tests'
28+
run: .\tools\cmdline\axmol -p win32 -a x64 && .\tools\cmdline\axmol run -p win32 -a x64 -t unit-tests
3129
- uses: actions/upload-artifact@v4
3230
with:
3331
name: windows_x64
@@ -78,10 +76,7 @@ jobs:
7876
7977
- name: Build
8078
shell: pwsh
81-
run: |
82-
./tools/cmdline/axmol -p linux -a x64
83-
./tools/cmdline/axmol -p linux -a x64 -xb '--target,lua-tests'
84-
./tools/cmdline/axmol run -p linux -a x64 -xb '--target,unit-tests' -wait
79+
run: ./tools/cmdline/axmol -p linux -a x64 -t 'cpp-tests,lua-tests' && ./tools/cmdline/axmol run -p linux -a x64 -t unit-tests -wait
8580
osx-arm64:
8681
runs-on: macos-latest
8782
steps:
@@ -90,9 +85,7 @@ jobs:
9085
submodules: 'recursive'
9186
- name: Build
9287
shell: pwsh
93-
run: |
94-
./tools/cmdline/axmol -p osx
95-
./tools/cmdline/axmol run -p osx -xb '--target,unit-tests'
88+
run: ./tools/cmdline/axmol -p osx && ./tools/cmdline/axmol run -p osx -t unit-tests
9689
osx-x64:
9790
runs-on: macos-13
9891
steps:
@@ -101,9 +94,7 @@ jobs:
10194
submodules: 'recursive'
10295
- name: Build
10396
shell: pwsh
104-
run: |
105-
./tools/cmdline/axmol -p osx
106-
./tools/cmdline/axmol run -p osx -xb '--target,unit-tests'
97+
run: ./tools/cmdline/axmol -p osx && ./tools/cmdline/axmol run -p osx -t unit-tests
10798
android:
10899
runs-on: ubuntu-latest
109100
strategy:
@@ -154,10 +145,7 @@ jobs:
154145
submodules: 'recursive'
155146
- name: Build
156147
shell: pwsh
157-
run: |
158-
./tools/cmdline/axmol -p wasm -xc '-DAX_ENABLE_EXT_EFFEKSEER=ON,-DAX_WASM_THREADS=8' -j2
159-
./tools/cmdline/axmol -p wasm -xc '-DAX_ENABLE_EXT_EFFEKSEER=ON,-DAX_WASM_THREADS=8' -j2 -xb '--target,fairygui-tests'
160-
./tools/cmdline/axmol -p wasm -xc '-DAX_ENABLE_EXT_EFFEKSEER=ON,-DAX_WASM_THREADS=8' -j2 -xb '--target,lua-tests'
148+
run: ./tools/cmdline/axmol -p wasm -xc '-DAX_ENABLE_EXT_EFFEKSEER=ON,-DAX_WASM_THREADS=8' -j2 -t 'cpp-tests,fairygui-tests,lua-tests'
161149
- uses: actions/upload-artifact@v4
162150
with:
163151
name: wasm

‎.github/workflows/genbindings.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ on:
1212

1313
workflow_dispatch:
1414
jobs:
15-
build:
15+
genbindings:
1616
runs-on: windows-latest
1717

1818
steps:
@@ -25,7 +25,7 @@ jobs:
2525
with:
2626
python-version: '3.11.5'
2727

28-
- name: Build
28+
- name: Genbindings
2929
run: tools\ci\genbindings.ps1
3030

3131
- name: Create pull request

‎1k/1kiss.ps1‎

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1762,6 +1762,7 @@ elseif ($Global:is_wasm) {
17621762

17631763
$is_host_target = $Global:is_win32 -or $Global:is_linux -or $Global:is_mac
17641764
$is_host_cpu = $HOST_CPU -eq $TARGET_CPU
1765+
$cmake_target = $null
17651766

17661767
if (!$setupOnly) {
17671768
$BUILD_DIR = $null
@@ -2030,10 +2031,25 @@ if (!$setupOnly) {
20302031
$forward_options += '--', '-quiet'
20312032
}
20322033

2033-
if ($options.t) { $cmake_target = $options.t }
2034-
if ($cmake_target) {
2035-
$cmake_targets = $cmake_target.Split(',')
2036-
foreach ($target in $cmake_targets) {
2034+
$cm_targets = $options.t
2035+
2036+
if($cm_targets) {
2037+
if($cm_targets -isnot [array]) {
2038+
$cm_targets = "$cm_targets".Split(',')
2039+
}
2040+
} else {
2041+
$cm_targets = @()
2042+
}
2043+
if($cmake_target) {
2044+
if ($cm_targets.Contains($cmake_target)) {
2045+
$cm_targets += $cmake_target
2046+
}
2047+
} else {
2048+
$cmake_target = $cm_targets[-1]
2049+
}
2050+
2051+
if ($cm_targets) {
2052+
foreach ($target in $cm_targets) {
20372053
$1k.println("cmake --build $BUILD_DIR $BUILD_ALL_OPTIONS --target $target")
20382054
cmake --build $BUILD_DIR $BUILD_ALL_OPTIONS --target $target $forward_options | Out-Host
20392055
if (!$?) {

‎1k/extensions.ps1‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# So provide a spec VersionEx make [VersionEx]'1.0' -eq [VersionEx]'1.0.0' == true available
33
if (-not ([System.Management.Automation.PSTypeName]'System.VersionEx').Type) {
44

5-
Add-Type -TypeDefinition @"
5+
$code_str = @"
66
77
namespace System
88
{
@@ -216,8 +216,9 @@ namespace System
216216
}
217217
"@
218218

219-
$TrimLastMethod = [ExtensionMethods].GetMethod('TrimLast')
220-
Update-TypeData -TypeName System.String -MemberName TrimLast -MemberType CodeMethod -Value $TrimLastMethod
219+
Add-Type -TypeDefinition $code_str
220+
$TrimLastMethod = [ExtensionMethods].GetMethod('TrimLast')
221+
Update-TypeData -TypeName System.String -MemberName TrimLast -MemberType CodeMethod -Value $TrimLastMethod
221222
}
222223

223224

‎CHANGELOG.md‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
## axmol-2.3.1 Jan.5 2025
2+
3+
### Bug fixes
4+
5+
- Fix RenderTexture internal sprite positioning and test cases by @rh101 in https://github.com/axmolengine/axmol/pull/2301
6+
- Fix imgui compile and link error for wasm by @halx99 in https://github.com/axmolengine/axmol/pull/2297
7+
8+
### Improvements
9+
10+
- Improve CI, raise error when build fail by @halx99
11+
- Improve DevSetup.md by @rh101 in https://github.com/axmolengine/axmol/pull/2298
12+
13+
### 3rdparty updates
14+
15+
- xxhash: 0.8.2 ==> 0.8.3
16+
117
## axmol-2.3.0 Jan.1 2025
218

319
### Significant changes relative to 2.2.x:

‎core/axmolver.h.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
// 00 03 08 00
66
#define AX_VERSION_MAJOR 2
77
#define AX_VERSION_MINOR 3
8-
#define AX_VERSION_PATCH 0
8+
#define AX_VERSION_PATCH 1
99

1010
/* Define axmol version helper macros */
1111
#define AX_VERSION_MAKE(a, b, c) ((a << 16) | (b << 8) | (c & 0xff))

‎tools/cmdline/build.ps1‎

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ param(
3939

4040
$unhandled_args = @()
4141

42-
$options = @{p = $null; d = $null; xc = @(); xb = @(); }
42+
$options = @{p = $null; d = $null; xc = @(); xb = @(); t = @() }
4343

4444
$optName = $null
4545
foreach ($arg in $args) {
@@ -150,14 +150,17 @@ if ($use_gradle) {
150150
if (!$use_gradle) {
151151
if (!$cmake_target) {
152152
# non android, specific cmake target
153-
$cmake_targets = @(
154-
# project
155-
$proj_name,
156-
# engine
157-
'cpp-tests'
158-
)
159-
$cmake_target = $cmake_targets[$is_axmol_engine]
160-
$options.xb += '--target', $cmake_target
153+
if($options.t) {
154+
if($options.t -isnot [array]) {
155+
$options.t = "$($options.t)".Split(',')
156+
}
157+
}
158+
159+
if(!$options.t) {
160+
$options.t = @(@($proj_name, 'cpp-tests')[$is_axmol_engine])
161+
}
162+
163+
$cmake_target = $options.t[-1]
161164
}
162165

163166
if ($is_android -and !"$($options.xc)".Contains('-DANDROID_STL')) {
@@ -196,15 +199,13 @@ if ($forceConfig) {
196199
$forward_args['forceConfig'] = $true
197200
}
198201

199-
. $1k_script @1k_args @forward_args @unhandled_args
202+
$op_name = @('Generate', 'Build')[!$configOnly]
200203

201-
if (!$configOnly) {
202-
if ($?) {
203-
$1k.pause('Build success')
204-
} else {
205-
throw "Build fail, ret=$LASTEXITCODE"
206-
}
207-
}
208-
else {
209-
$1k.pause('Generate done')
204+
. $1k_script @1k_args @forward_args @unhandled_args
205+
if ($?) {
206+
$1k.pause("$op_name success")
207+
} else {
208+
Write-Error "$op_name fail, ret=$LASTEXITCODE"
210209
}
210+
211+
exit $LASTEXITCODE

0 commit comments

Comments
 (0)