improve CI scripts, update modules

2025-12-13 07:45:39 +07:00 · 2019-11-24 20:59:38 +07:00
parent ac6da0c740
commit 7fdc227b17
41 changed files with 1851 additions and 2763 deletions
--- a/scripts/build_all.bat
+++ b/scripts/build_all.bat
@@ -1,7 +1,9 @@
@echo off
 set SCRIPT_DIR=%~dp0%
-call %SCRIPT_DIR%\build_debug.bat || goto :error
-call %SCRIPT_DIR%\build_release.bat || goto :error
+call %SCRIPT_DIR%\build_debug_x86.bat || goto :error
+call %SCRIPT_DIR%\build_debug_x64.bat || goto :error
+call %SCRIPT_DIR%\build_release_x86.bat || goto :error
+call %SCRIPT_DIR%\build_release_x64.bat || goto :error

 goto :EOF

--- a/scripts/build_debug.sh
+++ b/scripts/build_debug.sh
@@ -1,9 +1,9 @@
 #!/bin/bash
 set -e
 BUILD_DIR=`dirname "$BASH_SOURCE"`/../build
-mkdir -p $BUILD_DIR/debug
-cd $BUILD_DIR/debug
+mkdir -p $BUILD_DIR/Debug
+cd $BUILD_DIR/Debug
 cmake -DCMAKE_BUILD_TYPE=Debug ../..
-cmake --build . -- -j8
+cmake --build .
 ctest --verbose
 cd ../..
--- a/scripts/build_debug_x64.bat
+++ b/scripts/build_debug_x64.bat
@@ -1,11 +1,11 @@
@echo off
 set BUILD_DIR=%~dp0%\..\build
-mkdir %BUILD_DIR%\debug || goto :error
-cd %BUILD_DIR%\debug || goto :error
-cmake ../.. || goto :error
+mkdir %BUILD_DIR%\Debug\x64 || goto :error
+cd %BUILD_DIR%\Debug\x64 || goto :error
+cmake ..\..\.. -A x64 || goto :error
 cmake --build . --config Debug || goto :error
 ctest --verbose || goto :error
-cd ..\.. || goto :error
+cd ..\..\.. || goto :error

 goto :EOF

--- a/scripts/build_debug_x86.bat
+++ b/scripts/build_debug_x86.bat
@@ -0,0 +1,14 @@
+@echo off
+set BUILD_DIR=%~dp0%\..\build
+mkdir %BUILD_DIR%\Debug\x86 || goto :error
+cd %BUILD_DIR%\Debug\x86 || goto :error
+cmake ..\..\.. -A Win32 || goto :error
+cmake --build . --config Debug || goto :error
+ctest --verbose || goto :error
+cd ..\..\.. || goto :error
+
+goto :EOF
+
+:error
+echo Failed with error #%errorlevel%.
+exit /b %errorlevel%
--- a/scripts/build_release.sh
+++ b/scripts/build_release.sh
@@ -1,9 +1,9 @@
 #!/bin/bash
 set -e
 BUILD_DIR=`dirname "$BASH_SOURCE"`/../build
-mkdir -p $BUILD_DIR/release
-cd $BUILD_DIR/release
+mkdir -p $BUILD_DIR/Release
+cd $BUILD_DIR/Release
 cmake -DCMAKE_BUILD_TYPE=Release ../..
-cmake --build . -- -j8
+cmake --build .
 ctest --verbose
 cd ../..
--- a/scripts/build_release_x64.bat
+++ b/scripts/build_release_x64.bat
@@ -1,11 +1,11 @@
@echo off
 set BUILD_DIR=%~dp0%\..\build
-mkdir %BUILD_DIR%\release || goto :error
-cd %BUILD_DIR%\release || goto :error
-cmake ../.. || goto :error
+mkdir %BUILD_DIR%\Release\x64 || goto :error
+cd %BUILD_DIR%\Release\x64 || goto :error
+cmake ..\..\.. -A x64 || goto :error
 cmake --build . --config Release || goto :error
 ctest --verbose || goto :error
-cd ..\.. || goto :error
+cd ..\..\.. || goto :error

 goto :EOF

--- a/scripts/build_release_x86.bat
+++ b/scripts/build_release_x86.bat
@@ -0,0 +1,14 @@
+@echo off
+set BUILD_DIR=%~dp0%\..\build
+mkdir %BUILD_DIR%\Release\x86 || goto :error
+cd %BUILD_DIR%\Release\x86 || goto :error
+cmake ..\..\.. -A Win32 || goto :error
+cmake --build . --config Release || goto :error
+ctest --verbose || goto :error
+cd ..\..\.. || goto :error
+
+goto :EOF
+
+:error
+echo Failed with error #%errorlevel%.
+exit /b %errorlevel%
--- a/scripts/untest_all_clang.sh
+++ b/scripts/untest_all_clang.sh
@@ -1,20 +0,0 @@
-#!/bin/bash
-set -e
-SCRIPT_DIR=`dirname "$BASH_SOURCE"`
-
-$SCRIPT_DIR/build_clear.sh
-CC=clang-6.0 CXX=clang++-6.0 $SCRIPT_DIR/build_all.sh
-
-$SCRIPT_DIR/build_clear.sh
-CC=clang-5.0 CXX=clang++-5.0 $SCRIPT_DIR/build_all.sh
-
-$SCRIPT_DIR/build_clear.sh
-CC=clang-4.0 CXX=clang++-4.0 $SCRIPT_DIR/build_all.sh
-
-$SCRIPT_DIR/build_clear.sh
-CC=clang-3.9 CXX=clang++-3.9 $SCRIPT_DIR/build_all.sh
-
-$SCRIPT_DIR/build_clear.sh
-CC=clang-3.8 CXX=clang++-3.8 $SCRIPT_DIR/build_all.sh
-
-$SCRIPT_DIR/build_clear.sh
--- a/scripts/untest_all_gcc.sh
+++ b/scripts/untest_all_gcc.sh
@@ -1,20 +0,0 @@
-#!/bin/bash
-set -e
-SCRIPT_DIR=`dirname "$BASH_SOURCE"`
-
-$SCRIPT_DIR/build_clear.sh
-CC=gcc-8 CXX=g++-8 $SCRIPT_DIR/build_all.sh
-
-$SCRIPT_DIR/build_clear.sh
-CC=gcc-7 CXX=g++-7 $SCRIPT_DIR/build_all.sh
-
-$SCRIPT_DIR/build_clear.sh
-CC=gcc-6 CXX=g++-6 $SCRIPT_DIR/build_all.sh
-
-$SCRIPT_DIR/build_clear.sh
-CC=gcc-5 CXX=g++-5 $SCRIPT_DIR/build_all.sh
-
-$SCRIPT_DIR/build_clear.sh
-CC=gcc-4.9 CXX=g++-4.9 $SCRIPT_DIR/build_all.sh
-
-$SCRIPT_DIR/build_clear.sh
--- a/scripts/update_modules.sh
+++ b/scripts/update_modules.sh
@@ -14,9 +14,6 @@ mkdir -p $UNTESTS_DIR
 mkdir -p $HEADERS_RDPARTY_DIR
 mkdir -p $SOURCES_RDPARTY_DIR

-git submodule update --init --recursive
-git submodule update --remote
-
 mkdir -p $UNTESTS_DIR/catch
 cp -fv $MODULES_DIR/catch2/single_include/catch2/catch.hpp $UNTESTS_DIR/catch/catch.hpp

@@ -31,6 +28,66 @@ cp -fv $MODULES_DIR/imgui/imstb_rectpack.h $SOURCES_RDPARTY_DIR/imgui/imstb_rect
 cp -fv $MODULES_DIR/imgui/imstb_textedit.h $SOURCES_RDPARTY_DIR/imgui/imstb_textedit.h
 cp -fv $MODULES_DIR/imgui/imstb_truetype.h $SOURCES_RDPARTY_DIR/imgui/imstb_truetype.h

+mkdir -p $HEADERS_RDPARTY_DIR/lua
+cp -fv $MODULES_DIR/lua/lapi.c $HEADERS_RDPARTY_DIR/lua/lapi.c
+cp -fv $MODULES_DIR/lua/lapi.h $HEADERS_RDPARTY_DIR/lua/lapi.h
+cp -fv $MODULES_DIR/lua/lauxlib.c $HEADERS_RDPARTY_DIR/lua/lauxlib.c
+cp -fv $MODULES_DIR/lua/lauxlib.h $HEADERS_RDPARTY_DIR/lua/lauxlib.h
+cp -fv $MODULES_DIR/lua/lbaselib.c $HEADERS_RDPARTY_DIR/lua/lbaselib.c
+cp -fv $MODULES_DIR/lua/lbitlib.c $HEADERS_RDPARTY_DIR/lua/lbitlib.c
+cp -fv $MODULES_DIR/lua/lcode.c $HEADERS_RDPARTY_DIR/lua/lcode.c
+cp -fv $MODULES_DIR/lua/lcode.h $HEADERS_RDPARTY_DIR/lua/lcode.h
+cp -fv $MODULES_DIR/lua/lcorolib.c $HEADERS_RDPARTY_DIR/lua/lcorolib.c
+cp -fv $MODULES_DIR/lua/lctype.c $HEADERS_RDPARTY_DIR/lua/lctype.c
+cp -fv $MODULES_DIR/lua/lctype.h $HEADERS_RDPARTY_DIR/lua/lctype.h
+cp -fv $MODULES_DIR/lua/ldblib.c $HEADERS_RDPARTY_DIR/lua/ldblib.c
+cp -fv $MODULES_DIR/lua/ldebug.c $HEADERS_RDPARTY_DIR/lua/ldebug.c
+cp -fv $MODULES_DIR/lua/ldebug.h $HEADERS_RDPARTY_DIR/lua/ldebug.h
+cp -fv $MODULES_DIR/lua/ldo.c $HEADERS_RDPARTY_DIR/lua/ldo.c
+cp -fv $MODULES_DIR/lua/ldo.h $HEADERS_RDPARTY_DIR/lua/ldo.h
+cp -fv $MODULES_DIR/lua/ldump.c $HEADERS_RDPARTY_DIR/lua/ldump.c
+cp -fv $MODULES_DIR/lua/lfunc.c $HEADERS_RDPARTY_DIR/lua/lfunc.c
+cp -fv $MODULES_DIR/lua/lfunc.h $HEADERS_RDPARTY_DIR/lua/lfunc.h
+cp -fv $MODULES_DIR/lua/lgc.c $HEADERS_RDPARTY_DIR/lua/lgc.c
+cp -fv $MODULES_DIR/lua/lgc.h $HEADERS_RDPARTY_DIR/lua/lgc.h
+cp -fv $MODULES_DIR/lua/linit.c $HEADERS_RDPARTY_DIR/lua/linit.c
+cp -fv $MODULES_DIR/lua/liolib.c $HEADERS_RDPARTY_DIR/lua/liolib.c
+cp -fv $MODULES_DIR/lua/llex.c $HEADERS_RDPARTY_DIR/lua/llex.c
+cp -fv $MODULES_DIR/lua/llex.h $HEADERS_RDPARTY_DIR/lua/llex.h
+cp -fv $MODULES_DIR/lua/llimits.h $HEADERS_RDPARTY_DIR/lua/llimits.h
+cp -fv $MODULES_DIR/lua/lmathlib.c $HEADERS_RDPARTY_DIR/lua/lmathlib.c
+cp -fv $MODULES_DIR/lua/lmem.c $HEADERS_RDPARTY_DIR/lua/lmem.c
+cp -fv $MODULES_DIR/lua/lmem.h $HEADERS_RDPARTY_DIR/lua/lmem.h
+cp -fv $MODULES_DIR/lua/loadlib.c $HEADERS_RDPARTY_DIR/lua/loadlib.c
+cp -fv $MODULES_DIR/lua/lobject.c $HEADERS_RDPARTY_DIR/lua/lobject.c
+cp -fv $MODULES_DIR/lua/lobject.h $HEADERS_RDPARTY_DIR/lua/lobject.h
+cp -fv $MODULES_DIR/lua/lopcodes.c $HEADERS_RDPARTY_DIR/lua/lopcodes.c
+cp -fv $MODULES_DIR/lua/lopcodes.h $HEADERS_RDPARTY_DIR/lua/lopcodes.h
+cp -fv $MODULES_DIR/lua/loslib.c $HEADERS_RDPARTY_DIR/lua/loslib.c
+cp -fv $MODULES_DIR/lua/lparser.c $HEADERS_RDPARTY_DIR/lua/lparser.c
+cp -fv $MODULES_DIR/lua/lparser.h $HEADERS_RDPARTY_DIR/lua/lparser.h
+cp -fv $MODULES_DIR/lua/lprefix.h $HEADERS_RDPARTY_DIR/lua/lprefix.h
+cp -fv $MODULES_DIR/lua/lstate.c $HEADERS_RDPARTY_DIR/lua/lstate.c
+cp -fv $MODULES_DIR/lua/lstate.h $HEADERS_RDPARTY_DIR/lua/lstate.h
+cp -fv $MODULES_DIR/lua/lstring.c $HEADERS_RDPARTY_DIR/lua/lstring.c
+cp -fv $MODULES_DIR/lua/lstring.h $HEADERS_RDPARTY_DIR/lua/lstring.h
+cp -fv $MODULES_DIR/lua/lstrlib.c $HEADERS_RDPARTY_DIR/lua/lstrlib.c
+cp -fv $MODULES_DIR/lua/ltable.c $HEADERS_RDPARTY_DIR/lua/ltable.c
+cp -fv $MODULES_DIR/lua/ltable.h $HEADERS_RDPARTY_DIR/lua/ltable.h
+cp -fv $MODULES_DIR/lua/ltablib.c $HEADERS_RDPARTY_DIR/lua/ltablib.c
+cp -fv $MODULES_DIR/lua/ltm.c $HEADERS_RDPARTY_DIR/lua/ltm.c
+cp -fv $MODULES_DIR/lua/ltm.h $HEADERS_RDPARTY_DIR/lua/ltm.h
+cp -fv $MODULES_DIR/lua/lua.h $HEADERS_RDPARTY_DIR/lua/lua.h
+cp -fv $MODULES_DIR/lua/luaconf.h $HEADERS_RDPARTY_DIR/lua/luaconf.h
+cp -fv $MODULES_DIR/lua/lualib.h $HEADERS_RDPARTY_DIR/lua/lualib.h
+cp -fv $MODULES_DIR/lua/lundump.c $HEADERS_RDPARTY_DIR/lua/lundump.c
+cp -fv $MODULES_DIR/lua/lundump.h $HEADERS_RDPARTY_DIR/lua/lundump.h
+cp -fv $MODULES_DIR/lua/lutf8lib.c $HEADERS_RDPARTY_DIR/lua/lutf8lib.c
+cp -fv $MODULES_DIR/lua/lvm.c $HEADERS_RDPARTY_DIR/lua/lvm.c
+cp -fv $MODULES_DIR/lua/lvm.h $HEADERS_RDPARTY_DIR/lua/lvm.h
+cp -fv $MODULES_DIR/lua/lzio.c $HEADERS_RDPARTY_DIR/lua/lzio.c
+cp -fv $MODULES_DIR/lua/lzio.h $HEADERS_RDPARTY_DIR/lua/lzio.h
+
 mkdir -p $SOURCES_RDPARTY_DIR/miniz
 cp -fv $MODULES_DIR/miniz/miniz.c $SOURCES_RDPARTY_DIR/miniz/miniz.c
 cp -fv $MODULES_DIR/miniz/miniz.h $SOURCES_RDPARTY_DIR/miniz/miniz.h
@@ -48,6 +105,9 @@ cp -rfv $MODULES_DIR/pugixml/src/. $HEADERS_RDPARTY_DIR/pugixml/
 mkdir -p $HEADERS_RDPARTY_DIR/rapidjson
 cp -rfv $MODULES_DIR/rapidjson/include/rapidjson/. $HEADERS_RDPARTY_DIR/rapidjson

+mkdir -p $HEADERS_RDPARTY_DIR/sol
+cp -rfv $MODULES_DIR/sol2/include/sol/. $HEADERS_RDPARTY_DIR/sol
+
 mkdir -p $SOURCES_RDPARTY_DIR/stb
 cp -fv $MODULES_DIR/stb/stb_image.h $SOURCES_RDPARTY_DIR/stb/stb_image.h
 cp -fv $MODULES_DIR/stb/stb_image_resize.h $SOURCES_RDPARTY_DIR/stb/stb_image_resize.h
--- a/scripts/upload_coverage.sh
+++ b/scripts/upload_coverage.sh
@@ -5,7 +5,7 @@ BUILD_DIR=`dirname "$BASH_SOURCE"`/../build
 mkdir -p $BUILD_DIR/coverage
 cd $BUILD_DIR/coverage
 cmake -DCMAKE_BUILD_TYPE=Debug -DE2D_BUILD_WITH_COVERAGE=ON ../..
-cmake --build . -- -j8
+cmake --build .

 lcov -d . -z
 ctest --verbose