From 9987546c58c1ccedda4a6999404e40b935109c3c Mon Sep 17 00:00:00 2001
From: Peter Olsson <peter@olssononline.se>
Date: Tue, 18 Mar 2014 07:38:44 +0100
Subject: [PATCH] mod_v8: More improvements for VS Express.

---
 libs/win32/v8/build-v8.bat | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/libs/win32/v8/build-v8.bat b/libs/win32/v8/build-v8.bat
index 1f33940b23..7dfa758946 100644
--- a/libs/win32/v8/build-v8.bat
+++ b/libs/win32/v8/build-v8.bat
@@ -38,13 +38,13 @@ IF "%1" == "x64" (
 IF "%1" == "x64" (
 	IF NOT "%SKIP_V8_SNAPSHOT%" == "" ECHO Targeting x64 platform on a x86 system, disabling V8 snapshout feature to make this work [%SKIP_V8_SNAPSHOT%]
 	IF NOT "%COPY_FILES_ONLY%" == "1" .\third_party\python_26\python.exe build\gyp_v8 -Dtarget_arch=x64 -Dcomponent=shared_library %SKIP_V8_SNAPSHOT% %VS_VERSION%
-	IF NOT ERRORLEVEL 0 GOTO Fail
+	IF ERRORLEVEL 1 GOTO Fail
 	SET LIB_DEST_DIR=..\..\x64\%2\
 )
 
 IF "%1" == "x86" (
 	IF NOT "%COPY_FILES_ONLY%" == "1" .\third_party\python_26\python.exe build\gyp_v8 -Dcomponent=shared_library %VS_VERSION%
-	IF NOT ERRORLEVEL 0 GOTO Fail
+	IF ERRORLEVEL 1 GOTO Fail
 	SET LIB_DEST_DIR=..\..\Win32\%2\
 )
 
@@ -54,11 +54,11 @@ IF "%COPY_FILES_ONLY%" == "1" GOTO CopyFiles
 
 REM Clean build before we continue
 REM First try to clean using the solution path (works for most VS versions)
-msbuild "tools\gyp\v8.sln" /t:"_tools_\_gyp_\v8:Clean" /p:Configuration=%2
-IF ERRORLEVEL 0 GOTO CleanDone
+msbuild "tools\gyp\v8.sln" /t:"_tools_\_gyp_\v8:Clean" /p:Configuration=%2 /clp:WarningsOnly
+IF NOT ERRORLEVEL 1 GOTO CleanDone
 REM If clean using solution path didn't work, try to build without the path (works for some VS versions...)
 msbuild "tools\gyp\v8.sln" /t:v8:Clean /p:Configuration=%2
-IF NOT ERRORLEVEL 0 GOTO Fail
+IF ERRORLEVEL 1 GOTO Fail
 :CleanDone
 
 REM Just to make sure that everything is cleaned up
@@ -66,26 +66,26 @@ rmdir /S /Q .\build\%2
 
 REM Build the V8 library
 REM First try to build using the solution path (works for most VS versions)
-msbuild "tools\gyp\v8.sln" /t:"_tools_\_gyp_\v8:Rebuild" /p:Configuration=%2
-IF ERRORLEVEL 0 GOTO CopyFiles
+msbuild "tools\gyp\v8.sln" /t:"_tools_\_gyp_\v8:Rebuild" /p:Configuration=%2 /clp:WarningsOnly
+IF NOT ERRORLEVEL 1 GOTO CopyFiles
 REM If build using solution path didn't work, try to build without the path (works for some VS versions...)
 msbuild "tools\gyp\v8.sln" /t:v8:Rebuild /p:Configuration=%2
-IF NOT ERRORLEVEL 0 GOTO Fail
+IF ERRORLEVEL 1 GOTO Fail
 
 :CopyFiles
 
 xcopy /C /F /R /Y .\build\%2\icui18n.dll %LIB_DEST_DIR%
-IF NOT ERRORLEVEL 0 GOTO Fail
+IF ERRORLEVEL 1 GOTO Fail
 
 xcopy /C /F /R /Y .\build\%2\icuuc.dll %LIB_DEST_DIR%
-IF NOT ERRORLEVEL 0 GOTO Fail
+IF ERRORLEVEL 1 GOTO Fail
 
 xcopy /C /F /R /Y .\build\%2\v8.dll %LIB_DEST_DIR%
-IF NOT ERRORLEVEL 0 GOTO Fail
+IF ERRORLEVEL 1 GOTO Fail
 
 ECHO %1-%2> last_build
 
-exit
+exit /b 0
 
 :Fail
 REM Delete the last_build info if this build failed!