jaby
/
jabyengine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Merge with new build technique

This commit is contained in:
jaby 2023-10-09 22:38:28 +02:00
parent b279dd8bdb 58db6351f3
commit 9e235a310c
12 changed files with 392 additions and 389 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
build_all.bat
View File

@ -1,19 +0,0 @@
@echo off
rem build_all [clean]
set build_type=build
IF NOT "%~1" == "" (
set build_type=%~1
)
mkdir bin\
cd src\Tools\
call build_all.bat update
call build_all.bat %build_type%
cd ..\Library\
call run_make.bat %build_type% release
cd ..\..\
PAUSE

7
examples/PoolBox/PoolBox.code-workspace
View File

@ -11,7 +11,12 @@
{
"label": "build",
"type": "shell",
"command": "wsl make ${input:project}_${input:target} BUILD_PROFILE=${input:build profile} PSX_LICENSE_PATH=$(wslpath ${env:PSX_LICENSE_PATH}) JABY_ENGINE_DIR=$(wslpath ${env:JABY_ENGINE_PATH})",
"windows": { // v re-export for WSL v re-export for WSL
"command": "wsl make ${input:project}_${input:target} BUILD_PROFILE=${input:build profile} PSX_LICENSE_PATH=$(wslpath ${env:PSX_LICENSE_PATH}) JABY_ENGINE_DIR=$(wslpath ${env:JABY_ENGINE_PATH})",
},
"linux": {
"command": "make ${input:project}_${input:target} BUILD_PROFILE=${input:build profile}",
},
"group": {
"kind": "build",
"isDefault": true

22
src/Library/Library.code-workspace
View File

@ -19,18 +19,14 @@
{
"label": "make",
"type": "shell",
"command": "./run_make.bat ${input:target} ${input:build cfg}",
"windows": {
"command": "wsl make ${input:target} BUILD_PROFILE=${input:build cfg}",
},
"linux": {
"command": "make ${input:target} BUILD_PROFILE=${input:build cfg}",
},
"group": "build"
},
{
"label": "Build Libary and Tools",
"type": "shell",
"command": "./build_all.bat ${input:target}",
"group": "build",
"options": {
"cwd": "../.."
}
},
}
],
"inputs": [
{
@ -43,8 +39,8 @@
{
"id": "target",
"type": "pickString",
"options": ["build", "clean", "rebuild"],
"default": "build",
"options": ["all", "clean", "rebuild"],
"default": "all",
"description": "build target",
}
]

11
src/Library/run_make.bat
View File

@ -1,11 +0,0 @@
@echo off
rem run_make.bat build|clean|rebuild debug|release
IF %1 == build (
set make_target=all
) else (
set make_target=%1
)
@echo make %make_target% BUILD_PROFILE=%2
wsl make %make_target% BUILD_PROFILE=%2

4
src/Tools/.config_build_all/linux.bat
View File

@ -1,4 +0,0 @@
set bin_linux_projects=%bin_projects% %bin_linux_projects%
set clean_projects_linux=%clean_projects% %clean_projects_linux%
set bin_projects=
set clean_projects=

4
src/Tools/.config_build_all/recommended.bat
View File

@ -1,4 +0,0 @@
set bin_projects=psxcdgen psxcdgen_ex psxcdread psxreadmap wslpath
set bin_linux_projects=cpp_out psxcdgen_ex jaby_engine_fconv mkoverlay wslpath
set clean_projects=cdtypes
set clean_projects_linux=tool_helper

4
src/Tools/.config_build_all/windows.bat
View File

@ -1,4 +0,0 @@
set bin_projects=%bin_projects% %bin_linux_projects%
set clean_projects=%clean_projects% %clean_projects_linux%
set bin_linux_projects=
set clean_projects_linux=

24
src/Tools/Tools.code-workspace
View File

@ -4,22 +4,40 @@
"path": "."
}
],
"settings": {},
"settings": {
},
"tasks": {
"version": "2.0.0",
"tasks": [
{
"label": "all",
"type": "shell",
"command": "./build_all.bat ${input:cargo cmd}",
"windows": {
"command": "./build_all.bat ${input:cargo cmd}"
},
"linux": {
"command": "./build_all.sh ${input:cargo cmd}"
},
"group": {
"kind": "build"
},
"options": {
"env": {
"win_tools": "psxcdgen_ex psxcdread psxreadmap wslpath",
"linux_tools": "cpp_out psxcdgen_ex jaby_engine_fconv mkoverlay",
"clean_tools": "cdtypes tool_helper"
}
}
},
{
"label": "cargo",
"type": "shell",
"command": "./run_cargo ${input:project} ${input:cargo cmd} ${input:build cfg} ${input:cargo target}",
"windows": {
"command": "./run_cargo.bat ${input:project} ${input:cargo cmd} ${input:build cfg} ${input:cargo target}",
},
"linux": {
"command": "./run_cargo.sh ${input:project} ${input:cargo cmd} ${input:build cfg} ${input:cargo target}",
},
"group": {
"kind": "build",
},

37
src/Tools/build_all.bat
View File

@ -1,39 +1,20 @@
@echo off
setlocal EnableDelayedExpansion
rem build_all [clean] [recommended|windows|linux]
rem build_all {build|check|clean}
call .config_build_all/recommended.bat
IF NOT "%~2" == "" (
set config_path=.config_build_all/%~2.bat
IF exist "!config_path!" (
call !config_path!
) ELSE (
@echo "Configuration !config_path! not found"
exit -1
if %1 == clean (
for %%a in (%clean_tools%) do (
call .\run_cargo %%a %1 release windows
cd %cur_dir%
)
)
set projects=%bin_projects%
set linux_projects=%bin_linux_projects%
set build_type=build
set cur_dir=%cd%
IF NOT "%~1" == "" (
IF "%~1" == "clean" (
set build_type=clean
set projects=%projects% %clean_projects%
set linux_projects=%linux_projects% %clean_projects_linux%
) ELSE (
set build_type=%~1
)
)
for %%a in (%projects%) do (
call .\run_cargo %%a %build_type% release windows
for %%a in (%win_tools%) do (
call .\run_cargo %%a %1 release windows
cd %cur_dir%
)
for %%a in (%linux_projects%) do (
call .\run_cargo %%a %build_type% release linux
for %%a in (%linux_tools%) do (
call .\run_cargo %%a %1 release linux
cd %cur_dir%
)

12
src/Tools/build_all.sh Normal file
View File

@ -0,0 +1,12 @@
#!/bin/bash
# build_all {build|check|clean}
if [ $1 = clean ]; then
all_project="$win_tools $linux_tools $clean_tools"
else
all_project="$win_tools $linux_tools"
fi
for prj in ${all_project[@]}; do
./run_cargo.sh $prj $1 release
done

17
src/Tools/run_cargo.bat
View File

@ -1,30 +1,25 @@
@echo off
setlocal EnableDelayedExpansion
rem run_cargo.bat project {build|check|clean|test} {debug|release} [linux|windows]
rem run_cargo.bat project {build|check|clean} {debug|release} [linux|windows]
set org_dir=%cd%
set bin_ext=.exe
set target=x86_64-pc-windows-msvc
set wsl=
IF %4 == linux (
set bin_ext=
set target=x86_64-unknown-linux-gnu
set wsl=wsl $HOME/.cargo/bin/
wsl --shell-type login ./run_cargo.sh %1 %2 %3
exit /B %ERRORLEVEL%
)
IF defined CARGO_RUN_ARGS set run_args=-- %CARGO_RUN_ARGS%
IF %2 == build set run_build=1
IF %2 == test set run_build=1
cd %1
IF defined run_build (
IF %2 == build (
echo cargo build %1 --%3
%wsl%cargo build --%3 --target=%target%
IF %2 == build IF %ERRORLEVEL% == 0 (
xcopy target\%target%\%3\%1%bin_ext% %org_dir%\..\..\bin /y
IF %ERRORLEVEL% == 0 (
xcopy target\%target%\%3\%1.exe %org_dir%\..\..\bin /y
)
exit /B %ERRORLEVEL%

38
src/Tools/run_cargo.sh Normal file
View File

@ -0,0 +1,38 @@
#!/bin/sh
# run_cargo.sh project {build|check|clean|test} {debug|release}
target=x86_64-unknown-linux-gnu
if [ -n "${CARGO_RUN_ARGS}" ]; then
run_args=-- ${CARGO_RUN_ARGS}
fi
cd $1
if [ $2 = build ]; then
echo "cargo build $1 --$3"
$HOME/.cargo/bin/cargo build --$3 --target=$target
if [ $? = 0 ]; then
cp target/$target/$3/$1 ../../../bin
echo "1 File(s) copied"
fi
exit $?
elif [ $2 = run ]; then
echo "cargo run $1 --$3"
$HOME/.cargo/bin/cargo run --$3 --target=$target
exit $?
elif [ $2 = check ]; then
echo "cargo check $1 --$3"
$HOME/.cargo/bin/cargo check --$3 --target=$target $run_args
exit $?
elif [ $2 = clean ]; then
echo "cargo clean $1"
$HOME/.cargo/bin/cargo clean
exit $?
else
echo "Unkown cargo command $2 for project $1"
fi