Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add build1k:assembleDebug support for android

This commit is contained in:
halx99 2023-07-04 09:20:56 +08:00
parent e3f33fe9c2
commit 6b6fc25078
1 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
tools/ci/build1k.ps1
View File

@ -816,8 +816,27 @@ else {
} }
b1k_print ("CONFIG_ALL_OPTIONS=$CONFIG_ALL_OPTIONS, Count={0}" -f $CONFIG_ALL_OPTIONS.Count) b1k_print ("CONFIG_ALL_OPTIONS=$CONFIG_ALL_OPTIONS, Count={0}" -f $CONFIG_ALL_OPTIONS.Count)
# parsing build optimize flag from build_options
$buildOptions = $options.xb
$nopts = $buildOptions.Count
$optimize_flag = $null
for ($i = 0; $i -lt $nopts; ++$i) {
$optv = $buildOptions[$i]
if($optv -eq '--config') {
if ($i -lt ($nopts - 1)) {
$optimize_flag = $buildOptions[$i + 1]
}
break
}
}
if (($BUILD_TARGET -eq 'android') -and ($options.xt -eq 'gradle')) { if (($BUILD_TARGET -eq 'android') -and ($options.xt -eq 'gradle')) {
./gradlew assembleRelease $CONFIG_ALL_OPTIONS if ($optimize_flag -eq 'Debug') {
./gradlew assembleDebug $CONFIG_ALL_OPTIONS
}
else {
./gradlew assembleRelease $CONFIG_ALL_OPTIONS
}
} }
else { else {
# step3. configure # step3. configure
@ -825,12 +844,12 @@ else {
# step4. build # step4. build
# apply additional build options # apply additional build options
$xb_opts = $options.xb $BUILD_ALL_OPTIONS = @()
$BUILD_ALL_OPTIONS = if ("$($xb_opts)".IndexOf('--config') -eq -1) { @('--config', 'Release') } else { @() } $BUILD_ALL_OPTIONS += $buildOptions
if ($xb_opts) { if (!$optimize_flag) {
$BUILD_ALL_OPTIONS += $xb_opts $BUILD_ALL_OPTIONS += '--config', 'Release'
} }
$BUILD_ALL_OPTIONS += "--parallel" $BUILD_ALL_OPTIONS += "--parallel"
if ($BUILD_TARGET -eq 'linux') { if ($BUILD_TARGET -eq 'linux') {
$BUILD_ALL_OPTIONS += "$(nproc)" $BUILD_ALL_OPTIONS += "$(nproc)"