From abd1ca4fef90864530ea4203aaaaaa17f7cdf5f7 Mon Sep 17 00:00:00 2001 From: madmaxoft Date: Sat, 21 Dec 2013 19:30:16 +0100 Subject: [PATCH] Bindings regen script updated. The Bindings.cpp / .h files are no longer stored in the git repo. --- src/Bindings/AllToLua.bat | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 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,17 +1,8 @@ :: AllToLua.bat - :: This scripts updates the automatically-generates Lua bindings in Bindings.cpp / Bindings.h - - - - - -:: 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 +:: 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) @@ -23,5 +14,9 @@ git add -u Bindings.h - +: Wait for keypress, if no param given: if %ALLTOLUA_WAIT%N == N pause + + + +