Fix ci

Author: halx99

.appveyor.yml

@@ -14,7 +14,4 @@ install:
   - git submodule update --init --recursive
 
 build_script:
-  - ps: .\ci\build1k.ps1 -p win32 -a $env:BUILD_ARCH -cc msvc-120 -cm '-Bbuild','-DYASIO_ENABLE_HPERF_IO=1','-DYASIO_SSL_BACKEND=2'
-
-test_script:
-  - ps: .\ci\test.ps1 -dir 'build' -target 'win32'
+  - ps: .\build.ps1 -p win32 -a $env:BUILD_ARCH -cc msvc-120 -xc '-DYASIO_SSL_BACKEND=2'

build.ps1

@@ -75,10 +75,6 @@ $is_ci = $env:GITHUB_ACTIONS -eq 'true'
 # start construct full cmd line
 $fullCmdLine = @("$((Resolve-Path -Path "$myRoot/ci/build1k.ps1").Path)")
 
-if ($options.p -eq 'android') {
-    $fullCmdLine += "'-xt'", "'gradle'"
-}
-
 $search_prior_dir = $options.d
 $search_paths = if ($search_prior_dir) { @($search_prior_dir, $workDir, $myRoot) } else { @($workDir, $myRoot) }
 function search_proj($path, $type) {
@@ -96,7 +92,8 @@ $search_rule = @{ path = 'CMakeLists.txt'; type = 'Leaf' }
 $proj_dir = search_proj $search_rule.path $search_rule.type
 
 if ($is_ci) {
-    $options.xc += '-Bbuild, -DYASIO_ENABLE_KCP=TRUE','-DYASIO_ENABLE_HPERF_IO=1'
+    $options.xc = [array]$options.xc
+    $options.xc += '-DYASIO_ENABLE_KCP=TRUE','-DYASIO_ENABLE_HPERF_IO=1'
 }
 
 $bci = $null
@@ -134,19 +131,10 @@ foreach ($option in $options.GetEnumerator()) {
 $strFullCmdLine = "$fullCmdLine"
 Invoke-Expression $strFullCmdLine
 
-if ($is_ci) { # run tests
-    $target_os = $options.p
-    if (!$target_os) {
-        # choose host target if not specified by command line automatically
-        if ($IsWindows -or ("$env:OS" -eq 'Windows_NT')) {
-            $target_os = 'win32'
-        }
-        elseif($IsLinux) {
-            $target_os = 'linux'
-        }
-        elseif($IsMacOS) {
-            $target_os = 'osx'
-        }
-    }
-    & .\ci\test.ps1 -dir 'build' -target $target_os
+$buildResult = ConvertFrom-Json $env:buildResult
+
+if ($is_ci -and !$buildResult.compilerID.StartsWith('mingw')) { # run tests
+    $targetOS = $buildResult.targetOS
+    $buildDir = $buildResult.buildDir
+    & .\ci\test.ps1 -dir $buildDir -target $targetOS
 }

ci/build1k.ps1

@@ -174,7 +174,7 @@ if ($options.d) {
 
 $tools_dir = if ($options.prefix) { $options.prefix } else { Join-Path $HOME 'build1k' }
 if (!(Test-Path "$tools_dir" -PathType Container)) {
-    mkdir $tools_dir
+    mkdir $tools_dir | Out-Null
 }
 
 b1k_print "proj_dir=$((Get-Location).Path), tools_dir=$tools_dir"
@@ -798,7 +798,7 @@ if (!$CONFIG_ALL_OPTIONS) {
 }
 
 # step2. apply additional cross make options
-$xopts = $options.xc
+$xopts = [array]$options.xc
 if ($xopts.Count -gt 0) {
     b1k_print ("Apply additional cross make options: $($xopts), Count={0}" -f $xopts.Count)
     $CONFIG_ALL_OPTIONS += $xopts
@@ -817,7 +817,7 @@ else {
 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
+$buildOptions = [array]$options.xb
 $nopts = $buildOptions.Count
 $optimize_flag = $null
 for ($i = 0; $i -lt $nopts; ++$i) {
@@ -833,15 +833,15 @@ for ($i = 0; $i -lt $nopts; ++$i) {
 
 if (($BUILD_TARGET -eq 'android') -and ($options.xt -eq 'gradle')) {
     if ($optimize_flag -eq 'Debug') {
-        ./gradlew assembleDebug $CONFIG_ALL_OPTIONS
+        ./gradlew assembleDebug $CONFIG_ALL_OPTIONS | Out-Host
     }
     else {
-        ./gradlew assembleRelease $CONFIG_ALL_OPTIONS
+        ./gradlew assembleRelease $CONFIG_ALL_OPTIONS | Out-Host
     }
 } 
 else {
     # step3. configure
-    cmake -B $BUILD_DIR $CONFIG_ALL_OPTIONS
+    cmake -B $BUILD_DIR $CONFIG_ALL_OPTIONS | Out-Host
 
     # step4. build
     # apply additional build options
@@ -860,7 +860,13 @@ else {
     }
     b1k_print ("BUILD_ALL_OPTIONS=$BUILD_ALL_OPTIONS, Count={0}" -f $BUILD_ALL_OPTIONS.Count)
 
-    cmake --build $BUILD_DIR $BUILD_ALL_OPTIONS
+    cmake --build $BUILD_DIR $BUILD_ALL_OPTIONS | Out-Host
 }
 
 Set-Location $stored_cwd
+
+$env:buildResult = ConvertTo-Json @{
+    buildDir = $BUILD_DIR;
+    targetOS = $BUILD_TARGET;
+    compilerID = $TOOLCHAIN_NAME;
+}

yasio/bindings/yasio_axlua.cpp

@@ -25,7 +25,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
-#include "yasio/bindings/yasio_cclua.hpp"
+#include "yasio/bindings/yasio_axlua.hpp"
 #include "yasio/bindings/lyasio.hpp"
 #include "yasio/object_pool.hpp"
 #include "yasio/ref_ptr.hpp"
@@ -126,7 +126,7 @@ YASIO_LUA_API void clear()
 
 extern "C" {
 struct lua_State;
-YASIO_LUA_API int luaopen_yasio_cclua(lua_State* L)
+YASIO_LUA_API int luaopen_yasio_axlua(lua_State* L)
 {
   int n = luaopen_yasio(L);
 
@@ -145,7 +145,7 @@ YASIO_LUA_API int luaopen_yasio_cclua(lua_State* L)
 
 extern "C" {
 struct lua_State;
-YASIO_LUA_API int luaopen_yasio_cclua(lua_State* L)
+YASIO_LUA_API int luaopen_yasio_axlua(lua_State* L)
 {
   luaopen_yasio(L);
 

yasio/bindings/yasio_axlua.hpp

@@ -32,7 +32,7 @@ SOFTWARE.
 #if defined(__cplusplus)
 extern "C" {
 #endif
-YASIO_LUA_API int luaopen_yasio_cclua(lua_State* L);
+YASIO_LUA_API int luaopen_yasio_axlua(lua_State* L);
 #if defined(__cplusplus)
 }