Add debug option to msvcbuild.bat and improve error handling.

diff --git a/src/msvcbuild.bat b/src/msvcbuild.bat
index cd182362aca047d68443677c9cb54beeed045e24..c7e5df667bc6b58d1e6161f209af1bc0f9f15683 100644 (file)
--- a/src/msvcbuild.bat
+++ b/src/msvcbuild.bat
@@ -24,45 +24,77 @@
 \r
 if not exist buildvm_x86.h^\r
   %DASM% -LN -o buildvm_x86.h buildvm_x86.dasc\r
+@if errorlevel 1 goto :BAD\r
 if not exist buildvm_x64win.h^\r
   %DASM% -LN -D X64 -D X64WIN -o buildvm_x64win.h buildvm_x86.dasc\r
+@if errorlevel 1 goto :BAD\r
 \r
 %LJCOMPILE% /I "." /I %DASMDIR% buildvm*.c\r
+@if errorlevel 1 goto :BAD\r
 %LJLINK% /out:buildvm.exe buildvm*.obj\r
+@if errorlevel 1 goto :BAD\r
 if exist buildvm.exe.manifest^\r
   %LJMT% -manifest buildvm.exe.manifest -outputresource:buildvm.exe\r
 \r
 buildvm -m peobj -o lj_vm.obj\r
+@if errorlevel 1 goto :BAD\r
 buildvm -m bcdef -o lj_bcdef.h %ALL_LIB%\r
+@if errorlevel 1 goto :BAD\r
 buildvm -m ffdef -o lj_ffdef.h %ALL_LIB%\r
+@if errorlevel 1 goto :BAD\r
 buildvm -m libdef -o lj_libdef.h %ALL_LIB%\r
+@if errorlevel 1 goto :BAD\r
 buildvm -m recdef -o lj_recdef.h %ALL_LIB%\r
+@if errorlevel 1 goto :BAD\r
 buildvm -m vmdef -o ..\lib\vmdef.lua %ALL_LIB%\r
+@if errorlevel 1 goto :BAD\r
 buildvm -m folddef -o lj_folddef.h lj_opt_fold.c\r
+@if errorlevel 1 goto :BAD\r
 \r
+@if "%1" neq "debug" goto :NODEBUG\r
+@shift\r
+@set LJCOMPILE=%LJCOMPILE% /Zi /Fdluajit.pdb\r
+@set LJLINK=%LJLINK% /debug /PDB:luajit.pdb\r
+:NODEBUG\r
 @if "%1"=="amalg" goto :AMALGDLL\r
 @if "%1"=="static" goto :STATIC\r
 %LJCOMPILE% /DLUA_BUILD_AS_DLL lj_*.c lib_*.c\r
+@if errorlevel 1 goto :BAD\r
 %LJLINK% /DLL /out:lua51.dll lj_*.obj lib_*.obj\r
+@if errorlevel 1 goto :BAD\r
 @goto :MTDLL\r
 :STATIC\r
 %LJCOMPILE% /DLUA_BUILD_AS_DLL lj_*.c lib_*.c\r
+@if errorlevel 1 goto :BAD\r
 %LJLIB% /OUT:lua51.lib lj_*.obj lib_*.obj\r
+@if errorlevel 1 goto :BAD\r
 @goto :MTDLL\r
 :AMALGDLL\r
 %LJCOMPILE% /DLUA_BUILD_AS_DLL ljamalg.c\r
+@if errorlevel 1 goto :BAD\r
 %LJLINK% /DLL /out:lua51.dll ljamalg.obj lj_vm.obj\r
+@if errorlevel 1 goto :BAD\r
 :MTDLL\r
 if exist lua51.dll.manifest^\r
   %LJMT% -manifest lua51.dll.manifest -outputresource:lua51.dll;2\r
 \r
 %LJCOMPILE% luajit.c\r
+@if errorlevel 1 goto :BAD\r
 %LJLINK% /out:luajit.exe luajit.obj lua51.lib\r
+@if errorlevel 1 goto :BAD\r
 if exist luajit.exe.manifest^\r
   %LJMT% -manifest luajit.exe.manifest -outputresource:luajit.exe\r
 \r
-del *.obj *.manifest buildvm.exe\r
+@del *.obj *.manifest buildvm.exe\r
+@echo.\r
+@echo === Successfully built LuaJIT ===\r
 \r
+@goto :END\r
+:BAD\r
+@echo.\r
+@echo *******************************************************\r
+@echo *** Build FAILED -- Please check the error messages ***\r
+@echo *******************************************************\a\r
 @goto :END\r
 :FAIL\r
 @echo You must open a "Visual Studio .NET Command Prompt" to run this script\r