move templates (#10781)

* move templates

* adjust github action

* adjust access authority
This commit is contained in:
Santy-Wang
2022-04-18 10:24:54 +08:00
committed by GitHub
parent 580bedb28a
commit 3da31ad481
131 changed files with 30 additions and 32 deletions
+2 -2
View File
@@ -29,7 +29,7 @@ jobs:
run: |
COCOS2DX_ROOT=$GITHUB_WORKSPACE/native
echo "Compiling Linux ... "
cd $COCOS2DX_ROOT/templates/linux
cd $GITHUB_WORKSPACE/templates/linux
mkdir -p build-linux/proj
touch build-linux/proj/cfg.cmake
echo "set(CC_USE_VULKAN OFF)" >> build-linux/proj/cfg.cmake
@@ -41,7 +41,7 @@ jobs:
echo "set(USE_PHYSICS_PHYSX OFF)" >> build-linux/proj/cfg.cmake
mkdir build-linux/assets
RES_DIR=$COCOS2DX_ROOT/templates/linux/build-linux
RES_DIR=$GITHUB_WORKSPACE/templates/linux/build-linux
cd build-linux
cmake ../ -GNinja -DRES_DIR=$RES_DIR -DCOCOS_X_PATH=$COCOS2DX_ROOT
set +e
+12 -12
View File
@@ -31,7 +31,7 @@ jobs:
env:
COCOS_ENGINE_DEV: 1
run: |
cd $GITHUB_WORKSPACE/native/templates/windows
cd $GITHUB_WORKSPACE/templates/windows
mkdir -p build-win64/proj
touch build-win64/proj/cfg.cmake
echo "set(CC_USE_GLES3 ON)" >> build-win64/proj/cfg.cmake
@@ -43,7 +43,7 @@ jobs:
echo "set(CMAKE_CXX_STANDARD_REQUIRED ON)" >> build-win64/proj/cfg.cmake
mkdir build-win64/assets
cd build-win64
RES_DIR=${GITHUB_WORKSPACE//\\//}/native/templates/windows/build-win64
RES_DIR=${GITHUB_WORKSPACE//\\//}/templates/windows/build-win64
COCOS_X_PATH=${GITHUB_WORKSPACE//\\//}/native
cmake ../ -G"Visual Studio 16 2019" -DRES_DIR=$RES_DIR -DCOCOS_X_PATH=$COCOS_X_PATH -Ax64
cmake --build . --config Release
@@ -70,13 +70,13 @@ jobs:
run: |
COCOS2DX_ROOT=$GITHUB_WORKSPACE/native
ANDORID_NDK=$ANDROID_NDK_LATEST_HOME
NATIVE_DIR=$COCOS2DX_ROOT/templates/android-template
NATIVE_DIR=$GITHUB_WORKSPACE/templates/android-template
echo "Compiling Android ... "
cd $COCOS2DX_ROOT/templates/
cd $GITHUB_WORKSPACE/templates/
if [ ! -d android-template ]; then
cp -r android/template android-template
fi
cd $COCOS2DX_ROOT/templates/android/build
cd $GITHUB_WORKSPACE/templates/android/build
mkdir -p build-android/proj
touch build-android/proj/cfg.cmake
echo "set(CC_USE_GLES3 ON)" >> build-android/proj/cfg.cmake
@@ -87,7 +87,7 @@ jobs:
mkdir -p build-android/assets
ASSET_DIR=$COCOS2DX_ROOT/templates/android/build/build-android/
ASSET_DIR=$GITHUB_WORKSPACE/templates/android/build/build-android/
sed -i "s@^PROP_NDK_PATH.*@PROP_NDK_PATH=$ANDORID_NDK@g" gradle.properties
sed -i "s@^APPLICATION_ID.*@APPLICATION_ID=com.cocos.android@g" gradle.properties
@@ -129,7 +129,7 @@ jobs:
NUM_OF_CORES=`getconf _NPROCESSORS_ONLN`
COCOS2DX_ROOT=$GITHUB_WORKSPACE/native
echo "Compiling MacOSX ... "
cd $COCOS2DX_ROOT/templates/mac
cd $GITHUB_WORKSPACE/templates/mac
mkdir -p build-mac/proj
touch build-mac/proj/cfg.cmake
echo "set(CC_USE_VULKAN OFF)" >> build-mac/proj/cfg.cmake
@@ -140,7 +140,7 @@ jobs:
echo "set(CMAKE_CXX_STANDARD_REQUIRED ON)" >> build-mac/proj/cfg.cmake
mkdir build-mac/assets
RES_DIR=$COCOS2DX_ROOT/templates/mac/build-mac
RES_DIR=$GITHUB_WORKSPACE/templates/mac/build-mac
cd build-mac
cmake ../ -GXcode -DCMAKE_OSX_ARCHITECTURES=x86_64 -DRES_DIR=$RES_DIR -DCOCOS_X_PATH=$COCOS2DX_ROOT
set +e
@@ -180,7 +180,7 @@ jobs:
NUM_OF_CORES=`getconf _NPROCESSORS_ONLN`
COCOS2DX_ROOT=$GITHUB_WORKSPACE/native
echo "Compiling MacOSX ... "
cd $COCOS2DX_ROOT/templates/mac
cd $GITHUB_WORKSPACE/templates/mac
mkdir -p build-mac/proj
touch build-mac/proj/cfg.cmake
echo "set(CC_USE_VULKAN OFF)" >> build-mac/proj/cfg.cmake
@@ -191,7 +191,7 @@ jobs:
echo "set(CMAKE_CXX_STANDARD_REQUIRED ON)" >> build-mac/proj/cfg.cmake
mkdir build-mac/assets
RES_DIR=$COCOS2DX_ROOT/templates/mac/build-mac
RES_DIR=$GITHUB_WORKSPACE/templates/mac/build-mac
cd build-mac
cmake ../ -GXcode -DCMAKE_OSX_ARCHITECTURES=arm64 -DRES_DIR=$RES_DIR -DCOCOS_X_PATH=$COCOS2DX_ROOT
set +e
@@ -235,7 +235,7 @@ jobs:
NUM_OF_CORES=`getconf _NPROCESSORS_ONLN`
COCOS2DX_ROOT=$GITHUB_WORKSPACE/native
echo "Compiling iOS ... "
cd $COCOS2DX_ROOT/templates/ios
cd $GITHUB_WORKSPACE/templates/ios
mkdir -p build-ios/proj
touch build-ios/proj/cfg.cmake
echo "set(CC_USE_GLES3 OFF)" >> build-ios/proj/cfg.cmake
@@ -249,7 +249,7 @@ jobs:
echo "set(MACOSX_BUNDLE_GUI_IDENTIFIER com.cocos.demo.ios)" >> build-ios/proj/cfg.cmake
mkdir build-ios/assets
cd build-ios
RES_DIR=$COCOS2DX_ROOT/templates/ios/build-ios
RES_DIR=$GITHUB_WORKSPACE/templates/ios/build-ios
cmake ../ -GXcode -DCMAKE_SYSTEM_NAME=iOS \
-DCMAKE_OSX_SYSROOT=iphoneos \
-DCMAKE_OSX_ARCHITECTURES=arm64 \
+6 -6
View File
@@ -35,13 +35,13 @@ jobs:
ANDROID_NDK_HOME='/home/tools/android-sdk-linux/ndk-bundle'
ANDROID_SDK_ROOT='/home/tools/android-sdk-linux'
export ANDORID_NDK ANDROID_SDK_ROOT ANDROID_NDK_HOME
NATIVE_DIR=$COCOS2DX_ROOT/templates/android-template
NATIVE_DIR=$GITHUB_WORKSPACE/templates/android-template
echo "Compiling Android ... "
cd $COCOS2DX_ROOT/templates/
cd $GITHUB_WORKSPACE/templates/
if [ ! -d android-template ]; then
cp -r android/template android-template
fi
cd $COCOS2DX_ROOT/templates/android/build
cd $GITHUB_WORKSPACE/templates/android/build
mkdir -p build-android/proj
touch build-android/proj/cfg.cmake
echo "set(CC_USE_GLES3 ON)" >> build-android/proj/cfg.cmake
@@ -50,7 +50,7 @@ jobs:
echo "set(USE_WEBSOCKET_SERVER ON)" >> build-android/proj/cfg.cmake
echo "set(CMAKE_CXX_STANDARD_REQUIRED ON)" >> build-android/proj/cfg.cmake
mkdir -p build-android/assets
ASSET_DIR=$COCOS2DX_ROOT/templates/android/build/build-android/
ASSET_DIR=$GITHUB_WORKSPACE/templates/android/build/build-android/
sed -i "s@^PROP_NDK_PATH.*@PROP_NDK_PATH=$ANDORID_NDK@g" gradle.properties
sed -i "s@^APPLICATION_ID.*@APPLICATION_ID=com.cocos.android@g" gradle.properties
sed -i "s@^RES_PATH.*@RES_PATH=$ASSET_DIR@g" gradle.properties
@@ -90,7 +90,7 @@ jobs:
env:
COCOS_ENGINE_DEV: 1
run: |
cd $GITHUB_WORKSPACE/native/templates/windows
cd $GITHUB_WORKSPACE/templates/windows
mkdir -p build-win64/proj
touch build-win64/proj/cfg.cmake
echo "set(CC_USE_GLES3 ON)" >> build-win64/proj/cfg.cmake
@@ -100,7 +100,7 @@ jobs:
echo "set(CMAKE_CXX_STANDARD_REQUIRED ON)" >> build-win64/proj/cfg.cmake
mkdir build-win64/assets
cd build-win64
RES_DIR=${GITHUB_WORKSPACE//\\//}/native/templates/windows/build-win64
RES_DIR=${GITHUB_WORKSPACE//\\//}/templates/windows/build-win64
COCOS_X_PATH=${GITHUB_WORKSPACE//\\//}/native
cmake ../ -G"Visual Studio 15 2017" -DRES_DIR=$RES_DIR -DCOCOS_X_PATH=$COCOS_X_PATH -Ax64
cmake --build . --config Release
+1
View File
@@ -43,3 +43,4 @@ scripts/runtime-web-adapter
native/external/
scripts/typedoc-plugin/lib/
!templates/**/*
-1
View File
@@ -134,7 +134,6 @@ project.properties
# Ignore prebuilt libraries folder
/external/*
!/external/config.json
/templates/lua-template-runtime/runtime
/v*-deps-*.zip
/new-renderer-*.zip
/v*-lua-runtime-*.zip
+6 -6
View File
@@ -214,17 +214,17 @@ find_program(NODE_EXECUTABLE NAMES node)
find_program(TSC_EXECUTABLE NAMES tsc)
## predefined configurations for game applications
include(${CMAKE_CURRENT_LIST_DIR}/../templates/cmake/common.cmake)
include(${CMAKE_CURRENT_LIST_DIR}/../../templates/cmake/common.cmake)
if(APPLE)
include(${CMAKE_CURRENT_LIST_DIR}/../templates/cmake/apple.cmake)
include(${CMAKE_CURRENT_LIST_DIR}/../../templates/cmake/apple.cmake)
elseif(WINDOWS)
include(${CMAKE_CURRENT_LIST_DIR}/../templates/cmake/windows.cmake)
include(${CMAKE_CURRENT_LIST_DIR}/../../templates/cmake/windows.cmake)
elseif(LINUX)
include(${CMAKE_CURRENT_LIST_DIR}/../templates/cmake/linux.cmake)
include(${CMAKE_CURRENT_LIST_DIR}/../../templates/cmake/linux.cmake)
elseif(ANDROID)
include(${CMAKE_CURRENT_LIST_DIR}/../templates/cmake/android.cmake)
include(${CMAKE_CURRENT_LIST_DIR}/../../templates/cmake/android.cmake)
elseif(OHOS)
include(${CMAKE_CURRENT_LIST_DIR}/../templates/cmake/ohos.cmake)
include(${CMAKE_CURRENT_LIST_DIR}/../../templates/cmake/ohos.cmake)
else()
message(FATAL_ERROR "Unhandled platform specified cmake utils!")
endif()
+1 -1
View File
@@ -43,7 +43,7 @@ def lint(root):
dirs = [
os.path.join(root, 'cocos'),
os.path.join(root, 'extensions'),
os.path.join(root, 'templates')
os.path.join(root, '..', 'templates')
]
files = scan(*dirs, extensions=['.c', '.cpp', '.h', '.hpp', '.m', '.mm', '.java'])
@@ -15,12 +15,10 @@ Thumbs.db
/lib
/linux-build
/samples
/templates
/tests
/plugin/samples
/tools
/utils
/licenses
/simulator
/build/build
/cocos/bindings/proj.ios_mac/build/cocos2d_js_bindings.build
+2 -2
View File
@@ -76,8 +76,8 @@ generate_bindings_glue_codes
cd $COCOS2DX_ROOT
## revert change
git clean -fdx templates
git checkout HEAD templates
git clean -fdx ../templates
git checkout HEAD ../templates
set +x
cd $COCOS2DX_ROOT/tools/travis-scripts

Before

Width:  |  Height:  |  Size: 6.6 KiB

After

Width:  |  Height:  |  Size: 6.6 KiB

Before

Width:  |  Height:  |  Size: 3.9 KiB

After

Width:  |  Height:  |  Size: 3.9 KiB

Before

Width:  |  Height:  |  Size: 9.7 KiB

After

Width:  |  Height:  |  Size: 9.7 KiB

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 16 KiB

Before

Width:  |  Height:  |  Size: 23 KiB

After

Width:  |  Height:  |  Size: 23 KiB

Before

Width:  |  Height:  |  Size: 216 KiB

After

Width:  |  Height:  |  Size: 216 KiB

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 12 KiB

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 13 KiB

Before

Width:  |  Height:  |  Size: 23 KiB

After

Width:  |  Height:  |  Size: 23 KiB

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

Before

Width:  |  Height:  |  Size: 4.6 KiB

After

Width:  |  Height:  |  Size: 4.6 KiB

Before

Width:  |  Height:  |  Size: 4.7 KiB

After

Width:  |  Height:  |  Size: 4.7 KiB

Before

Width:  |  Height:  |  Size: 4.9 KiB

After

Width:  |  Height:  |  Size: 4.9 KiB

Before

Width:  |  Height:  |  Size: 7.4 KiB

After

Width:  |  Height:  |  Size: 7.4 KiB

Before

Width:  |  Height:  |  Size: 8.3 KiB

After

Width:  |  Height:  |  Size: 8.3 KiB

Before

Width:  |  Height:  |  Size: 656 KiB

After

Width:  |  Height:  |  Size: 656 KiB

Before

Width:  |  Height:  |  Size: 454 KiB

After

Width:  |  Height:  |  Size: 454 KiB

Before

Width:  |  Height:  |  Size: 143 KiB

After

Width:  |  Height:  |  Size: 143 KiB

Before

Width:  |  Height:  |  Size: 8.5 KiB

After

Width:  |  Height:  |  Size: 8.5 KiB

Before

Width:  |  Height:  |  Size: 617 B

After

Width:  |  Height:  |  Size: 617 B

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 20 KiB

Before

Width:  |  Height:  |  Size: 27 KiB

After

Width:  |  Height:  |  Size: 27 KiB

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 2.5 KiB

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

Before

Width:  |  Height:  |  Size: 46 KiB

After

Width:  |  Height:  |  Size: 46 KiB

Before

Width:  |  Height:  |  Size: 69 KiB

After

Width:  |  Height:  |  Size: 69 KiB

Before

Width:  |  Height:  |  Size: 5.2 KiB

After

Width:  |  Height:  |  Size: 5.2 KiB

Some files were not shown because too many files have changed in this diff Show More