[mapguide-commits] r6723 - trunk/MgDev

[svn_mapguide at osgeo.org]

Author: jng
Date: 2012-05-31 09:37:17 -0700 (Thu, 31 May 2012)
New Revision: 6723

Modified:
   trunk/MgDev/build_desktop.bat
Log:
Break away from build if any msbuild fails

Modified: trunk/MgDev/build_desktop.bat
===================================================================
--- trunk/MgDev/build_desktop.bat	2012-05-31 16:32:37 UTC (rev 6722)
+++ trunk/MgDev/build_desktop.bat	2012-05-31 16:37:17 UTC (rev 6723)
@@ -16,11 +16,25 @@
 SET VS_SLN_SUFFIX=
 IF "%VC_COMPILER_VERSION%" == "10" SET VS_SLN_SUFFIX=_VS2010
 
+SET DESKTOP_PLATFORM_UNMANAGED=Win32
+SET DESKTOP_PLATFORM=%1
+IF "%DESKTOP_PLATFORM%" == "" SET DESKTOP_PLATFORM=x86
+IF "%DESKTOP_PLATFORM%" == "x64" SET DESKTOP_PLATFORM_UNMANAGED=x64
+
 pushd Desktop
-echo [build]: Desktop API
-%MSBUILD% MgDesktopApi%VS_SLN_SUFFIX%.sln
-echo [build]: .net components
-%MSBUILD% MgDesktopDotNet%VS_SLN_SUFFIX%.sln
+echo [build]: Desktop API (%DESKTOP_PLATFORM_UNMANAGED%)
+%MSBUILD% /p:Platform=%DESKTOP_PLATFORM_UNMANAGED% MgDesktopApi%VS_SLN_SUFFIX%.sln
+if "%errorlevel%"=="1" goto error
+echo [build]: .net components (%DESKTOP_PLATFORM%)
+%MSBUILD% /p:Platform=%DESKTOP_PLATFORM% MgDesktopDotNet%VS_SLN_SUFFIX%.sln
+if "%errorlevel%"=="1" goto error
 popd
 echo [install]: binaries
-%XCOPY% "Desktop\bin\%TYPEBUILD%" "%MG_OUTPUT_DESKTOP%" /EXCLUDE:svn_excludes.txt+%CONFIGURATION%_excludes.txt
\ No newline at end of file
+%XCOPY% "Desktop\bin\%TYPEBUILD%" "%MG_OUTPUT_DESKTOP%" /EXCLUDE:svn_excludes.txt+%CONFIGURATION%_excludes.txt
+goto quit
+
+:error
+echo [ERROR]: There was an error building the component
+exit /B 1
+
+:quit
\ No newline at end of file