Support spine version 4.2 (#18325)

This commit is contained in:
bofeng-song
2025-02-26 18:56:42 +08:00
committed by GitHub
parent cc31bcc64e
commit b2316fc02f
365 changed files with 33060 additions and 3451 deletions
@@ -44,8 +44,6 @@ jobs:
echo "set(CC_USE_GLES3 ON)" >> build-win64/proj/cfg.cmake
echo "set(CC_USE_VULKAN ON)" >> build-win64/proj/cfg.cmake
echo "set(CC_USE_GLES2 ON)" >> build-win64/proj/cfg.cmake
echo "set(USE_SPINE OFF)" >> build-win64/proj/cfg.cmake
echo "set(USE_DRAGONBONES OFF)" >> build-win64/proj/cfg.cmake
echo "set(USE_WEBSOCKET_SERVER ON)" >> build-win64/proj/cfg.cmake
echo "set(CMAKE_CXX_STANDARD_REQUIRED ON)" >> build-win64/proj/cfg.cmake
echo "set(CC_EXECUTABLE_NAME \"\")" >> build-win64/proj/cfg.cmake
@@ -193,6 +191,8 @@ jobs:
echo "set(USE_BOX2D_JSB ON)" >> build-android/proj/cfg.cmake
echo "set(USE_WEBSOCKET_SERVER ON)" >> build-android/proj/cfg.cmake
echo "set(CMAKE_CXX_STANDARD_REQUIRED ON)" >> build-android/proj/cfg.cmake
echo "set(USE_SPINE_3_8 OFF)" >> build-android/proj/cfg.cmake
echo "set(USE_SPINE_4_2 ON)" >> build-android/proj/cfg.cmake
echo "set(COCOS_X_PATH $NATIVE_ROOT)" >> build-android/proj/cfg.cmake
echo "set(CC_EXECUTABLE_NAME \"\")" >> build-android/proj/cfg.cmake
+16 -4
View File
@@ -7,8 +7,8 @@ if (args.length == 0) {
console.error('Please specify the engine root path');
process.exit(1);
}
const engineRoot = args[0];
const engineRoot = args[0];
console.log(`Engine root: ${engineRoot}`);
const features2DCommon = [
@@ -30,7 +30,8 @@ const features2DCommon = [
"physics-2d-box2d-wasm",
"profiler",
"rich-text",
"spine",
"spine", // Old version uses 'spine' feature
"spine-3.8", // New version uses 'spine-xxx' feature
"tiled-map",
"tween",
"ui",
@@ -115,13 +116,24 @@ async function buildEngineForFeatures(options) {
const excludeFeatures = [
'vendor-google',
'xr',
'spine-3.8',
'spine-4.2',
];
const allFeatures = statsQuery.getFeatures().filter(feature => !excludeFeatures.includes(feature));
console.log(`all features: [ ${allFeatures.join(', ')} ]`);
const allFeaturesForWeChat = [...allFeatures, 'spine-3.8'];
let allFeaturesForWeb = [...allFeatures, 'spine-4.2'];
if (!fs.pathExistsSync(ps.join(engineRoot, 'cocos', 'spine', 'lib', 'spine-version-4.2.ts'))) {
console.log(`Doesn't found spine-version-4.2.ts`);
allFeaturesForWeb = allFeaturesForWeChat;
} else {
console.log(`Found spine-version-4.2.ts`);
}
await buildEngineForFeatures({
features: allFeatures,
features: allFeaturesForWeChat,
outDir: ps.join(engineRoot, 'build-cc-out-all'),
noDeprecatedFeatures: false,
platform: "WECHAT",
@@ -130,7 +142,7 @@ async function buildEngineForFeatures(options) {
});
await buildEngineForFeatures({
features: allFeatures,
features: allFeaturesForWeb,
outDir: ps.join(engineRoot, 'build-cc-out-all-web'),
noDeprecatedFeatures: false,
platform: "HTML5",
+154 -45
View File
@@ -96,6 +96,17 @@ jobs:
echo "HEAD LOG:"
git --no-pager log -3
- name: Check for SPINE_VERSION in CMakeLists.txt (BASE)
run: |
cd ./engine/native/cocos/editor-support/spine-wasm
if grep -q "SPINE_VERSION" CMakeLists.txt; then
echo "FOUND_SPINE_VERSION_BASE=true"
echo "FOUND_SPINE_VERSION_BASE=true" >> $GITHUB_ENV
else
echo "FOUND_SPINE_VERSION_BASE=false"
echo "FOUND_SPINE_VERSION_BASE=false" >> $GITHUB_ENV
fi
- run: |
echo "EXT_VERSION=$(node ./engine/.github/workflows/get-native-external-version.js)" >> $GITHUB_ENV
@@ -116,41 +127,94 @@ jobs:
echo "--------------------------------- Apply patches DONE! ---------------------------------"
cat $EMSDK/upstream/emscripten/system/lib/embind/bind.cpp
- name: Build Spine WASM (BASE)
run: |
cd ./engine/native/cocos/editor-support/spine-wasm
mkdir build-wasm
cd build-wasm
emcmake cmake .. -GNinja
ninja
ls -l
# - name: Build Spine 3.8 WASM (BASE)
# run: |
# cd ./engine/native/cocos/editor-support/spine-wasm
# rm -rf build-wasm
# mkdir build-wasm
# cd build-wasm
# emcmake cmake .. -GNinja
# ninja
# ls -l
- name: Build Spine ASMJS (BASE)
run: |
cd ./engine/native/cocos/editor-support/spine-wasm
sed -i 's/set(BUILD_WASM 1)/set(BUILD_WASM 0)/g' CMakeLists.txt
mkdir build-asmjs
cd build-asmjs
emcmake cmake .. -GNinja
ninja
ls -l
# - name: Build Spine 3.8 ASMJS (BASE)
# run: |
# cd ./engine/native/cocos/editor-support/spine-wasm
# sed -i 's/set(BUILD_WASM 1)/set(BUILD_WASM 0)/g' CMakeLists.txt
# rm -rf build-asmjs
# mkdir build-asmjs
# cd build-asmjs
# emcmake cmake .. -GNinja
# ninja
# ls -l
- name: Copy files to external directory (BASE)
run: |
rm -rf dist
mkdir dist
cp ./engine/native/cocos/editor-support/spine-wasm/build-wasm/spine.wasm ./dist/
cp ./engine/native/cocos/editor-support/spine-wasm/build-wasm/spine.js ./dist/spine.wasm.js
cp ./engine/native/cocos/editor-support/spine-wasm/build-asmjs/spine.js.mem ./dist/
cp ./engine/native/cocos/editor-support/spine-wasm/build-asmjs/spine.js ./dist/spine.asm.js
echo "-------- Before replace spine wasm -----------"
ls -l ./engine/native/external/emscripten/spine/
cp -f ./dist/* ./engine/native/external/emscripten/spine/
echo "-------- After replace spine wasm ------------"
ls -l ./engine/native/external/emscripten/spine/
echo "-----------------------------------------------"
cd ./engine/native/external
git status
# - name: Copy Spine 3.8 files to external directory (BASE)
# run: |
# if [[ $FOUND_SPINE_VERSION_BASE ]]; then
# SPINE_VERSION="3.8"
# fi
# DIST_PATH="dist/3.8"
# rm -rf $DIST_PATH
# mkdir -p $DIST_PATH
# cp ./engine/native/cocos/editor-support/spine-wasm/build-wasm/spine.wasm ./$DIST_PATH/
# cp ./engine/native/cocos/editor-support/spine-wasm/build-wasm/spine.js ./$DIST_PATH/spine.wasm.js
# cp ./engine/native/cocos/editor-support/spine-wasm/build-asmjs/spine.js.mem ./$DIST_PATH/
# cp ./engine/native/cocos/editor-support/spine-wasm/build-asmjs/spine.js ./$DIST_PATH/spine.asm.js
# mkdir -p ./engine/native/external/emscripten/spine/$SPINE_VERSION
# echo "-------- Before replace spine wasm -----------"
# ls -l ./engine/native/external/emscripten/spine/$SPINE_VERSION
# cp -f ./$DIST_PATH/* ./engine/native/external/emscripten/spine/$SPINE_VERSION
# echo "-------- After replace spine wasm ------------"
# ls -l ./engine/native/external/emscripten/spine/$SPINE_VERSION
# echo "-----------------------------------------------"
# cd ./engine/native/external
# git status
# - name: Build Spine 4.2 WASM (BASE)
# if: env.FOUND_SPINE_VERSION_BASE == 'true'
# run: |
# cd ./engine/native/cocos/editor-support/spine-wasm
# sed -i 's/set(BUILD_WASM 0)/set(BUILD_WASM 1)/g' CMakeLists.txt
# sed -i 's/set(SPINE_VERSION "3.8")/set(SPINE_VERSION "4.2")/g' CMakeLists.txt
# rm -rf build-wasm
# mkdir build-wasm
# cd build-wasm
# emcmake cmake .. -GNinja
# ninja
# ls -l
# - name: Build Spine 4.2 ASMJS (BASE)
# if: env.FOUND_SPINE_VERSION_BASE == 'true'
# run: |
# cd ./engine/native/cocos/editor-support/spine-wasm
# sed -i 's/set(SPINE_VERSION "3.8")/set(SPINE_VERSION "4.2")/g' CMakeLists.txt
# sed -i 's/set(BUILD_WASM 1)/set(BUILD_WASM 0)/g' CMakeLists.txt
# rm -rf build-asmjs
# mkdir build-asmjs
# cd build-asmjs
# emcmake cmake .. -GNinja
# ninja
# ls -l
# - name: Copy Spine 4.2 files to external directory (BASE)
# if: env.FOUND_SPINE_VERSION_BASE == 'true'
# run: |
# DIST_PATH="dist/4.2"
# rm -rf $DIST_PATH
# mkdir -p $DIST_PATH
# cp ./engine/native/cocos/editor-support/spine-wasm/build-wasm/spine.wasm ./$DIST_PATH/
# cp ./engine/native/cocos/editor-support/spine-wasm/build-wasm/spine.js ./$DIST_PATH/spine.wasm.js
# cp ./engine/native/cocos/editor-support/spine-wasm/build-asmjs/spine.js.mem ./$DIST_PATH/
# cp ./engine/native/cocos/editor-support/spine-wasm/build-asmjs/spine.js ./$DIST_PATH/spine.asm.js
# mkdir -p ./engine/native/external/emscripten/spine/4.2/
# echo "-------- Before replace spine wasm -----------"
# ls -l ./engine/native/external/emscripten/spine/4.2/
# cp -f ./$DIST_PATH/* ./engine/native/external/emscripten/spine/4.2/
# echo "-------- After replace spine wasm ------------"
# ls -l ./engine/native/external/emscripten/spine/4.2/
# echo "-----------------------------------------------"
# cd ./engine/native/external
# git status
- name: Build Base Declarations
working-directory: .
@@ -195,7 +259,7 @@ jobs:
echo "--------------------------------- Apply patches DONE! ---------------------------------"
cat $EMSDK/upstream/emscripten/system/lib/embind/bind.cpp
- name: Build Spine WASM (HEAD)
- name: Build Spine 3.8 WASM (HEAD)
run: |
cd ./engine-HEAD/native/cocos/editor-support/spine-wasm
mkdir build-wasm
@@ -204,7 +268,7 @@ jobs:
ninja
ls -l
- name: Build Spine ASMJS (HEAD)
- name: Build Spine 3.8 ASMJS (HEAD)
run: |
cd ./engine-HEAD/native/cocos/editor-support/spine-wasm
sed -i 's/set(BUILD_WASM 1)/set(BUILD_WASM 0)/g' CMakeLists.txt
@@ -214,19 +278,64 @@ jobs:
ninja
ls -l
- name: Copy files to external directory (HEAD)
- name: Copy Spine 3.8 files to external directory (HEAD)
run: |
rm -rf dist
mkdir dist
cp ./engine-HEAD/native/cocos/editor-support/spine-wasm/build-wasm/spine.wasm ./dist/
cp ./engine-HEAD/native/cocos/editor-support/spine-wasm/build-wasm/spine.js ./dist/spine.wasm.js
cp ./engine-HEAD/native/cocos/editor-support/spine-wasm/build-asmjs/spine.js.mem ./dist/
cp ./engine-HEAD/native/cocos/editor-support/spine-wasm/build-asmjs/spine.js ./dist/spine.asm.js
DIST_PATH="dist/3.8"
rm -rf $DIST_PATH
mkdir -p $DIST_PATH
cp ./engine-HEAD/native/cocos/editor-support/spine-wasm/build-wasm/spine.wasm ./$DIST_PATH
cp ./engine-HEAD/native/cocos/editor-support/spine-wasm/build-wasm/spine.js ./$DIST_PATH/spine.wasm.js
cp ./engine-HEAD/native/cocos/editor-support/spine-wasm/build-asmjs/spine.js.mem ./$DIST_PATH/
cp ./engine-HEAD/native/cocos/editor-support/spine-wasm/build-asmjs/spine.js ./$DIST_PATH/spine.asm.js
echo "-------- Before replace spine wasm -----------"
ls -l ./engine-HEAD/native/external/emscripten/spine/
cp -f ./dist/* ./engine-HEAD/native/external/emscripten/spine/
mkdir -p ./engine-HEAD/native/external/emscripten/spine/3.8
ls -l ./engine-HEAD/native/external/emscripten/spine/3.8
cp -f ./$DIST_PATH/* ./engine-HEAD/native/external/emscripten/spine/3.8
echo "-------- After replace spine wasm ------------"
ls -l ./engine-HEAD/native/external/emscripten/spine/
ls -l ./engine-HEAD/native/external/emscripten/spine/3.8
echo "-----------------------------------------------"
cd ./engine-HEAD/native/external
git status
- name: Build Spine 4.2 WASM (HEAD)
run: |
cd ./engine-HEAD/native/cocos/editor-support/spine-wasm
sed -i 's/set(BUILD_WASM 0)/set(BUILD_WASM 1)/g' CMakeLists.txt
sed -i 's/set(SPINE_VERSION "3.8")/set(SPINE_VERSION "4.2")/g' CMakeLists.txt
rm -rf build-wasm
mkdir build-wasm
cd build-wasm
emcmake cmake .. -GNinja
ninja
ls -l
- name: Build Spine 4.2 ASMJS (HEAD)
run: |
cd ./engine-HEAD/native/cocos/editor-support/spine-wasm
sed -i 's/set(SPINE_VERSION "3.8")/set(SPINE_VERSION "4.2")/g' CMakeLists.txt
sed -i 's/set(BUILD_WASM 1)/set(BUILD_WASM 0)/g' CMakeLists.txt
rm -rf build-asmjs
mkdir build-asmjs
cd build-asmjs
emcmake cmake .. -GNinja
ninja
ls -l
- name: Copy Spine 4.2 files to external directory (HEAD)
run: |
DIST_PATH="dist/4.2"
rm -rf $DIST_PATH
mkdir -p $DIST_PATH
cp ./engine-HEAD/native/cocos/editor-support/spine-wasm/build-wasm/spine.wasm ./$DIST_PATH
cp ./engine-HEAD/native/cocos/editor-support/spine-wasm/build-wasm/spine.js ./$DIST_PATH/spine.wasm.js
cp ./engine-HEAD/native/cocos/editor-support/spine-wasm/build-asmjs/spine.js.mem ./$DIST_PATH/
cp ./engine-HEAD/native/cocos/editor-support/spine-wasm/build-asmjs/spine.js ./$DIST_PATH/spine.asm.js
echo "-------- Before replace spine wasm -----------"
mkdir -p ./engine-HEAD/native/external/emscripten/spine/4.2/
ls -l ./engine-HEAD/native/external/emscripten/spine/4.2/
cp -f ./$DIST_PATH/* ./engine-HEAD/native/external/emscripten/spine/4.2/
echo "-------- After replace spine wasm ------------"
ls -l ./engine-HEAD/native/external/emscripten/spine/4.2/
echo "-----------------------------------------------"
cd ./engine-HEAD/native/external
git status
+115
View File
@@ -18,12 +18,127 @@ jobs:
- uses: actions/setup-node@v4
with:
node-version: '18.x'
- name: Setup emsdk
uses: dumganhar/setup-emsdk@997d2cde2deabda085a11f98e86e842915b0e846
with:
version: 3.1.41
actions-cache-folder: 'emsdk-cache-3.1.41'
- name: Verify
run: |
which emcc
emcc -v
- name: Install ninja
run: |
if ! command -v ninja &> /dev/null; then
echo "Ninja not found, installing..."
# sudo apt update
sudo apt install ninja-build
else
echo "Ninja is already installed."
fi
which ninja
- name: Download external
run: |
EXT_VERSION=`node ./.github/workflows/get-native-external-version.js`
git clone --branch $EXT_VERSION --depth 1 https://github.com/cocos/cocos-engine-external native/external
- name: Apply emscripten patches
run: |
echo "--------------------------------- Save bind.cpp ---------------------------------"
cp $EMSDK/upstream/emscripten/system/lib/embind/bind.cpp $EMSDK/upstream/emscripten/system/lib/embind/bind.cpp.bak
echo "--------------------------------- Apply embind bind.cpp patches ---------------------------------"
cp -f ./.github/workflows/emscripten-patches/embind/bind.cpp $EMSDK/upstream/emscripten/system/lib/embind/
echo "--------------------------------- Apply patches DONE! ---------------------------------"
cat $EMSDK/upstream/emscripten/system/lib/embind/bind.cpp
- name: Build Spine 3.8 WASM
run: |
cd ./native/cocos/editor-support/spine-wasm
rm -rf build-wasm
mkdir build-wasm
cd build-wasm
emcmake cmake .. -GNinja
ninja
ls -l
- name: Build Spine 3.8 ASMJS
run: |
cd ./native/cocos/editor-support/spine-wasm
sed -i 's/set(BUILD_WASM 1)/set(BUILD_WASM 0)/g' CMakeLists.txt
rm -rf build-asmjs
mkdir build-asmjs
cd build-asmjs
emcmake cmake .. -GNinja
ninja
ls -l
- name: Copy Spine 3.8 files to external directory
run: |
SPINE_VERSION="3.8"
DIST_PATH="dist/3.8"
rm -rf $DIST_PATH
mkdir -p $DIST_PATH
cp ./native/cocos/editor-support/spine-wasm/build-wasm/spine.wasm ./$DIST_PATH/
cp ./native/cocos/editor-support/spine-wasm/build-wasm/spine.js ./$DIST_PATH/spine.wasm.js
cp ./native/cocos/editor-support/spine-wasm/build-asmjs/spine.js.mem ./$DIST_PATH/
cp ./native/cocos/editor-support/spine-wasm/build-asmjs/spine.js ./$DIST_PATH/spine.asm.js
mkdir -p ./native/external/emscripten/spine/$SPINE_VERSION
echo "-------- Before replace spine wasm -----------"
ls -l ./native/external/emscripten/spine/$SPINE_VERSION
cp -f ./$DIST_PATH/* ./native/external/emscripten/spine/$SPINE_VERSION
echo "-------- After replace spine wasm ------------"
ls -l ./native/external/emscripten/spine/$SPINE_VERSION
echo "-----------------------------------------------"
cd ./native/external
git status
- name: Build Spine 4.2 WASM
run: |
cd ./native/cocos/editor-support/spine-wasm
sed -i 's/set(BUILD_WASM 0)/set(BUILD_WASM 1)/g' CMakeLists.txt
sed -i 's/set(SPINE_VERSION "3.8")/set(SPINE_VERSION "4.2")/g' CMakeLists.txt
rm -rf build-wasm
mkdir build-wasm
cd build-wasm
emcmake cmake .. -GNinja
ninja
ls -l
- name: Build Spine 4.2 ASMJS
run: |
cd ./native/cocos/editor-support/spine-wasm
sed -i 's/set(SPINE_VERSION "3.8")/set(SPINE_VERSION "4.2")/g' CMakeLists.txt
sed -i 's/set(BUILD_WASM 1)/set(BUILD_WASM 0)/g' CMakeLists.txt
rm -rf build-asmjs
mkdir build-asmjs
cd build-asmjs
emcmake cmake .. -GNinja
ninja
ls -l
- name: Copy Spine 4.2 files to external directory
run: |
DIST_PATH="dist/4.2"
rm -rf $DIST_PATH
mkdir -p $DIST_PATH
cp ./native/cocos/editor-support/spine-wasm/build-wasm/spine.wasm ./$DIST_PATH/
cp ./native/cocos/editor-support/spine-wasm/build-wasm/spine.js ./$DIST_PATH/spine.wasm.js
cp ./native/cocos/editor-support/spine-wasm/build-asmjs/spine.js.mem ./$DIST_PATH/
cp ./native/cocos/editor-support/spine-wasm/build-asmjs/spine.js ./$DIST_PATH/spine.asm.js
mkdir -p ./native/external/emscripten/spine/4.2/
echo "-------- Before replace spine wasm -----------"
ls -l ./native/external/emscripten/spine/4.2/
cp -f ./$DIST_PATH/* ./native/external/emscripten/spine/4.2/
echo "-------- After replace spine wasm ------------"
ls -l ./native/external/emscripten/spine/4.2/
echo "-----------------------------------------------"
cd ./native/external
git status
- name: npm install
run: |
npm install