[mapguide-commits] r6417 - trunk/MgDev

svn_mapguide at osgeo.org svn_mapguide at osgeo.org
Wed Jan 11 01:53:50 EST 2012 

Author: jng
Date: 2012-01-10 22:53:50 -0800 (Tue, 10 Jan 2012)
New Revision: 6417

Added:
   trunk/MgDev/setenvironment.bat
   trunk/MgDev/setenvironment64.bat
Modified:
   trunk/MgDev/build.bat
   trunk/MgDev/build64.bat
Log:
#1841, #894: Define the required build variables in setenvironment.bat and setenvironment64.bat. This has to be called first before calling the respective build.bat and build64.bat. The build scripts have also been updated to call into the new build_fusion.bat

Modified: trunk/MgDev/build.bat
===================================================================
--- trunk/MgDev/build.bat	2012-01-11 06:50:43 UTC (rev 6416)
+++ trunk/MgDev/build.bat	2012-01-11 06:53:50 UTC (rev 6417)
@@ -43,80 +43,6 @@
 rem Please note that -a=install does nothing if -w=oem
 
 rem ==================================================
-rem Top-level vars
-rem ==================================================
-SET OLDPATH=%PATH%
-SET TYPEACTION=build
-SET TYPEBUILD=Release
-SET TYPECOMPONENT=all
-
-rem ==================================================
-rem MapGuide vars
-rem ==================================================
-SET MG_DEV=%CD%
-SET MG_OEM=%MG_DEV%\Oem
-rem DBXML seems to change frequently enough that we should externalize this information
-SET MG_OEM_DBXML=dbxml
-SET MG_OEM_DB=db-4.8.26
-SET MG_COMMON=%MG_DEV%\Common
-SET MG_SERVER=%MG_DEV%\Server
-SET MG_WEB=%MG_DEV%\Web
-SET MG_WEB_SRC=%MG_WEB%\src
-SET MG_WEB_BIN=%MG_WEB%\bin
-SET MG_UNIT_TEST=%MG_DEV%\UnitTest
-SET MG_FUSION=%MG_OEM%\Fusion
-SET MG_DOC=%MG_DEV%\Doc
-SET MG_DOC_OUTPUT=%MG_DOC%\MgOpensource_WebAPIReference
-SET MG_DOC_DEVGUIDE_SAMPLES=%MG_DOC%\samples\
-SET MG_BUILD_TEMP=%MG_DEV%\BuildTemp
-
-SET MG_OUTPUT=%MG_DEV%\%TYPEBUILD%
-SET MG_OUTPUT_SERVER=%MG_OUTPUT%\Server
-SET MG_OUTPUT_WEB=%MG_OUTPUT%\Web
-SET MG_OUTPUT_CSMAP=%MG_OUTPUT%\CS-Map
-SET MG_BUILD_COMPONENT=
-
-SET MG_DEFAULT_INSTALLDIR=C:\Program Files\MapGuideOpenSource2.0
-SET MG_ERROR=0
-
-rem ==================================================
-rem Extra tool paths
-rem 
-rem Your paths may be different, adjust accordingly or
-rem set the appropriate environment variables before
-rem running
-rem ==================================================
-
-IF "%JAVA_HOME%" == "" SET JAVA_HOME=C:\Program Files\Java\jdk1.6.0_21
-IF "%DOXYGEN%" == "" SET DOXYGEN=%MG_DEV%\BuildTools\doxygen
-IF "%GNUWIN32%" == "" SET GNUWIN32=C:\Program Files\GnuWin32\bin
-IF "%SEVENZ%" == "" SET SEVENZ=%MG_DEV%\BuildTools\WebTools\7-Zip
-IF "%ANT_HOME%" == "" SET ANT_HOME=%MG_DEV%\BuildTools\apache-ant-1.7.1
-
-SET PATH=%PATH%;%DOXYGEN%;%GNUWIN32%;%SEVENZ%;%ANT_HOME%\bin
-
-rem ==================================================
-rem MSBuild Settings
-rem ==================================================
-
-rem If the NUMBER_OF_PROCESSORS environment variable is wrong for any reason. Change this value.
-SET CPU_CORES=%NUMBER_OF_PROCESSORS%
-
-rem Uncomment the line below to enable msbuild logging
-rem SET MSBUILD_LOG=/l:FileLogger,Microsoft.Build.Engine;logfile=Build.log;verbosity=diagnostic
-SET MSBUILD_VERBOSITY=/v:q
-
-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=%TYPEBUILD% %MSBUILD_VERBOSITY% %MSBUILD_LOG%
-SET MSBUILD_CLEAN=msbuild.exe /nologo /m:%CPU_CORES% /p:Configuration=%TYPEBUILD% /t:Clean %MSBUILD_VERBOSITY%
-SET ANT=ant
-
-rem ==================================================
 rem Parameter Handling
 rem ==================================================
 
@@ -199,16 +125,16 @@
 :pre_build_check
 :check_java
 if exist "%JAVA_HOME%" goto check_ant
-SET ERRORMSG=Unable to find java sdk installation. Please install the java sdk and set the JAVA_HOME environment variable
+SET ERRORMSG=Unable to find java sdk installation. Please install the java sdk and set the JAVA_HOME environment variable in setenvironment.bat
 goto custom_error_no_help
 :check_ant
 if exist "%ANT_HOME%" goto check_fdo
-SET ERRORMSG=Unable to find Apache ant installation. Please install apache ant and set the ANT_HOME environment variable
+SET ERRORMSG=Unable to find Apache ant installation. Please install apache ant and set the ANT_HOME environment variable in setenvironment.bat
 goto custom_error_no_help
 :check_fdo
 :check_fdo_bin
 if exist "%MG_OEM%\FDO\Bin\%TYPEBUILD%" goto check_fdo_inc
-SET ERRORMSG=Unable to find FDO binaries. Copy the FDO binaries %MG_OEM%\FDO\Bin\%TYPEBUILD%
+SET ERRORMSG=Unable to find FDO binaries. Copy the FDO binaries to %MG_OEM%\FDO\Bin\%TYPEBUILD%
 goto custom_error_no_help
 :check_fdo_inc
 if exist "%MG_OEM%\FDO\Bin\%TYPEBUILD%" goto check_fdo_lib
@@ -403,13 +329,12 @@
 %XCOPY% "%MG_WEB_SRC%\mapviewerjava" "%MG_OUTPUT_WEB%\www\mapviewerjava" /EXCLUDE:%TYPEBUILD%_excludes.txt
 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
-echo [install]: Web Tier - fusion templates
-%XCOPY% "%MG_OEM%\fusionMG" "%MG_OUTPUT_WEB%\www\fusion" /EXCLUDE:svn_excludes.txt+%TYPEBUILD%_excludes.txt
+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"
-echo [install]: Web Tier - fusion
-call %ANT% deploy -Ddeploy.home="%MG_OUTPUT_WEB%\www\fusion" -f "%MG_OEM%\fusion\build.xml"
 if "%TYPECOMPONENT%"=="server" goto quit
 if "%TYPECOMPONENT%"=="web" goto quit
 

Modified: trunk/MgDev/build64.bat
===================================================================
--- trunk/MgDev/build64.bat	2012-01-11 06:50:43 UTC (rev 6416)
+++ trunk/MgDev/build64.bat	2012-01-11 06:53:50 UTC (rev 6417)
@@ -43,84 +43,6 @@
 rem Please note that -a=install does nothing if -w=oem
 
 rem ==================================================
-rem Top-level vars
-rem ==================================================
-SET OLDPATH=%PATH%
-SET TYPEACTION=build
-SET TYPEBUILD=Release64
-SET CONFIGURATION=Release
-SET PLATFORM=x64
-SET TYPECOMPONENT=all
-
-rem ==================================================
-rem MapGuide vars
-rem ==================================================
-SET MG_DEV=%CD%
-SET MG_OEM=%MG_DEV%\Oem
-rem DBXML seems to change frequently enough that we should externalize this information
-SET MG_OEM_DBXML=dbxml
-SET MG_OEM_DB=db-4.8.26
-SET MG_COMMON=%MG_DEV%\Common
-SET MG_SERVER=%MG_DEV%\Server
-SET MG_WEB=%MG_DEV%\Web
-SET MG_WEB_SRC=%MG_WEB%\src
-SET MG_WEB_BIN=%MG_WEB%\bin
-SET MG_UNIT_TEST=%MG_DEV%\UnitTest
-SET MG_FUSION=%MG_OEM%\Fusion
-SET MG_DOC=%MG_DEV%\Doc
-SET MG_DOC_OUTPUT=%MG_DOC%\MgOpensource_WebAPIReference
-SET MG_DOC_DEVGUIDE_SAMPLES=%MG_DOC%\samples
-SET MG_BUILD_TEMP=%MG_DEV%\BuildTemp
-
-SET MG_OUTPUT=%MG_DEV%\%TYPEBUILD%
-SET MG_OUTPUT_SERVER=%MG_OUTPUT%\Server
-SET MG_OUTPUT_WEB=%MG_OUTPUT%\Web
-SET MG_OUTPUT_CSMAP=%MG_OUTPUT%\CS-Map
-SET MG_BUILD_COMPONENT=
-
-SET MG_DEFAULT_INSTALLDIR=C:\Program Files\MapGuideOpenSource2.0
-SET MG_ERROR=0
-
-rem ==================================================
-rem Extra tool paths
-rem 
-rem Your paths may be different, adjust accordingly or
-rem set the appropriate environment variables before
-rem running
-rem ==================================================
-
-IF "%JAVA_HOME%" == "" SET JAVA_HOME=C:\Program Files\Java\jdk1.5.0_18
-IF "%DOXYGEN%" == "" SET DOXYGEN=%MG_DEV%\BuildTools\doxygen
-IF "%GNUWIN32%" == "" SET GNUWIN32=C:\Program Files\GnuWin32\bin
-IF "%SEVENZ%" == "" SET SEVENZ=%MG_DEV%\BuildTools\WebTools\7-Zip
-IF "%ANT_HOME%" == "" SET ANT_HOME=%MG_DEV%\BuildTools\apache-ant-1.7.1
-
-SET PATH=%PATH%;%DOXYGEN%;%GNUWIN32%;%SEVENZ%;%ANT_HOME%\bin
-
-rem ==================================================
-rem MSBuild Settings
-rem ==================================================
-
-rem If the NUMBER_OF_PROCESSORS environment variable is wrong for any reason. Change this value.
-rem Multi core builds seem to be broken
-rem SET CPU_CORES=%NUMBER_OF_PROCESSORS%
-SET CPU_CORES=1
-
-rem Uncomment the line below to enable msbuild logging
-rem SET MSBUILD_LOG=/l:FileLogger,Microsoft.Build.Engine;logfile=Build.log;verbosity=diagnostic
-SET MSBUILD_VERBOSITY=/v:q
-
-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
-
-rem ==================================================
 rem Parameter Handling
 rem ==================================================
 
@@ -226,11 +148,11 @@
 :pre_build_check
 :check_java
 if exist "%JAVA_HOME%" goto check_ant
-SET ERRORMSG=Unable to find java sdk installation. Please install the java sdk and set the JAVA_HOME environment variable
+SET ERRORMSG=Unable to find java sdk installation. Please install the java sdk and set the JAVA_HOME environment variable in setenvironment64.bat
 goto custom_error_no_help
 :check_ant
 if exist "%ANT_HOME%" goto check_fdo
-SET ERRORMSG=Unable to find Apache ant installation. Please install apache ant and set the ANT_HOME environment variable
+SET ERRORMSG=Unable to find Apache ant installation. Please install apache ant and set the ANT_HOME environment variable in setenvironment64.bat
 goto custom_error_no_help
 :check_fdo
 :check_fdo_bin
@@ -431,13 +353,12 @@
 %XCOPY% "%MG_WEB_SRC%\mapviewerjava" "%MG_OUTPUT_WEB%\www\mapviewerjava" /EXCLUDE:%CONFIGURATION%_excludes.txt
 echo [install]: Web Tier - mapviewerjava - WEB-INF
 %XCOPY% "%MG_WEB_SRC%\WEB-INF" "%MG_OUTPUT_WEB%\www\WEB-INF" /EXCLUDE:svn_excludes.txt+%CONFIGURATION%_excludes.txt
-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 - 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%\mapagent64\mod_mgmapagent.so" "%MG_OUTPUT_WEB%\Apache2\modules"
-echo [install]: Web Tier - fusion
-call %ANT% deploy -Ddeploy.home="%MG_OUTPUT_WEB%\www\fusion" -f "%MG_OEM%\fusion\build.xml"
 if "%TYPECOMPONENT%"=="server" goto quit
 if "%TYPECOMPONENT%"=="web" goto quit
 

Added: trunk/MgDev/setenvironment.bat
===================================================================
--- trunk/MgDev/setenvironment.bat	                        (rev 0)
+++ trunk/MgDev/setenvironment.bat	2012-01-11 06:53:50 UTC (rev 6417)
@@ -0,0 +1,71 @@
+rem ==================================================
+rem Top-level vars
+rem ==================================================
+SET OLDPATH=%PATH%
+SET TYPEACTION=build
+SET TYPEBUILD=Release
+SET CONFIGURATION=Release
+SET TYPECOMPONENT=all
+rem ==================================================
+rem MapGuide vars
+rem ==================================================
+SET MG_DEV=%CD%
+SET MG_OEM=%MG_DEV%\Oem
+rem DBXML seems to change frequently enough that we should externalize this information
+SET MG_OEM_DBXML=dbxml
+SET MG_OEM_DB=db-4.8.26
+SET MG_COMMON=%MG_DEV%\Common
+SET MG_SERVER=%MG_DEV%\Server
+SET MG_WEB=%MG_DEV%\Web
+SET MG_WEB_SRC=%MG_WEB%\src
+SET MG_WEB_BIN=%MG_WEB%\bin
+SET MG_UNIT_TEST=%MG_DEV%\UnitTest
+ at echo off
+SET MG_FUSION=%MG_OEM%\Fusion
+SET MG_DOC=%MG_DEV%\Doc
+SET MG_DOC_OUTPUT=%MG_DOC%\MgOpensource_WebAPIReference
+SET MG_DOC_DEVGUIDE_SAMPLES=%MG_DOC%\samples\
+SET MG_BUILD_TEMP=%MG_DEV%\BuildTemp
+
+SET MG_OUTPUT=%MG_DEV%\%TYPEBUILD%
+SET MG_OUTPUT_SERVER=%MG_OUTPUT%\Server
+SET MG_OUTPUT_WEB=%MG_OUTPUT%\Web
+SET MG_OUTPUT_CSMAP=%MG_OUTPUT%\CS-Map
+SET MG_BUILD_COMPONENT=
+
+SET MG_DEFAULT_INSTALLDIR=C:\Program Files\MapGuideOpenSource2.0
+rem ==================================================
+rem Extra tool paths
+rem 
+rem Your paths may be different, adjust accordingly or
+rem set the appropriate environment variables before
+rem running
+rem ==================================================
+
+IF "%JAVA_HOME%" == "" SET JAVA_HOME=C:\Program Files\Java\jdk1.6.0_21
+IF "%DOXYGEN%" == "" SET DOXYGEN=%MG_DEV%\BuildTools\doxygen
+IF "%GNUWIN32%" == "" SET GNUWIN32=C:\Program Files\GnuWin32\bin
+IF "%SEVENZ%" == "" SET SEVENZ=%MG_DEV%\BuildTools\WebTools\7-Zip
+IF "%ANT_HOME%" == "" SET ANT_HOME=%MG_DEV%\BuildTools\apache-ant-1.7.1
+
+SET PATH=%PATH%;%DOXYGEN%;%GNUWIN32%;%SEVENZ%;%ANT_HOME%\bin
+rem ==================================================
+rem MSBuild Settings
+rem ==================================================
+
+rem If the NUMBER_OF_PROCESSORS environment variable is wrong for any reason. Change this value.
+SET CPU_CORES=%NUMBER_OF_PROCESSORS%
+
+rem Uncomment the line below to enable msbuild logging
+rem SET MSBUILD_LOG=/l:FileLogger,Microsoft.Build.Engine;logfile=Build.log;verbosity=diagnostic
+SET MSBUILD_VERBOSITY=/v:q
+
+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=%TYPEBUILD% %MSBUILD_VERBOSITY% %MSBUILD_LOG%
+SET MSBUILD_CLEAN=msbuild.exe /nologo /m:%CPU_CORES% /p:Configuration=%TYPEBUILD% /t:Clean %MSBUILD_VERBOSITY%
+SET ANT=ant
\ No newline at end of file

Added: trunk/MgDev/setenvironment64.bat
===================================================================
--- trunk/MgDev/setenvironment64.bat	                        (rev 0)
+++ trunk/MgDev/setenvironment64.bat	2012-01-11 06:53:50 UTC (rev 6417)
@@ -0,0 +1,78 @@
+ at echo off
+rem ==================================================
+rem Top-level vars
+rem ==================================================
+SET OLDPATH=%PATH%
+SET TYPEACTION=build
+SET TYPEBUILD=Release64
+SET CONFIGURATION=Release
+SET PLATFORM=x64
+SET TYPECOMPONENT=all
+
+rem ==================================================
+rem MapGuide vars
+rem ==================================================
+SET MG_DEV=%CD%
+SET MG_OEM=%MG_DEV%\Oem
+rem DBXML seems to change frequently enough that we should externalize this information
+SET MG_OEM_DBXML=dbxml
+SET MG_OEM_DB=db-4.8.26
+SET MG_COMMON=%MG_DEV%\Common
+SET MG_SERVER=%MG_DEV%\Server
+SET MG_WEB=%MG_DEV%\Web
+SET MG_WEB_SRC=%MG_WEB%\src
+SET MG_WEB_BIN=%MG_WEB%\bin
+SET MG_UNIT_TEST=%MG_DEV%\UnitTest
+SET MG_FUSION=%MG_OEM%\Fusion
+SET MG_DOC=%MG_DEV%\Doc
+SET MG_DOC_OUTPUT=%MG_DOC%\MgOpensource_WebAPIReference
+SET MG_DOC_DEVGUIDE_SAMPLES=%MG_DOC%\samples
+SET MG_BUILD_TEMP=%MG_DEV%\BuildTemp
+
+SET MG_OUTPUT=%MG_DEV%\%TYPEBUILD%
+SET MG_OUTPUT_SERVER=%MG_OUTPUT%\Server
+SET MG_OUTPUT_WEB=%MG_OUTPUT%\Web
+SET MG_OUTPUT_CSMAP=%MG_OUTPUT%\CS-Map
+SET MG_BUILD_COMPONENT=
+
+SET MG_DEFAULT_INSTALLDIR=C:\Program Files\MapGuideOpenSource2.0
+SET MG_ERROR=0
+
+rem ==================================================
+rem Extra tool paths
+rem 
+rem Your paths may be different, adjust accordingly or
+rem set the appropriate environment variables before
+rem running
+rem ==================================================
+
+IF "%JAVA_HOME%" == "" SET JAVA_HOME=C:\Program Files\Java\jdk1.5.0_18
+IF "%DOXYGEN%" == "" SET DOXYGEN=%MG_DEV%\BuildTools\doxygen
+IF "%GNUWIN32%" == "" SET GNUWIN32=C:\Program Files\GnuWin32\bin
+IF "%SEVENZ%" == "" SET SEVENZ=%MG_DEV%\BuildTools\WebTools\7-Zip
+IF "%ANT_HOME%" == "" SET ANT_HOME=%MG_DEV%\BuildTools\apache-ant-1.7.1
+
+SET PATH=%PATH%;%DOXYGEN%;%GNUWIN32%;%SEVENZ%;%ANT_HOME%\bin
+
+rem ==================================================
+rem MSBuild Settings
+rem ==================================================
+
+rem If the NUMBER_OF_PROCESSORS environment variable is wrong for any reason. Change this value.
+rem Multi core builds seem to be broken
+rem SET CPU_CORES=%NUMBER_OF_PROCESSORS%
+SET CPU_CORES=1
+
+rem Uncomment the line below to enable msbuild logging
+rem SET MSBUILD_LOG=/l:FileLogger,Microsoft.Build.Engine;logfile=Build.log;verbosity=diagnostic
+SET MSBUILD_VERBOSITY=/v:q
+
+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

More information about the mapguide-commits mailing list