[mapguide-commits] r9353 - trunk/MgDev

[svn_mapguide at osgeo.org]

Author: jng
Date: 2018-03-03 21:25:50 -0800 (Sat, 03 Mar 2018)
New Revision: 9353

Modified:
   trunk/MgDev/build.bat
Log:
build.bat: Test for "errorlevel not equal to 0" instead of "errorlevel equal to 1" and lay more of these errorlevel checks throughout

Modified: trunk/MgDev/build.bat
===================================================================
--- trunk/MgDev/build.bat	2018-03-03 17:59:05 UTC (rev 9352)
+++ trunk/MgDev/build.bat	2018-03-04 05:25:50 UTC (rev 9353)
@@ -144,13 +144,16 @@
 :clean_oem
 echo [clean]: Clean Oem
 %MSBUILD_CLEAN% %MG_OEM%\Oem.sln
+if not "%errorlevel%"=="0" goto error
 echo [clean]: Clean Oem - CS-Map
 %MSBUILD_CLEAN% %MG_OEM%\CSMap\VC110\OpenSource.sln
+if not "%errorlevel%"=="0" goto error
 if not "%TYPECOMPONENT%"=="all" goto quit
 
 :clean_server
 echo [clean]: Clean Server
 %MSBUILD_CLEAN% %MG_SERVER%\Server.sln
+if not "%errorlevel%"=="0" goto error
 if not "%TYPECOMPONENT%"=="all" goto quit
 
 :clean_web
@@ -185,11 +188,11 @@
 :build_oem
 echo [build]: Building Oem
 %MSBUILD% %MG_OEM%\Oem.sln
-if "%errorlevel%"=="1" goto error
+if not "%errorlevel%"=="0" goto error
 rem CsMap is not in Oem.sln, so we need to build that separately
 echo [build]: Building Oem - CSMap
 %MSBUILD% %MG_OEM%\CsMap\VC140\OpenSource.sln
-if "%errorlevel%"=="1" goto error
+if not "%errorlevel%"=="0" goto error
 if "%TYPECOMPONENT%"=="oem" 	goto quit
 if "%TYPECOMPONENT%"=="server" 	goto quit
 if "%TYPECOMPONENT%"=="web" 	goto quit
@@ -198,7 +201,7 @@
 :build_server
 echo [build]: Building Server
 %MSBUILD% %MG_SERVER%\Server.sln
-if "%errorlevel%"=="1" goto error
+if not "%errorlevel%"=="0" goto error
 if "%TYPECOMPONENT%"=="oem" 	goto quit
 if "%TYPECOMPONENT%"=="server" 	goto quit
 if "%TYPECOMPONENT%"=="web" 	goto quit
@@ -207,7 +210,7 @@
 :build_web
 echo [build]: Building Web Tier
 %MSBUILD% %MG_WEB_SRC%\WebTier.sln
-if "%errorlevel%"=="1" goto error
+if not "%errorlevel%"=="0" goto error
 if "%TYPECOMPONENT%"=="oem" 	 goto quit
 if "%TYPECOMPONENT%"=="server" 	 goto quit
 if "%TYPECOMPONENT%"=="web" 	 goto quit
@@ -318,12 +321,16 @@
 copy /Y "%MG_BUILD_SQLITE_PHP_API%" "%MG_OUTPUT_WEB%\Php\ext"
 echo [build]: Web Tier - Clean fusion
 call %ANT% clean -f "%MG_OEM%\fusion\build.xml"
+if not "%errorlevel%"=="0" goto error
 echo [build]: Web Tier - Build Fusion API docs
 call %ANT% docs -f "%MG_OEM%\fusion\build.xml"
+if not "%errorlevel%"=="0" goto error
 echo [install]: Web Tier - fusion
 call %ANT% deploy -Ddeploy.home="%MG_OUTPUT_WEB%\www\fusion" -f "%MG_OEM%\fusion\build.xml"
+if not "%errorlevel%"=="0" goto error
 echo [install]: Fusion - build pack
 call %ANT% selfbuild -Dselfbuild.home="%MG_OUTPUT%\fusion-selfbuild" -f "%MG_OEM%\fusion\build.xml"
+if not "%errorlevel%"=="0" goto error
 echo [install]: Web Tier - fusion templates
 %XCOPY% "%MG_OEM%\fusionMG" "%MG_OUTPUT_WEB%\www\fusion" /EXCLUDE:svn_excludes.txt+%CONFIGURATION%_excludes.txt
 echo [install]: Web Tier - Apache module
@@ -362,6 +369,7 @@
     echo [build]: Sheboygan Sample data set
     pushd %MG_DEV%\UnitTest\TestData\Samples\Sheboygan
     call build.bat
+    if not "%errorlevel%"=="0" goto error
     popd
 )
 copy /Y "%MG_DEV%\UnitTest\TestData\Samples\Sheboygan\Sheboygan.mgp" "%MG_OUTPUT%"