[mapguide-commits] r7706 - trunk/MgDev
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Wed Jul 31 05:27:11 PDT 2013
Author: jng
Date: 2013-07-31 05:27:11 -0700 (Wed, 31 Jul 2013)
New Revision: 7706
Modified:
trunk/MgDev/build.bat
trunk/MgDev/setenvironment.bat
trunk/MgDev/setenvironment64.bat
Log:
#2318: Remove verbosity and configuration settings from build.bat. Configuration (debug/release) can be set as part of calling setenvironment.bat/setenvironment64.bat and verbosity can just be case of editing the setting directly in setenvironment.bat/setenvironment64.bat
Also fix assorted file paths which no longer exist as a result of the VS 2012 upgrade. Such paths are now defined in setenvironment.bat/setenvironment64.bat
Modified: trunk/MgDev/build.bat
===================================================================
--- trunk/MgDev/build.bat 2013-07-30 15:05:55 UTC (rev 7705)
+++ trunk/MgDev/build.bat 2013-07-31 12:27:11 UTC (rev 7706)
@@ -29,13 +29,10 @@
rem Usage:
rem
rem build.bat [-h]
-rem [-v]
-rem [-c=BuildType]
rem [-w=Component]
rem [-a=Action]
rem [-o=OutputDirectory]
rem
-rem BuildType: Release(default), Debug, Release64, Debug64
rem Component: all(default), oem, server, web, doc, common
rem Action: build(default), install, clean
rem OutputDirectory: The directory where files will be copied to if -a=install, if -o=default or -o=def then
@@ -53,16 +50,12 @@
if "%1"=="-help" goto help_show
if "%1"=="-h" goto help_show
-if "%1"=="-c" goto get_conf
-if "%1"=="-config" goto get_conf
-
if "%1"=="-a" goto get_action
if "%1"=="-action" goto get_action
if "%1"=="-w" goto get_component
if "%1"=="-with" goto get_component
-if "%1"=="-v" goto get_verbose
if "%1"=="-o" goto get_output
goto custom_error
@@ -72,12 +65,6 @@
shift
goto study_params
-:get_verbose
-SET MSBUILD_VERBOSITY=/v:d
-SET MSBUILD=msbuild.exe /nologo /m:%CPU_CORES% /p:Configuration=%CONFIGURATION% /p:Platform=%PLATFORM% %MSBUILD_VERBOSITY% %MSBUILD_LOG%
-SET MSBUILD_CLEAN=msbuild.exe /nologo /m:%CPU_CORES% /p:Configuration=%CONFIGURATION% /p:Platform=%PLATFORM% /t:Clean %MSBUILD_VERBOSITY%
-goto next_param
-
:get_output
SET MG_OUTPUT=%2
if "%2" == "default" SET MG_OUTPUT=%MG_DEFAULT_INSTALLDIR%
@@ -87,46 +74,6 @@
SET MG_OUTPUT_CSMAP=%MG_OUTPUT%\CS-Map
goto next_param
-:get_conf
-SET TYPEBUILD=%2
-SET CONFIGURATION=invalid
-SET PLATFORM=invalid
-SET PLATFORM_CLR=invalid
-
-IF "%2"=="Release" (
-SET CONFIGURATION=Release
-SET PLATFORM=Win32
-SET PLATFORM_CLR=x86
-)
-
-IF "%2"=="Release64" (
-SET CONFIGURATION=Release
-SET PLATFORM=x64
-SET PLATFORM_CLR=x64
-)
-
-if "%2"=="Debug" (
-SET CONFIGURATION=Debug
-SET PLATFORM=Win32
-SET PLATFORM_CLR=x86
-)
-
-if "%2"=="Debug64" (
-SET CONFIGURATION=Debug
-SET PLATFORM=x64
-SET PLATFORM_CLR=x64
-)
-
-SET MSBUILD=msbuild.exe /nologo /m:%CPU_CORES% /p:Configuration=%CONFIGURATION% /p:Platform=%PLATFORM% %MSBUILD_VERBOSITY% %MSBUILD_LOG%
-SET MSBUILD_CLEAN=msbuild.exe /nologo /m:%CPU_CORES% /p:Configuration=%CONFIGURATION% /p:Platform=%PLATFORM% /t:Clean %MSBUILD_VERBOSITY%
-SET MG_OUTPUT=%MG_DEV%\%TYPEBUILD%
-SET MG_OUTPUT_SERVER=%MG_OUTPUT%\Server
-SET MG_OUTPUT_WEB=%MG_OUTPUT%\Web
-
-if NOT %CONFIGURATION%=="invalid" goto next_param
-SET ERRORMSG=Unrecognised configuration: %2
-goto custom_error
-
:get_action
SET TYPEACTION=%2
if "%2"=="build" goto next_param
@@ -315,8 +262,7 @@
echo [install]: Server - WMS
%XCOPY% "%MG_SERVER%\bin\%TYPEBUILD%\wms" "%MG_OUTPUT_SERVER%\wms" /EXCLUDE:svn_excludes.txt+%TYPEBUILD%_excludes.txt
echo [install]: Server - DBXML
-copy /Y "%MG_OEM%\%MG_OEM_DBXML%\%MG_OEM_DB%\build_windows\%TYPEBUILD%32\*.exe" "%MG_OUTPUT_SERVER%\bin"
-copy /Y "%MG_OEM%\%MG_OEM_DBXML%\bin\*.exe" "%MG_OUTPUT_SERVER%\bin"
+copy /Y "%MG_BUILD_DBXML_EXE_PATH%\*.exe" "%MG_OUTPUT_SERVER%\bin"
echo [install]: Server - RepositoryAdmin
%XCOPY% "%MG_SERVER%\RepositoryAdmin" "%MG_OUTPUT_SERVER%\RepositoryAdmin" /EXCLUDE:svn_excludes.txt+%TYPEBUILD%_excludes.txt
echo [install]: CsMap Dictionaries
@@ -362,13 +308,13 @@
echo [install]: Web Tier - mapviewerjava - WEB-INF
%XCOPY% "%MG_WEB_SRC%\WEB-INF" "%MG_OUTPUT_WEB%\www\WEB-INF" /EXCLUDE:svn_excludes.txt+%TYPEBUILD%_excludes.txt
REM Required for Web Tier unit tests
-copy /Y "%MG_OEM%\SQLite\bin\win32\%TYPEBUILD%\php_SQLitePhpApi.dll" "%MG_OUTPUT_WEB%\Php\ext"
+copy /Y "%MG_BUILD_SQLITE_PHP_API%" "%MG_OUTPUT_WEB%\Php\ext"
echo [install]: Web Tier - fusion
call build_fusion.bat
%XCOPY% "%MG_OEM%\fusion_build" "%MG_OUTPUT_WEB%\www\fusion" /EXCLUDE:%CONFIGURATION%_excludes.txt
echo [install]: Web Tier - Apache module
if not exist "%MG_OUTPUT_WEB%\Apache2\modules" mkdir "%MG_OUTPUT_WEB%\Apache2\modules"
-%XCOPY% /F "%MG_WEB_SRC%\mapagent\mod_mgmapagent.so" "%MG_OUTPUT_WEB%\Apache2\modules"
+%XCOPY% /F "%MG_BUILD_MAPAGENT%" "%MG_OUTPUT_WEB%\Apache2\modules"
if "%TYPECOMPONENT%"=="server" goto quit
if "%TYPECOMPONENT%"=="web" goto quit
@@ -412,14 +358,10 @@
:help_show
echo ************************************************************************
echo build.bat [-h]
-echo [-v]
-echo [-c=BuildType]
echo [-w=Component]
echo [-a=Action]
echo [-o=OutputDirectory]
echo Help: -h[elp]
-echo Verbose: -v
-echo BuildType: -c[onfig]=Release(default), Debug, Release64, Debug64
echo Action: -a[ction]=build(default),
echo install,
echo clean,
@@ -430,25 +372,4 @@
echo doc
echo ************************************************************************
:quit
-SET TYPEACTION=
-REM SET TYPEBUILD=
-REM SET MG_OUTPUT=
-REM SET MG_BUILD_COMPONENT=
-REM SET MG_DEV=
-REM SET MG_INSTALLER=
-REM SET MG_OEM=
-REM SET MG_SERVER=
-REM SET MG_WEB=
-REM SET MG_WEB_SRC=
-REM SET MG_WEB_BIN=
-REM SET MG_UNIT_TEST=
-REM SET MG_FUSION=
-REM SET MG_DOC=
-REM SET MG_DOC_OUTPUT=
-REM SET MG_ERROR=
-
-REM SET MSBUILD_LOG=
-REM SET MSBUILD_VERBOSITY=
-REM SET XCOPY=
-REM SET MSBUILD=
-REM SET PATH=%OLDPATH%
+SET TYPEACTION=
\ No newline at end of file
Modified: trunk/MgDev/setenvironment.bat
===================================================================
--- trunk/MgDev/setenvironment.bat 2013-07-30 15:05:55 UTC (rev 7705)
+++ trunk/MgDev/setenvironment.bat 2013-07-31 12:27:11 UTC (rev 7706)
@@ -11,11 +11,34 @@
rem ==================================================
SET OLDPATH=%PATH%
SET TYPEACTION=build
+SET TYPECOMPONENT=all
+
+SET TYPEBUILD=unknown
+SET CONFIGURATION=unknown
+SET PLATFORM=unknown
+SET PLATFORM_CLR=unknown
+
+SET PCONF=release
+if not "%1" == "" set PCONF=%1
+
+if "%PCONF%"=="debug" (
+SET TYPEBUILD=Debug
+SET CONFIGURATION=Debug
+SET PLATFORM=Win32
+SET PLATFORM_CLR=x86
+)
+
+IF "%PCONF%"=="release" (
SET TYPEBUILD=Release
SET CONFIGURATION=Release
SET PLATFORM=Win32
SET PLATFORM_CLR=x86
-SET TYPECOMPONENT=all
+)
+
+if "%TYPEBUILD%"=="unknown" (
+ echo Unknown configuration: %PCONF%
+ goto help_show
+)
rem ==================================================
rem MapGuide vars
rem ==================================================
@@ -34,11 +57,15 @@
SET MG_UNIT_TEST=%MG_DEV%\UnitTest
SET MG_FUSION=%MG_OEM%\Fusion
SET MG_DOC=%MG_DEV%\Doc
-SET MG_DOC_XML=%MG_DOC%\mgopensource_xml
SET MG_DOC_OUTPUT=%MG_DOC%\MgOpensource_WebAPIReference
SET MG_DOC_DEVGUIDE_SAMPLES=%MG_DOC%\samples
SET MG_BUILD_TEMP=%MG_DEV%\BuildTemp
+rem === Intermediate build vars ===
+SET MG_BUILD_DBXML_EXE_PATH=%MG_OEM%\%MG_OEM_DBXML%\bin\%CONFIGURATION%
+SET MG_BUILD_SQLITE_PHP_API=%MG_OEM%\SQLite\bin\%TYPEBUILD%\php_SQLitePhpApi.dll
+SET MG_BUILD_MAPAGENT=%MG_WEB_SRC%\mapagent\mod_mgmapagent.so
+
SET MG_OUTPUT=%MG_DEV%\%TYPEBUILD%
SET MG_OUTPUT_SERVER=%MG_OUTPUT%\Server
SET MG_OUTPUT_WEB=%MG_OUTPUT%\Web
@@ -76,9 +103,33 @@
rem ==================================================
rem Command aliases
rem ==================================================
-rem SET XCOPY=xcopy /E /Y /I /F
SET XCOPY=xcopy /E /Y /I /Q /H
SET XCOPY_SINGLE=xcopy /Y /I /Q
SET MSBUILD=msbuild.exe /nologo /m:%CPU_CORES% /p:Configuration=%CONFIGURATION% /p:Platform=%PLATFORM% %MSBUILD_VERBOSITY% %MSBUILD_LOG%
SET MSBUILD_CLEAN=msbuild.exe /nologo /m:%CPU_CORES% /p:Configuration=%CONFIGURATION% /p:Platform=%PLATFORM% /t:Clean %MSBUILD_VERBOSITY%
-SET ANT=ant
\ No newline at end of file
+SET ANT=ant
+
+echo ======== Environment Variable Summary =============
+echo Configuration is [%TYPEBUILD%, "%CONFIGURATION%|%PLATFORM%"]
+echo Deployment Directory for Server: %MG_OUTPUT_SERVER%
+echo Deployment Directory for Web: %MG_OUTPUT_WEB%
+echo CPU cores: %CPU_CORES%
+echo =================== FDO ===========================
+echo Binaries: %MG_FDO_BIN%
+echo Headers: %MG_FDO_INC%
+echo Libs: %MG_FDO_LIB%
+echo =================== Oem ===========================
+echo DBXML executables: %MG_BUILD_DBXML_EXE_PATH%
+echo SQLite PHP API: %MG_BUILD_SQLITE_PHP_API%
+echo mod_mgmapagent.so: %MG_BUILD_MAPAGENT%
+echo ===================================================
+echo Type build.bat to build MapGuide
+
+goto done
+
+:help_show
+echo ************************************************************************
+echo Usage: setenvironment64.bat [debug|release]
+echo If unspecified, configuration will default to release
+echo ************************************************************************
+:done
\ No newline at end of file
Modified: trunk/MgDev/setenvironment64.bat
===================================================================
--- trunk/MgDev/setenvironment64.bat 2013-07-30 15:05:55 UTC (rev 7705)
+++ trunk/MgDev/setenvironment64.bat 2013-07-31 12:27:11 UTC (rev 7706)
@@ -14,11 +14,35 @@
rem ==================================================
SET OLDPATH=%PATH%
SET TYPEACTION=build
+SET TYPECOMPONENT=all
+
+SET TYPEBUILD=unknown
+SET CONFIGURATION=unknown
+SET PLATFORM=unknown
+SET PLATFORM_CLR=unknown
+
+SET PCONF=release
+if not "%1" == "" set PCONF=%1
+
+if "%PCONF%"=="debug" (
+SET TYPEBUILD=Debug64
+SET CONFIGURATION=Debug
+SET PLATFORM=x64
+SET PLATFORM_CLR=x64
+)
+
+IF "%PCONF%"=="release" (
SET TYPEBUILD=Release64
SET CONFIGURATION=Release
SET PLATFORM=x64
SET PLATFORM_CLR=x64
-SET TYPECOMPONENT=all
+)
+
+if "%TYPEBUILD%"=="unknown" (
+ echo Unknown configuration: %PCONF%
+ goto help_show
+)
+
rem ==================================================
rem MapGuide vars
rem ==================================================
@@ -37,11 +61,15 @@
SET MG_UNIT_TEST=%MG_DEV%\UnitTest
SET MG_FUSION=%MG_OEM%\Fusion
SET MG_DOC=%MG_DEV%\Doc
-SET MG_DOC_XML=%MG_DOC%\mgopensource_xml
SET MG_DOC_OUTPUT=%MG_DOC%\MgOpensource_WebAPIReference
SET MG_DOC_DEVGUIDE_SAMPLES=%MG_DOC%\samples
SET MG_BUILD_TEMP=%MG_DEV%\BuildTemp
+rem === Intermediate build vars ===
+SET MG_BUILD_DBXML_EXE_PATH=%MG_OEM%\%MG_OEM_DBXML%\bin64\%CONFIGURATION%
+SET MG_BUILD_SQLITE_PHP_API=%MG_OEM%\SQLite\bin\%TYPEBUILD%\php_SQLitePhpApi.dll
+SET MG_BUILD_MAPAGENT=%MG_WEB_SRC%\mapagent64\mod_mgmapagent.so
+
SET MG_OUTPUT=%MG_DEV%\%TYPEBUILD%
SET MG_OUTPUT_SERVER=%MG_OUTPUT%\Server
SET MG_OUTPUT_WEB=%MG_OUTPUT%\Web
@@ -81,9 +109,33 @@
rem ==================================================
rem Command aliases
rem ==================================================
-rem SET XCOPY=xcopy /E /Y /I /F
SET XCOPY=xcopy /E /Y /I /Q /H
SET XCOPY_SINGLE=xcopy /Y /I /Q
SET MSBUILD=msbuild.exe /nologo /m:%CPU_CORES% /p:Configuration=%CONFIGURATION% /p:Platform=%PLATFORM% %MSBUILD_VERBOSITY% %MSBUILD_LOG%
SET MSBUILD_CLEAN=msbuild.exe /nologo /m:%CPU_CORES% /p:Configuration=%CONFIGURATION% /p:Platform=%PLATFORM% /t:Clean %MSBUILD_VERBOSITY%
-SET ANT=ant
\ No newline at end of file
+SET ANT=ant
+
+echo ======== Environment Variable Summary =============
+echo Configuration is [%TYPEBUILD%, "%CONFIGURATION%|%PLATFORM%"]
+echo Deployment Directory for Server: %MG_OUTPUT_SERVER%
+echo Deployment Directory for Web: %MG_OUTPUT_WEB%
+echo CPU cores: %CPU_CORES%
+echo =================== FDO ===========================
+echo Binaries: %MG_FDO_BIN%
+echo Headers: %MG_FDO_INC%
+echo Libs: %MG_FDO_LIB%
+echo =================== Oem ===========================
+echo DBXML executables: %MG_BUILD_DBXML_EXE_PATH%
+echo SQLite PHP API: %MG_BUILD_SQLITE_PHP_API%
+echo mod_mgmapagent.so: %MG_BUILD_MAPAGENT%
+echo ===================================================
+echo Type build.bat to build MapGuide
+
+goto done
+
+:help_show
+echo ************************************************************************
+echo Usage: setenvironment64.bat [debug|release]
+echo If unspecified, configuration will default to release
+echo ************************************************************************
+:done
\ No newline at end of file
More information about the mapguide-commits
mailing list