diff options
| author | madmaxoft <github@xoft.cz> | 2013-12-21 19:30:16 +0100 |
|---|---|---|
| committer | madmaxoft <github@xoft.cz> | 2013-12-21 19:30:16 +0100 |
| commit | abd1ca4fef90864530ea4203aaaaaa17f7cdf5f7 (patch) | |
| tree | 604c23539e1989f5a78d9951e7d8af87cc0ef7c5 /src | |
| parent | Further updates for the win nightbuild script. (diff) | |
| download | cuberite-abd1ca4fef90864530ea4203aaaaaa17f7cdf5f7.tar cuberite-abd1ca4fef90864530ea4203aaaaaa17f7cdf5f7.tar.gz cuberite-abd1ca4fef90864530ea4203aaaaaa17f7cdf5f7.tar.bz2 cuberite-abd1ca4fef90864530ea4203aaaaaa17f7cdf5f7.tar.lz cuberite-abd1ca4fef90864530ea4203aaaaaa17f7cdf5f7.tar.xz cuberite-abd1ca4fef90864530ea4203aaaaaa17f7cdf5f7.tar.zst cuberite-abd1ca4fef90864530ea4203aaaaaa17f7cdf5f7.zip | |
Diffstat (limited to 'src')
| -rw-r--r-- | src/Bindings/AllToLua.bat | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/src/Bindings/AllToLua.bat b/src/Bindings/AllToLua.bat index f7867fadb..b2a192880 100644 --- a/src/Bindings/AllToLua.bat +++ b/src/Bindings/AllToLua.bat @@ -1,27 +1,22 @@ :: AllToLua.bat - :: This scripts updates the automatically-generates Lua bindings in Bindings.cpp / Bindings.h +:: When called without any parameters, it will pause for a keypress at the end +:: Call with any parameter to disable the wait (for buildserver use) -:: If there was a Git conflict, resolve it by resetting to HEAD; we're regenerating the files from scratch anyway -git checkout --ours Bindings.cpp -git add -u Bindings.cpp -git checkout --ours Bindings.h -git add -u Bindings.h - +:: Regenerate the files: +"tolua++.exe" -L virtual_method_hooks.lua -o Bindings.cpp -H Bindings.h AllToLua.pkg -:: Regenerate the files: -"tolua++.exe" -L virtual_method_hooks.lua -o Bindings.cpp -H Bindings.h AllToLua.pkg - +: Wait for keypress, if no param given: +if %ALLTOLUA_WAIT%N == N pause -if %ALLTOLUA_WAIT%N == N pause |