[mapguide-commits] r6132 - trunk/MgDev
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Mon Sep 12 22:45:36 EDT 2011
Author: jng
Date: 2011-09-12 19:45:36 -0700 (Mon, 12 Sep 2011)
New Revision: 6132
Modified:
trunk/MgDev/build.bat
trunk/MgDev/build64.bat
Log:
#1804: Omit building Common.sln as building Server and WebTier solutions will build whatever shared components are in this solution
Modified: trunk/MgDev/build.bat
===================================================================
--- trunk/MgDev/build.bat 2011-09-13 02:40:33 UTC (rev 6131)
+++ trunk/MgDev/build.bat 2011-09-13 02:45:36 UTC (rev 6132)
@@ -184,7 +184,6 @@
:get_component
SET TYPECOMPONENT=%2
if "%2"=="oem" goto next_param
-if "%2"=="common" goto next_param
if "%2"=="server" goto next_param
if "%2"=="web" goto next_param
if "%2"=="doc" goto next_param
@@ -235,7 +234,6 @@
:clean
if "%TYPECOMPONENT%"=="oem" goto clean_oem
-if "%TYPECOMPONENT%"=="common" goto clean_common
if "%TYPECOMPONENT%"=="server" goto clean_server
if "%TYPECOMPONENT%"=="web" goto clean_web
if "%TYPECOMPONENT%"=="doc" goto clean_doc
@@ -247,11 +245,6 @@
%MSBUILD_CLEAN% %MG_OEM%\CSMap\VC90\OpenSource.sln
if not "%TYPECOMPONENT%"=="all" goto quit
-:clean_common
-echo [clean]: Clean Common
-%MSBUILD_CLEAN% %MG_COMMON%\Common.sln
-if not "%TYPECOMPONENT%"=="all" goto quit
-
:clean_server
echo [clean]: Clean Server
%MSBUILD_CLEAN% %MG_SERVER%\Server.sln
@@ -276,7 +269,6 @@
:build
if "%TYPECOMPONENT%"=="oem" goto build_oem
-if "%TYPECOMPONENT%"=="common" goto build_common
if "%TYPECOMPONENT%"=="server" goto build_server
if "%TYPECOMPONENT%"=="web" goto build_web
if "%TYPECOMPONENT%"=="doc" goto build_doc
@@ -296,27 +288,15 @@
%MSBUILD% %MG_OEM%\CsMap\VC90\OpenSource.sln
if "%errorlevel%"=="1" goto error
if "%TYPECOMPONENT%"=="oem" goto quit
-if "%TYPECOMPONENT%"=="common" goto quit
if "%TYPECOMPONENT%"=="server" goto quit
if "%TYPECOMPONENT%"=="web" goto quit
if "%TYPECOMPONENT%"=="doc" goto quit
-:build_common
-echo [build]: Building Common
-%MSBUILD% %MG_COMMON%\Common.sln
-if "%errorlevel%"=="1" goto error
-if "%TYPECOMPONENT%"=="oem" goto quit
-if "%TYPECOMPONENT%"=="common" goto quit
-if "%TYPECOMPONENT%"=="server" goto quit
-if "%TYPECOMPONENT%"=="web" goto quit
-if "%TYPECOMPONENT%"=="doc" goto quit
-
:build_server
echo [build]: Building Server
%MSBUILD% %MG_SERVER%\Server.sln
if "%errorlevel%"=="1" goto error
if "%TYPECOMPONENT%"=="oem" goto quit
-if "%TYPECOMPONENT%"=="common" goto quit
if "%TYPECOMPONENT%"=="server" goto quit
if "%TYPECOMPONENT%"=="web" goto quit
if "%TYPECOMPONENT%"=="doc" goto quit
@@ -326,7 +306,6 @@
%MSBUILD% %MG_WEB_SRC%\WebTier.sln
if "%errorlevel%"=="1" goto error
if "%TYPECOMPONENT%"=="oem" goto quit
-if "%TYPECOMPONENT%"=="common" goto quit
if "%TYPECOMPONENT%"=="server" goto quit
if "%TYPECOMPONENT%"=="web" goto quit
if "%TYPECOMPONENT%"=="doc" goto quit
@@ -473,7 +452,6 @@
echo clean,
echo Component: -w[ith]=all(default),
echo oem,
-echo common,
echo server,
echo web,
echo doc
Modified: trunk/MgDev/build64.bat
===================================================================
--- trunk/MgDev/build64.bat 2011-09-13 02:40:33 UTC (rev 6131)
+++ trunk/MgDev/build64.bat 2011-09-13 02:45:36 UTC (rev 6132)
@@ -210,7 +210,7 @@
:get_component
SET TYPECOMPONENT=%2
if "%2"=="oem" goto next_param
-if "%2"=="common" goto next_param
+REM if "%2"=="common" goto next_param
if "%2"=="server" goto next_param
if "%2"=="web" goto next_param
if "%2"=="doc" goto next_param
@@ -261,7 +261,6 @@
:clean
if "%TYPECOMPONENT%"=="oem" goto clean_oem
-if "%TYPECOMPONENT%"=="common" goto clean_common
if "%TYPECOMPONENT%"=="server" goto clean_server
if "%TYPECOMPONENT%"=="web" goto clean_web
if "%TYPECOMPONENT%"=="doc" goto clean_doc
@@ -273,11 +272,6 @@
%MSBUILD_CLEAN% %MG_OEM%\CSMap\VC90\OpenSource.sln
if not "%TYPECOMPONENT%"=="all" goto quit
-:clean_common
-echo [clean]: Clean Common
-%MSBUILD_CLEAN% %MG_COMMON%\Common.sln
-if not "%TYPECOMPONENT%"=="all" goto quit
-
:clean_server
echo [clean]: Clean Server
%MSBUILD_CLEAN% %MG_SERVER%\Server.sln
@@ -302,7 +296,6 @@
:build
if "%TYPECOMPONENT%"=="oem" goto build_oem
-if "%TYPECOMPONENT%"=="common" goto build_common
if "%TYPECOMPONENT%"=="server" goto build_server
if "%TYPECOMPONENT%"=="web" goto build_web
if "%TYPECOMPONENT%"=="doc" goto build_doc
@@ -327,22 +320,11 @@
if "%TYPECOMPONENT%"=="web" goto quit
if "%TYPECOMPONENT%"=="doc" goto quit
-:build_common
-echo [build]: Building Common
-%MSBUILD% %MG_COMMON%\Common.sln
-if "%errorlevel%"=="1" goto error
-if "%TYPECOMPONENT%"=="oem" goto quit
-if "%TYPECOMPONENT%"=="common" goto quit
-if "%TYPECOMPONENT%"=="server" goto quit
-if "%TYPECOMPONENT%"=="web" goto quit
-if "%TYPECOMPONENT%"=="doc" goto quit
-
:build_server
echo [build]: Building Server
%MSBUILD% %MG_SERVER%\Server.sln
if "%errorlevel%"=="1" goto error
if "%TYPECOMPONENT%"=="oem" goto quit
-if "%TYPECOMPONENT%"=="common" goto quit
if "%TYPECOMPONENT%"=="server" goto quit
if "%TYPECOMPONENT%"=="web" goto quit
if "%TYPECOMPONENT%"=="doc" goto quit
@@ -352,7 +334,6 @@
%MSBUILD% %MG_WEB_SRC%\WebTier.sln
if "%errorlevel%"=="1" goto error
if "%TYPECOMPONENT%"=="oem" goto quit
-if "%TYPECOMPONENT%"=="common" goto quit
if "%TYPECOMPONENT%"=="server" goto quit
if "%TYPECOMPONENT%"=="web" goto quit
if "%TYPECOMPONENT%"=="doc" goto quit
@@ -499,7 +480,6 @@
echo clean,
echo Component: -w[ith]=all(default),
echo oem,
-echo common,
echo server,
echo web,
echo doc
More information about the mapguide-commits
mailing list