axmolengine · halx99 · Dec 31, 2021 · Dec 26, 2021 · Dec 27, 2021 · Dec 27, 2021
diff --git a/.appveyor.yml b/.appveyor.yml
diff --git a/.github/workflows/android-ci.yml b/.github/workflows/android-ci.yml
@@ -16,12 +16,9 @@ on:
 
 env:
   # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
-  TRAVIS_OS_NAME: linux
+  GH_OS_NAME: linux
   BUILD_TARGET: android
-  # Simple let github action to build all (TODO: optimize in the future)
-  TRAVIS_PULL_REQUEST: true
   BUILD_TYPE: Release
-  GITHUB_CI: true
   PYENV_VERSION: 2.7.18
 
 jobs:
@@ -51,8 +48,8 @@ jobs:
     - name: Create Build Environment
       # Some projects don't allow in-source building, so create a separate build directory
       # We'll use this as our working directory for all
-      run: tools/travis-scripts/before-install.sh
+      run: tools/unix-ci/before-install.sh
 
     - name: Build
       # Execute the build.  You can specify a specific target with "--target <NAME>"
-      run: tools/travis-scripts/run-script.sh
+      run: tools/unix-ci/run-script.sh
diff --git a/.github/workflows/clang-format.yml b/.github/workflows/clang-format.yml
@@ -7,7 +7,7 @@ on:
         # actions run ID
         description: 'Commit clang-format changes?'
         # Default value if no value is explicitly provided
-        default: false
+        default: 'false'
         # Input has to be provided for the workflow to run
         required: false
 
@@ -21,9 +21,9 @@ jobs:
     - name: Run clang-format lint
       uses: DoozyX/clang-format-lint-action@v0.13
       with:
-        source: './cocos ./extensions'
-        exclude: './thidrparty ./extensions/fairygui ./extensions/scripting/lua-bindings/auto ./extensions/spine'
-        extensions: 'h,cpp,c'
+        source: './cocos ./extensions ./tests ./templates'
+        exclude: './thidrparty ./extensions/fairygui ./extensions/scripting/lua-bindings/auto ./extensions/spine ./tests/fairygui-tests'
+        extensions: 'h,cpp,c,mm'
         clangFormatVersion: 13
         inplace: True
     - name: Commit clang-format changes

diff --git a/.github/workflows/genbindings-ci.yml b/.github/workflows/genbindings-ci.yml
@@ -0,0 +1,36 @@
+name: genbindings
+
+on: 
+  push:
+    branches:
+      - dev
+      - main
+    paths:
+      - cocos/**/*
+      - extensions/**/*
+      - .github/workflows/genbindings-ci.yml
+
+jobs:
+  build:
+    if: ${{ !startsWith(github.event.commits[0].message, 'Merge pull request') }}
+    # The CMake configure and build commands are platform agnostic and should work equally
+    # well on Windows or Mac.  You can convert this to a matrix build if you need
+    # cross-platform coverage.
+    # See: https://docs.github.com/en/actions/configuring-and-managing-workflows/configuring-a-workflow#configuring-a-build-matrix
+    runs-on: windows-latest
+
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        submodules: 'recursive'
+        lfs: 'true'
+
+    - name: Setup Python
+      uses: actions/setup-python@v2
+
+    - uses: ilammy/msvc-dev-cmd@v1.9.0
+      with: 
+        arch: ${{ env.BUILD_ARCH }}
+
+    - name: Build
+      run: tools\win-ci\genbindings.ps1
diff --git a/.github/workflows/ios-ci.yml b/.github/workflows/ios-ci.yml
@@ -16,12 +16,9 @@ on:
 
 env:
   # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
-  TRAVIS_OS_NAME: osx
+  GH_OS_NAME: osx
   BUILD_TARGET: ios
-  # Simple let github action to build all (TODO: optimize in the future)
-  TRAVIS_PULL_REQUEST: true
   BUILD_TYPE: Release
-  GITHUB_CI: true
 
 jobs:
   build:
@@ -41,8 +38,8 @@ jobs:
     - name: Create Build Environment
       # Some projects don't allow in-source building, so create a separate build directory
       # We'll use this as our working directory for all
-      run: tools/travis-scripts/before-install.sh
+      run: tools/unix-ci/before-install.sh
 
     - name: Build
       # Execute the build.  You can specify a specific target with "--target <NAME>"
-      run: tools/travis-scripts/run-script.sh
+      run: tools/unix-ci/run-script.sh
diff --git a/.github/workflows/linux-ci.yml b/.github/workflows/linux-ci.yml
@@ -16,12 +16,10 @@ on:
 
 env:
   # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
-  TRAVIS_OS_NAME: linux
+  GH_OS_NAME: linux
   BUILD_TARGET: linux
-  # Simple let github action to build all (TODO: optimize in the future)
-  TRAVIS_PULL_REQUEST: true
   BUILD_TYPE: Release
-  GITHUB_CI: true
+  PYENV_VERSION: 2.7.18
 
 jobs:
   build:
@@ -41,8 +39,8 @@ jobs:
     - name: Create Build Environment
       # 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
-      run: tools/travis-scripts/before-install.sh
+      run: tools/unix-ci/before-install.sh
 
     - name: Build
       # Execute the build.  You can specify a specific target with "--target <NAME>"
-      run: tools/travis-scripts/run-script.sh
+      run: tools/unix-ci/run-script.sh
diff --git a/.github/workflows/osx-ci.yml b/.github/workflows/osx-ci.yml
@@ -16,12 +16,9 @@ on:
 
 env:
   # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
-  TRAVIS_OS_NAME: osx
+  GH_OS_NAME: osx
   BUILD_TARGET: osx
-  # Simple let github action to build all (TODO: optimize in the future)
-  TRAVIS_PULL_REQUEST: true
   BUILD_TYPE: Release
-  GITHUB_CI: true
 
 jobs:
   build:
@@ -41,8 +38,8 @@ jobs:
     - name: Create Build Environment
       # Some projects don't allow in-source building, so create a separate build directory
       # We'll use this as our working directory for all
-      run: tools/travis-scripts/before-install.sh
+      run: tools/unix-ci/before-install.sh
 
     - name: Build
       # Execute the build.  You can specify a specific target with "--target <NAME>"
-      run: tools/travis-scripts/run-script.sh
+      run: tools/unix-ci/run-script.sh
diff --git a/.github/workflows/pr-ci.yml b/.github/workflows/pr-ci.yml
@@ -8,9 +8,7 @@ on:
 env:
   # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
   BUILD_TYPE: Release
-  # Simple let github action to build all (TODO: optimize in the future)
-  TRAVIS_PULL_REQUEST: true
-  GITHUB_CI: true
+  PYENV_VERSION: 2.7.18
 
 jobs:
   build-windows:
@@ -31,13 +29,13 @@ jobs:
       - name: Setup Python
         uses: actions/setup-python@v2
       - name: Build
-        run: tools\windows-ci\build.ps1 $env:BUILD_ARCH
+        run: tools\win-ci\build.ps1 $env:BUILD_ARCH
 
   build-linux:
     name: build-linux
     runs-on: ubuntu-latest
     env:
-      TRAVIS_OS_NAME: linux
+      GH_OS_NAME: linux
       BUILD_TARGET: linux
     steps:
       - uses: actions/checkout@v2
@@ -46,8 +44,8 @@ jobs:
           lfs: 'true'
       - name: Build
         run: |
-          tools/travis-scripts/before-install.sh
-          tools/travis-scripts/run-script.sh
+          tools/unix-ci/before-install.sh
+          tools/unix-ci/run-script.sh
 
   build-android:
     name: build-android
@@ -59,9 +57,8 @@ jobs:
           - arm64-v8a
           - x86
     env:
-      TRAVIS_OS_NAME: linux
+      GH_OS_NAME: linux
       BUILD_TARGET: android
-      PYENV_VERSION: 2.7.18
       BUILD_ARCH: ${{ matrix.arch }}
     steps:
       - uses: actions/checkout@v2
@@ -70,14 +67,14 @@ jobs:
           lfs: 'true'
       - name: Build
         run: |
-          tools/travis-scripts/before-install.sh
-          tools/travis-scripts/run-script.sh
+          tools/unix-ci/before-install.sh
+          tools/unix-ci/run-script.sh
 
   build-osx:
     name: build-osx
     runs-on: macos-latest
     env:
-      TRAVIS_OS_NAME: osx
+      GH_OS_NAME: osx
       BUILD_TARGET: osx
     steps:
       - uses: actions/checkout@v2
@@ -86,14 +83,14 @@ jobs:
           lfs: 'true'
       - name: Build
         run: |
-          tools/travis-scripts/before-install.sh
-          tools/travis-scripts/run-script.sh
+          tools/unix-ci/before-install.sh
+          tools/unix-ci/run-script.sh
 
   build-ios:
     name: build-ios
     runs-on: macos-latest
     env:
-      TRAVIS_OS_NAME: osx
+      GH_OS_NAME: osx
       BUILD_TARGET: ios
     steps:
       - uses: actions/checkout@v2
@@ -102,5 +99,5 @@ jobs:
           lfs: 'true'
       - name: Build
         run: |
-          tools/travis-scripts/before-install.sh
-          tools/travis-scripts/run-script.sh
+          tools/unix-ci/before-install.sh
+          tools/unix-ci/run-script.sh
diff --git a/.github/workflows/windows-ci.yml b/.github/workflows/windows-ci.yml
@@ -44,4 +44,4 @@ jobs:
         arch: ${{ env.BUILD_ARCH }}
 
     - name: Build
-      run: tools\windows-ci\build.ps1 $env:BUILD_ARCH
+      run: tools\win-ci\build.ps1 $env:BUILD_ARCH
diff --git a/README.md b/README.md
@@ -1,15 +1,17 @@
 # adxe
-[![Codacy Badge](https://api.codacy.com/project/badge/Grade/1c5628dea478449ea0c6e1b0e30c3be9)](https://app.codacy.com/gh/adxeproject/adxe?utm_source=github.com&utm_medium=referral&utm_content=adxeproject/adxe&utm_campaign=Badge_Grade_Settings)
-[![dev](https://img.shields.io/badge/v1.0.0-beta4-yellow.svg)](https://github.com/adxeproject/adxe/releases)
+
+[![dev](https://img.shields.io/badge/v1.0.0-beta5-yellow.svg)](https://github.com/adxeproject/adxe/releases)
 [![LICENSE](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/adxeproject/adxe/blob/master/LICENSE)
+[![Codacy Badge](https://api.codacy.com/project/badge/Grade/1c5628dea478449ea0c6e1b0e30c3be9)](https://app.codacy.com/gh/adxeproject/adxe?utm_source=github.com&utm_medium=referral&utm_content=adxeproject/adxe&utm_campaign=Badge_Grade_Settings)
+[![PRs Welcome](https://img.shields.io/badge/PRs-welcome-blue.svg)](https://github.com/adxeproject/adxe/pulls)
 
 [![Windows Build Status](https://github.com/adxeproject/adxe/actions/workflows/windows-ci.yml/badge.svg)](https://github.com/adxeproject/adxe/actions/workflows/windows-ci.yml)
 [![Android Build Status](https://github.com/adxeproject/adxe/workflows/android/badge.svg)](https://github.com/adxeproject/adxe/actions?query=workflow%3Aandroid)
 [![iOS Build Status](https://github.com/adxeproject/adxe/workflows/ios/badge.svg)](https://github.com/adxeproject/adxe/actions?query=workflow%3Aios)
 [![Linux Build Status](https://github.com/adxeproject/adxe/workflows/linux/badge.svg)](https://github.com/adxeproject/adxe/actions?query=workflow%3Alinux)
 [![macOS Build Status](https://github.com/adxeproject/adxe/workflows/osx/badge.svg)](https://github.com/adxeproject/adxe/actions?query=workflow%3Aosx)  
 
-**This is another more radical fork of *Cocos2d-x-4.0*, use OpenAL for all platforms, single texture multi GPU texture handler, C++ 14/17 and some more (see 'Highlight Features' for more info).**  
+**This is another more radical fork of *Cocos2d-x-4.0*, use OpenAL for all platforms, single texture multi GPU texture handler, C++ 17 and some more (see 'Highlight Features' for more info).**  
 
 ### View code with vscode online: 
 - [![github1s](https://img.shields.io/badge/github1s-green.svg)](https://github1s.com/adxeproject/adxe)
@@ -19,10 +21,9 @@
 **[简体中文](README_CN.md)**
 
 ### Purpose Summary
-* C++ 14/17
+* C++ 17
 * Focus on native game dev (quick starting, easy to use, fast)
 * Bugfixes ASAP
-* Usefull PRs from **you** are welcome (review/merge ASAP)
 
 ### Highlight Features
 * Windows x64 build support
@@ -36,7 +37,7 @@
 * Implement all .wav formats supported by ```OpenAL Soft```, such as MS-ADPCM, ADPCM, ...
 * Use modern GL loader ```Glad```
 * Google [angle](https://github.com/google/angle) renderer backend support
-* C++ 14 standard
+* C++ 17 standard
 * IOS SDK 9.0 as minimal deployment
 * Use fast pugixml
 * Use [curl](https://github.com/curl/curl) for transferring data with URL syntax
@@ -136,7 +137,7 @@ https://github.com/adxeproject/adxe/discussions/411
 - @aismann
 - @weiwest
 
-### Fullly changes since cocos2d-x-4.0
+### Fully changes since cocos2d-x-4.0
 
 - [HIGHLIGHT] Implement Windows WebView using WebView2 Edge Chromium, thanks to @rh101
 - [HIGHLIGHT] Windows x64 build support

diff --git a/README_CN.md b/README_CN.md
@@ -1,8 +1,9 @@
 # adxe
 
-[![Codacy Badge](https://api.codacy.com/project/badge/Grade/1c5628dea478449ea0c6e1b0e30c3be9)](https://app.codacy.com/gh/adxeproject/adxe?utm_source=github.com&utm_medium=referral&utm_content=adxeproject/adxe&utm_campaign=Badge_Grade_Settings)
-[![dev](https://img.shields.io/badge/v1.0.0-beta4-yellow.svg)](https://github.com/adxeproject/adxe/releases)
+[![dev](https://img.shields.io/badge/v1.0.0-beta5-yellow.svg)](https://github.com/adxeproject/adxe/releases)
 [![LICENSE](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/adxeproject/adxe/blob/master/LICENSE)
+[![Codacy Badge](https://api.codacy.com/project/badge/Grade/1c5628dea478449ea0c6e1b0e30c3be9)](https://app.codacy.com/gh/adxeproject/adxe?utm_source=github.com&utm_medium=referral&utm_content=adxeproject/adxe&utm_campaign=Badge_Grade_Settings)
+[![PRs Welcome](https://img.shields.io/badge/PRs-welcome-blue.svg)](https://github.com/adxeproject/adxe/pulls)
 
 [![Windows Build Status](https://github.com/adxeproject/adxe/actions/workflows/windows-ci.yml/badge.svg)](https://github.com/adxeproject/adxe/actions/workflows/windows-ci.yml)
 [![Android Build Status](https://github.com/adxeproject/adxe/workflows/android/badge.svg)](https://github.com/adxeproject/adxe/actions?query=workflow%3Aandroid)
@@ -11,16 +12,15 @@
 [![macOS Build Status](https://github.com/adxeproject/adxe/workflows/osx/badge.svg)](https://github.com/adxeproject/adxe/actions?query=workflow%3Aosx)  
 
 
-**这是另外一个基于 *Cocos2d-x-4.0* 持续维护的分支, 全平台基于OpenAL, c++14/17...**
+**这是另外一个基于 *Cocos2d-x-4.0* 持续维护的分支, 全平台基于OpenAL, c++17...**
 
 **[English](README.md)**
 
 ### 宗旨:
-* C++14/17
+* C++17
 * Focus on native game dev only
 * Fix bugs ASAP
 * Review PR ASAP
-* Excellent PRs from any guys are welcome, we will review & merge ASAP
 
 ### 主要特性:
 * Windows x64编译支持
@@ -33,7 +33,7 @@
 * AudioEngine实现wav所有 ```openal-soft``` 支持的封装格式, 例如MS-ADPCM, ADPCM等
 * 使用现代化的GL加载器glad代替glew
 * 增加google angle渲染后端支持
-* 设置默认C++标准为C++14
+* C++最低标准要求: C++17
 * 设置ios下最低目标平台为ios9.0
 * 使用更快的xml解析库pugixml代替tinyxml2
 * Downloader全平台统一实现，均基于curl