v4games
/
v4k-git-backup
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

improve depot tooling

main
Dominik Madarász 2023-10-09 07:50:16 +02:00
parent 4822df172e
commit 3eaef45040
2 changed files with 31 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
MAKE.bat
View File

@ -17,10 +17,12 @@ if "%1"=="help" (
echo %0 [lua] ; execute lua script with v4k echo %0 [lua] ; execute lua script with v4k
echo %0 [html5] ; build HTML5 demo echo %0 [html5] ; build HTML5 demo
echo %0 [web] ; run Python webserver in html5 dir echo %0 [web] ; run Python webserver in html5 dir
echo %0 [pull] ; pull changes from 'latest' upstream echo %0 [pull] ; pull changes from origin
echo %0 [push] ; prepare for commit, stage changes and commit them
echo %0 [dpush] ; push depot changes
echo %0 [depot] ; sync depot changes
echo %0 [git] ; prepare for commit echo %0 [git] ; prepare for commit
echo %0 [vps] ; upload the release to VPS echo %0 [vps] ; upload the release to VPS
echo %0 [push] ; prepare for commit, stage changes and commit them
echo %0 [tidy] ; clean up temp files echo %0 [tidy] ; clean up temp files
echo %0 [bind] ; generate lua bindings echo %0 [bind] ; generate lua bindings
echo %0 [checkmem] ; check untracked allocators in V4K echo %0 [checkmem] ; check untracked allocators in V4K
@ -149,9 +151,28 @@ rem move /y 3rd_*.? engine\split\
) )
if "%1"=="pull" ( if "%1"=="pull" (
git remote add fwk git@github.com:r-lyeh/FWK.git 2>NUL git pull
git fetch fwk exit /b
git merge -Xrename-threshold=50 --allow-unrelated-histories fwk/main )
if "%1"=="depot" (
git submodule update --remote --merge depot/
exit /b
)
if "%1"=="dpush" (
pushd depot
git add .
if "%2"=="auto" (
git commit -m "asset update"
) else (
git commit
)
if "%2"=="out" (
git push
)
popd
exit /b exit /b
) )
@ -159,16 +180,10 @@ if "%1"=="push" (
call make.bat tidy call make.bat tidy
git status git status
pushd depot call MAKE.bat dpush auto
git add .
git commit -m "asset update"
if "%2"=="out" (
git push
)
popd
git add . git add .
git commit git commit
if "%2"=="out" ( if not "%2"=="local" (
git push git push
) )
call make.bat vps call make.bat vps
@ -357,6 +372,8 @@ if "%1"=="tidy" (
del *.dll > nul 2> nul del *.dll > nul 2> nul
del 3rd_*.* > nul 2> nul del 3rd_*.* > nul 2> nul
del v4k_*.* > nul 2> nul del v4k_*.* > nul 2> nul
del v4k.html > nul 2> nul
del changelog.txt > nul 2> nul
rem del ??-*.* > nul 2> nul rem del ??-*.* > nul 2> nul
del temp_*.* > nul 2> nul del temp_*.* > nul 2> nul
rd /q /s .vs > nul 2> nul rd /q /s .vs > nul 2> nul

2
demos/html5/MAKE.bat
View File

@ -19,5 +19,5 @@ rem cook art
rem host webserver, compile and launch rem host webserver, compile and launch
rem start python -m http.server --bind 127.0.0.1 8000 rem start python -m http.server --bind 127.0.0.1 8000
call emcc %* -g ..\..\engine\v4k.c -I..\..\engine -o index.html -pthread -s FULL_ES3 -s USE_PTHREADS -s USE_GLFW=3 -s SINGLE_FILE=1 -s DISABLE_DEPRECATED_FIND_EVENT_TARGET_BEHAVIOR=0 -s PRECISE_F32=1 -s TOTAL_MEMORY=256mb -s ALLOW_MEMORY_GROWTH=1 -s ENVIRONMENT=worker,web --shell-file template.html -Wfatal-errors --preload-file .art[00].zip@index.zip -lidbfs.js call emcc %* -g ..\..\engine\v4k.c -I..\..\engine -o index.html -pthread -s FULL_ES3 -s USE_PTHREADS -s USE_GLFW=3 -s SINGLE_FILE=1 -s PRECISE_F32=1 -s TOTAL_MEMORY=256mb -s ALLOW_MEMORY_GROWTH=1 -s ENVIRONMENT=worker,web --shell-file template.html -Wfatal-errors --preload-file .art[00].zip@index.zip -lidbfs.js
rem emrun index.html rem emrun index.html