flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

AllToLua now resets the git status for the files.

Browse Source 
This should auto-fix merge conflicts when they occur on the Bindings.cpp / Bindings.h files.
http://forum.mc-server.org/showthread.php?tid=1200&pid=9315#pid9315
This commit is contained in:
madmaxoft 2013-08-02 09:25:12 +02:00
parent edb299db09
commit 13c5a7864e
1 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
source/AllToLua.bat
View File

@ -1,3 +1,25 @@
:: 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 -- Bindings.cpp
git checkout -- Bindings.h
:: Regenerate the files:
"tolua++.exe" -L virtual_method_hooks.lua -o Bindings.cpp -H Bindings.h AllToLua.pkg "tolua++.exe" -L virtual_method_hooks.lua -o Bindings.cpp -H Bindings.h AllToLua.pkg
if %ALLTOLUA_WAIT%N == N pause if %ALLTOLUA_WAIT%N == N pause