Add debian-11+ support for axmol-2.x (#2956)

Author: halx99

.github/workflows/build.yml

@@ -10,6 +10,7 @@ on:
       - '**/*.md.in'
       - 'docs/**'
       - '.github/workflows/publish.yml'
+      - '.github/workflows/debian.yml'
       - 'tools/ci/make-pkg.ps1'
   pull_request:
     types: [opened, synchronize, reopened]

.github/workflows/debian.yml

@@ -0,0 +1,39 @@
+# This workflow require self-hosted by @halx99 personal machine, so only support trigger manually
+name: debian
+
+on:
+  push:
+    branches:
+      - dev
+      - release/*
+    paths:
+      - '.github/workflows/debian.yml'
+  workflow_dispatch:
+    inputs:
+      cxxstd:
+        # actions run ID
+        description: 'Please input cxxstd, example: 20'
+        # Default value if no value is explicitly provided
+        default: '20'
+        # Input has to be provided for the workflow to run
+        required: false
+
+env:
+  __1K_CXXSTD: '${{ inputs.cxxstd }}'
+
+run-name: 'build@c++${{ inputs.cxxstd || 20 }}'
+
+jobs:
+  debian-ogl:
+    runs-on: debian-11
+    steps:
+    - uses: actions/checkout@v6
+
+    - name: Install dependencies
+      run: |
+        AX_ROOT=`pwd`
+        echo -e "y" | pwsh $AX_ROOT/setup.ps1
+
+    - name: Build
+      shell: pwsh
+      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

.github/workflows/genbindings.yml

@@ -11,6 +11,7 @@ on:
       - 'docs/**'
       - '.github/workflows/publish.yml'
       - 'tools/ci/make-pkg.ps1'
+      - '.github/workflows/debian.yml'
 
   workflow_dispatch:
 jobs:

.github/workflows/publish.yml

@@ -28,36 +28,21 @@ jobs:
     steps:
     - uses: actions/checkout@v6
 
-    - name: Check release ver from input
-      if: ${{ github.event.inputs.version != '' }}
+    - name: Check release version
       id: check_ver
       shell: pwsh
       run: |
-        $release_ver = '${{ github.event.inputs.version }}'
-        echo "release_ver=$release_ver" >> ${env:GITHUB_OUTPUT}
-        echo "release_ver=$release_ver" >> ${env:GITHUB_ENV}
-
-    - name: Check release ver from commits
-      if: ${{ steps.check_ver.outputs.release_ver == '' }}
-      shell: pwsh
-      run: |
-        # commit message template: Version 2.7.0
+        # commit message template: Version 1.8.0
         $commit_msg = "$(git show -s --format=%s)"
-        echo "commit_msg: $commit_msg"
-        $matchInfo = [Regex]::Match($commit_msg, 'Version\s(\d+\.)+(-)?(\*|\d+)')
-        if ($matchInfo.Success) { $matchInfo = [Regex]::Match($matchInfo.Value, '(\d+\.)+(-)?(\*|\d+)') }
-        $release_ver = if($matchInfo.Success) { $matchInfo.Value.TrimStart('Version ') }
-        echo "release_ver=$release_ver" >> ${env:GITHUB_ENV}
-
-    - name: Forward release ver to step make_pkg
-      id: forward_ver
-      shell: pwsh
-      run: |
-        echo "Forwarding release_ver=$env:release_ver ..."
-        echo "release_ver=$env:release_ver" >> ${env:GITHUB_OUTPUT}
+        echo "Parsing release version from commit message: $commit_msg"
+        $matchInfo = [Regex]::Match($commit_msg, '^Version\s+(?<ver>\d+\.\d+\.\d+)$')
+        if(!$matchInfo.Success) { $matchInfo = [Regex]::Match('${{github.event.inputs.version}}', '^(?<ver>\d+\.\d+\.\d+(-\w+)?)$') }
+        if($matchInfo.Success) { $release_ver = $matchInfo.Groups['ver'].Value } else { $release_ver='' }
+        echo "release_ver=$release_ver"
+        echo "release_ver=$release_ver" >> ${env:GITHUB_OUTPUT}
 
     - name: Make package
-      if: ${{ steps.forward_ver.outputs.release_ver != '' }}
+      if: ${{ steps.check_ver.outputs.release_ver != '' }}
       id: make_pkg
       # Some projects don't allow in-source building, so create a separate build directory
       # We'll use this as our working directory for all subsequent commands
@@ -69,7 +54,7 @@ jobs:
         axmol -xc '-DAX_WITH_LZ4=ON,-DAX_WITH_CARES=ON,-DAX_WITH_YAML_CPP=ON,-DAX_WITH_KCP=ON' -c
         $input_commitish = "${{ github.event.inputs.commitish }}"
         if (!$input_commitish) { $input_commitish = $(git -C $AX_ROOT branch --show-current) }
-        ./tools/ci/publish.ps1 -version "${{ steps.forward_ver.outputs.release_ver }}" -commitish $input_commitish
+        ./tools/ci/publish.ps1 -version "${{ steps.check_ver.outputs.release_ver }}" -commitish $input_commitish
         echo "commitish=$input_commitish" >> ${env:GITHUB_OUTPUT}
 
     - name: Publish to github release page

1k/1kiss.ps1

@@ -68,8 +68,11 @@ $HOST_LINUX = 1 # targets: linux,android
 $HOST_MAC = 2 # targets: android,ios,osx(macos),tvos,watchos
 
 # 0: windows, 1: linux, 2: macos
-$Global:IsWin = $IsWindows -or ("$env:OS" -eq 'Windows_NT')
-if ($Global:IsWin) { $HOST_OS_INT = $HOST_WIN }
+
+# import VersionEx and others
+. (Join-Path $PSScriptRoot 'extensions.ps1')
+
+if ($IsWin) { $HOST_OS_INT = $HOST_WIN }
 else {
     if ($IsLinux) { $HOST_OS_INT = $HOST_LINUX }
     elseif ($IsMacOS) { $HOST_OS_INT = $HOST_MAC }
@@ -99,9 +102,6 @@ if ($Global:IsWin) {
 }
 $ErrorActionPreference = @('Stop', 'Continue')[$is_pwsh_ise]
 
-# import VersionEx and others
-. (Join-Path $PSScriptRoot 'extensions.ps1')
-
 class _1kiss {
     [void] println($msg) {
         Write-Host "1kiss: $msg"
@@ -335,7 +335,7 @@ if ([VersionEx]$pwsh_ver -lt [VersionEx]"7.0") {
     [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
 }
 
-$osVer = if ($IsWin) { "Microsoft Windows $([System.Environment]::OSVersion.Version.ToString())" } else { $PSVersionTable.OS }
+$osVerString = if ($IsWin) { "Microsoft Windows $($NtOSVersion.ToString())" } else { $PSVersionTable.OS }
 
 # arm64,x64
 # uname -m: arm64/aarch64,x86_64
@@ -347,7 +347,7 @@ if ($IsWin) {
     $HOST_CPU = [System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture.ToString().ToLower()
 }
 
-$1k.println("PowerShell $pwsh_ver on $osVer")
+$1k.println("PowerShell $pwsh_ver on $osVerString")
 
 # determine build target os
 $TARGET_OS = $options.p
@@ -1674,7 +1674,7 @@ function preprocess_win() {
 function preprocess_linux() {
     $outputOptions = @()
     if ($Global:is_clang) {
-        $outputOptions += '-DCMAKE_C_COMPILER=clang', '-DCMAKE_CXX_COMPILER=clang++'
+        $outputOptions += "-DCMAKE_TOOLCHAIN_FILE=$PSScriptRoot/clang.cmake"
     }
     return , $outputOptions
 }

1k/build.profiles

@@ -6,7 +6,7 @@
 # --- region platfom:common
 
 # The axmol shader compiler, legacy name is 'glslcc' before axmol-2.3.0
-axslcc=1.9.6
+axslcc=1.14.0
 
 # The cmake, @gradle @axmol-cmdline
 # as latest as possible

1k/clang.cmake

@@ -0,0 +1,5 @@
+# The clang toolchain on linux
+set(CMAKE_C_COMPILER clang)
+set(CMAKE_CXX_COMPILER clang++)
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
+set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lc++ -lc++abi")

1k/extensions.ps1

@@ -1,3 +1,14 @@
+# PowerShell 5.x No builtin variable: $IsWindows
+if ($Global:__1k_ext_imported) { return }
+
+$Global:__1k_ext_imported = $true
+
+$Global:IsWin = $IsWindows -or ("$env:OS" -eq 'Windows_NT')
+
+if ($Global:IsWin) {
+    $Global:NtOSVersion = [System.Environment]::OSVersion.Version
+}
+
 # The System.Version compare not relex: [Version]'1.0' -eq [Version]'1.0.0' == false
 # So provide a spec VersionEx make [VersionEx]'1.0' -eq [VersionEx]'1.0.0' == true available
 if (-not ([System.Management.Automation.PSTypeName]'System.VersionEx').Type) {
@@ -22,7 +33,7 @@ namespace System
         public int Revision { get { return _Revision; } }
 
         int DefaultFormatFieldCount { get { return (_Build > 0 || _Revision > 0) ? (_Revision > 0 ? 4 : 3) : 2; } }
- 
+
         public VersionEx() { }
 
         public VersionEx(string version)
@@ -34,7 +45,7 @@ namespace System
             _Revision = v.Revision;
         }
 
-        public VersionEx(System.Version version) { 
+        public VersionEx(System.Version version) {
             _Major = version.Major;
             _Minor = version.Minor;
             _Build = Math.Max(version.Build, 0);
@@ -222,15 +233,15 @@ namespace System
 }
 
 
-function ConvertFrom-Props {
+function Global:ConvertFrom-Props {
     param(
-        [Parameter(Mandatory=$true)]
+        [Parameter(Mandatory = $true)]
         $InputObject
     )
 
     $props = @{}
 
-    foreach($_ in $InputObject) {
+    foreach ($_ in $InputObject) {
         if ($_ -match "^#.*$") {
             continue
         }
@@ -244,9 +255,9 @@ function ConvertFrom-Props {
     return $props
 }
 
-function ConvertTo-Props {
+function Global:ConvertTo-Props {
     param(
-        [Parameter(Mandatory=$true)]
+        [Parameter(Mandatory = $true)]
         $InputObject
     )
 

1k/install-pwsh.sh

@@ -150,7 +150,7 @@ if(ARCHS MATCHES "((arm64|arm64e|x86_64)(^|;|, )?)+")
   endif()
 endif()
 
-# This little function lets you set any XCode specific property, refer to: ios.toolchain.cmake
+# This little function lets you set any Xcode specific property, refer to: ios.toolchain.cmake
 function(set_xcode_property TARGET XCODE_PROPERTY XCODE_VALUE)
   if(ARGC LESS 4 OR ARGV3 STREQUAL "All")
     set_property(TARGET ${TARGET} PROPERTY XCODE_ATTRIBUTE_${XCODE_PROPERTY} ${XCODE_VALUE})