[mapguide-commits] r7692 - trunk/MgDev
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Thu Jul 18 23:46:26 PDT 2013
Author: jng
Date: 2013-07-18 23:46:26 -0700 (Thu, 18 Jul 2013)
New Revision: 7692
Removed:
trunk/MgDev/build64.bat
Modified:
trunk/MgDev/build.bat
trunk/MgDev/build_desktop.bat
trunk/MgDev/setenvironment.bat
trunk/MgDev/setenvironment64.bat
Log:
#2318: Update/Cleanup command-line build scripts for VS2012. build64.bat is redundant because setenvironment.bat/setenvironment64.bat should sort out the platform-specific env vars, which this submission will do. This submission also removes x64 cross-compilation support (it's much simpler to just build on a 64-bit box)
Modified: trunk/MgDev/build.bat
===================================================================
--- trunk/MgDev/build.bat 2013-07-18 09:55:09 UTC (rev 7691)
+++ trunk/MgDev/build.bat 2013-07-19 06:46:26 UTC (rev 7692)
@@ -9,18 +9,19 @@
rem
rem Before you start, please make sure you have done the following:
rem
-rem 1) Build the FDO source and place the files in \Oem\FDO (or alternatively download and extract the latest FDO 3.4 binary sdk)
+rem 1) Build the FDO source and place the files in \Oem\FDO (or alternatively download and extract the latest FDO binary sdk)
rem with the following structure:
-rem - Bin\%CONFIG% (where %CONFIG% is debug or release)
-rem - Inc
-rem - Lib
+rem - Bin\%CONFIG% (where %CONFIG% is debug or release, debug64 or release64 for 64-bit FDO)
+rem - Inc
+rem - Lib
+rem - Lib64 (for 64-bit FDO)
rem
rem 2) Download and install the following:
rem - Java SDK (http://java.sun.com)
rem - ant (http://ant.apache.org)
rem - doxygen (http://www.doxygen.org)
rem
-rem 3) Change the values of JAVA_HOME, ANT_HOME and DOXYGEN to match the paths of your Java SDK, Apache Ant and Doxygen installations respectively
+rem 3) Call setenvironment.bat or setenvironment64.bat depending on whether you're building 32-bit or 64-bit MapGuide. Adjust any paths in those two files as appropriate so that it points to your specific JDK, ANT and Doxygen directories
rem
rem For a "cleaner" build experience, run this script from an exported copy of the
rem MapGuide source code (ie. without subversion folders).
@@ -34,7 +35,7 @@
rem [-a=Action]
rem [-o=OutputDirectory]
rem
-rem BuildType: Release(default), Debug
+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
@@ -43,15 +44,6 @@
rem Please note that -a=install does nothing if -w=oem
rem ==================================================
-rem Update solution suffix if using VC10 compiler.
-rem NOTE: VS10 solution files are suffixed with _VS2010
-rem which is why we can do it like this
-rem ==================================================
-
-SET VS_SLN_SUFFIX=
-IF "%VC_COMPILER_VERSION%" == "10" SET VS_SLN_SUFFIX=_VS2010
-
-rem ==================================================
rem Parameter Handling
rem ==================================================
@@ -82,8 +74,8 @@
:get_verbose
SET MSBUILD_VERBOSITY=/v:d
-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 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
@@ -97,14 +89,41 @@
:get_conf
SET TYPEBUILD=%2
-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 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 "%2"=="Release" goto next_param
-if "%2"=="Debug" goto next_param
+if NOT %CONFIGURATION%=="invalid" goto next_param
SET ERRORMSG=Unrecognised configuration: %2
goto custom_error
@@ -142,30 +161,25 @@
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 to %MG_OEM%\FDO\Bin\%TYPEBUILD%
+if exist "%MG_FDO_BIN%" goto check_fdo_inc
+SET ERRORMSG=Unable to find FDO binaries. Copy the FDO binaries to %MG_FDO_BIN%
goto custom_error_no_help
:check_fdo_inc
-if exist "%MG_OEM%\FDO\Bin\%TYPEBUILD%" goto check_fdo_lib
-SET ERRORMSG=Unable to find FDO headers. Copy the FDO headers into %MG_OEM%\Inc
+if exist "%MG_FDO_INC%" goto check_fdo_lib
+SET ERRORMSG=Unable to find FDO headers. Copy the FDO headers into %MG_FDO_INC%
goto custom_error_no_help
:check_fdo_lib
-if exist "%MG_OEM%\FDO\Bin\%TYPEBUILD%" goto start_build
-SET ERRORMSG=Unable to find FDO lib files. Copy the FDO lib files into %MG_OEM%\Lib
+if exist "%MG_FDO_LIB%" goto start_build
+SET ERRORMSG=Unable to find FDO lib files. Copy the FDO lib files into %MG_FDO_LIB%
goto custom_error_no_help
:start_build
echo ===================================================
-echo Configuration is [%TYPEBUILD%]
+echo Configuration is [%TYPEBUILD%, "%CONFIGURATION%|%PLATFORM%"]
echo Action is [%TYPEACTION%] on [%TYPECOMPONENT%]
echo Deployment Directory for Server: %MG_OUTPUT_SERVER%
echo Deployment Directory for Web: %MG_OUTPUT_WEB%
echo CPU cores: %CPU_CORES%
-IF "%VC_COMPILER_VERSION%" == "10" (
-echo Using VC10 compiler
-) ELSE (
-echo Using VC9 compiler
-)
echo ===================================================
if "%TYPEACTION%"=="build" goto build
@@ -180,23 +194,19 @@
:clean_oem
echo [clean]: Clean Oem
-%MSBUILD_CLEAN% %MG_OEM%\Oem%VS_SLN_SUFFIX%.sln
+%MSBUILD_CLEAN% %MG_OEM%\Oem.sln
echo [clean]: Clean Oem - CS-Map
-IF "%VC_COMPILER_VERSION%" == "10" (
-%MSBUILD_CLEAN% %MG_OEM%\CSMap\VC100\OpenSource.sln
-) ELSE (
-%MSBUILD_CLEAN% %MG_OEM%\CSMap\VC90\OpenSource.sln
-)
+%MSBUILD_CLEAN% %MG_OEM%\CSMap\VC110\OpenSource.sln
if not "%TYPECOMPONENT%"=="all" goto quit
:clean_server
echo [clean]: Clean Server
-%MSBUILD_CLEAN% %MG_SERVER%\Server%VS_SLN_SUFFIX%.sln
+%MSBUILD_CLEAN% %MG_SERVER%\Server.sln
if not "%TYPECOMPONENT%"=="all" goto quit
:clean_web
echo [clean]: Clean Web
-%MSBUILD_CLEAN% %MG_WEB_SRC%\WebTier%VS_SLN_SUFFIX%.sln
+%MSBUILD_CLEAN% %MG_WEB_SRC%\WebTier.sln
echo [clean]: Clean fusion
%ANT% clean -f %MG_OEM%\fusion\build.xml
if not "%TYPECOMPONENT%"=="all" goto quit
@@ -225,15 +235,11 @@
:build_oem
echo [build]: Building Oem
-%MSBUILD% %MG_OEM%\Oem%VS_SLN_SUFFIX%.sln
+%MSBUILD% %MG_OEM%\Oem.sln
if "%errorlevel%"=="1" goto error
rem CsMap is not in Oem.sln, so we need to build that separately
echo [build]: Building Oem - CSMap
-IF "%VC_COMPILER_VERSION%" == "10" (
-%MSBUILD% %MG_OEM%\CsMap\VC100\OpenSource.sln
-) ELSE (
-%MSBUILD% %MG_OEM%\CsMap\VC90\OpenSource.sln
-)
+%MSBUILD% %MG_OEM%\CsMap\VC110\OpenSource.sln
if "%errorlevel%"=="1" goto error
if "%TYPECOMPONENT%"=="oem" goto quit
if "%TYPECOMPONENT%"=="server" goto quit
@@ -242,7 +248,7 @@
:build_server
echo [build]: Building Server
-%MSBUILD% %MG_SERVER%\Server%VS_SLN_SUFFIX%.sln
+%MSBUILD% %MG_SERVER%\Server.sln
if "%errorlevel%"=="1" goto error
if "%TYPECOMPONENT%"=="oem" goto quit
if "%TYPECOMPONENT%"=="server" goto quit
@@ -251,7 +257,7 @@
:build_web
echo [build]: Building Web Tier
-%MSBUILD% %MG_WEB_SRC%\WebTier%VS_SLN_SUFFIX%.sln
+%MSBUILD% %MG_WEB_SRC%\WebTier.sln
if "%errorlevel%"=="1" goto error
if "%TYPECOMPONENT%"=="oem" goto quit
if "%TYPECOMPONENT%"=="server" goto quit
@@ -413,7 +419,7 @@
echo [-o=OutputDirectory]
echo Help: -h[elp]
echo Verbose: -v
-echo BuildType: -c[onfig]=Release(default), Debug
+echo BuildType: -c[onfig]=Release(default), Debug, Release64, Debug64
echo Action: -a[ction]=build(default),
echo install,
echo clean,
@@ -424,8 +430,8 @@
echo doc
echo ************************************************************************
:quit
-SET TYPEACTION=build
-SET TYPEBUILD=Release
+SET TYPEACTION=
+REM SET TYPEBUILD=
REM SET MG_OUTPUT=
REM SET MG_BUILD_COMPONENT=
REM SET MG_DEV=
Deleted: trunk/MgDev/build64.bat
===================================================================
--- trunk/MgDev/build64.bat 2013-07-18 09:55:09 UTC (rev 7691)
+++ trunk/MgDev/build64.bat 2013-07-19 06:46:26 UTC (rev 7692)
@@ -1,480 +0,0 @@
- at echo off
-rem MapGuide build script for windows
-rem
-rem Author: Jackie Ng (jumpinjackie at gmail.com)
-rem
-rem This script will build all the MapGuide components, if the output path is specified
-rem it will also copy all binaries to the output path. Otherwise it will use the default
-rem value of MG_OUTPUT defined in this file
-rem
-rem Before you start, please make sure you have done the following:
-rem
-rem 1) Build the FDO source and place the files in \Oem\FDO (or alternatively download and extract the latest FDO 3.4 binary sdk)
-rem with the following structure:
-rem - Bin\%CONFIG% (where %CONFIG% is debug or release)
-rem - Inc
-rem - Lib
-rem
-rem 2) Download and install the following:
-rem - Java SDK (http://java.sun.com)
-rem - ant (http://ant.apache.org)
-rem - doxygen (http://www.doxygen.org)
-rem
-rem 3) Change the values of JAVA_HOME, ANT_HOME and DOXYGEN to match the paths of your Java SDK, Apache Ant and Doxygen installations respectively
-rem
-rem For a "cleaner" build experience, run this script from an exported copy of the
-rem MapGuide source code (ie. without subversion folders).
-rem
-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
-rem files will be copied to %MG_DEFAULT_INSTALLDIR%
-rem
-rem Please note that -a=install does nothing if -w=oem
-
-rem ==================================================
-rem Update solution suffix if using VC10 compiler.
-rem NOTE: VS10 solution files are suffixed with _VS2010
-rem which is why we can do it like this
-rem ==================================================
-
-SET VS_SLN_SUFFIX=
-IF "%VC_COMPILER_VERSION%" == "10" SET VS_SLN_SUFFIX=_VS2010
-
-rem ==================================================
-rem Parameter Handling
-rem ==================================================
-
-:study_params
-if (%1)==() goto pre_build_check
-
-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
-
-:next_param
-shift
-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%
-if "%2" == "def" SET MG_OUTPUT=%MG_DEFAULT_INSTALLDIR%
-SET MG_OUTPUT_SERVER=%MG_OUTPUT%\Server
-SET MG_OUTPUT_WEB=%MG_OUTPUT%\Web
-SET MG_OUTPUT_CSMAP=%MG_OUTPUT%\CS-Map
-goto next_param
-
-:get_conf
-SET TYPEBUILD=%2
-SET CONFIGURATION=invalid
-SET PLATFORM=invalid
-
-IF "%2"=="Release" (
-SET CONFIGURATION=Release
-SET PLATFORM=Win32
-)
-
-IF "%2"=="Release64" (
-SET CONFIGURATION=Release
-SET PLATFORM=x64
-)
-
-if "%2"=="Debug" (
-SET CONFIGURATION=Debug
-SET PLATFORM=Win32
-)
-
-if "%2"=="Debug64" (
-SET CONFIGURATION=Debug
-SET PLATFORM=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
-if "%2"=="clean" goto next_param
-if "%2"=="install" goto next_param
-SET ERRORMSG=Unrecognised action: %2
-goto custom_error
-
-:get_component
-SET TYPECOMPONENT=%2
-if "%2"=="oem" 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
-if "%2"=="all" goto next_param
-if "%2"=="allnodoc" goto next_param
-SET ERRORMSG=Unrecognised component: %2
-goto custom_error
-
-rem ==================================================
-rem Check Environment Vars
-rem ==================================================
-
-: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 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 in setenvironment64.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%
-goto custom_error_no_help
-:check_fdo_inc
-if exist "%MG_OEM%\FDO\Bin\%TYPEBUILD%" goto check_fdo_lib
-SET ERRORMSG=Unable to find FDO headers. Copy the FDO headers into %MG_OEM%\Inc
-goto custom_error_no_help
-:check_fdo_lib
-if exist "%MG_OEM%\FDO\Bin\%TYPEBUILD%" goto start_build
-SET ERRORMSG=Unable to find FDO lib files. Copy the FDO lib files into %MG_OEM%\Lib
-goto custom_error_no_help
-
-:start_build
-echo ===================================================
-echo Configuration is [%TYPEBUILD%, "%CONFIGURATION%|%PLATFORM%"]
-echo Action is [%TYPEACTION%] on [%TYPECOMPONENT%]
-echo Deployment Directory for Server: %MG_OUTPUT_SERVER%
-echo Deployment Directory for Web: %MG_OUTPUT_WEB%
-echo CPU cores: %CPU_CORES%
-IF "%VC_COMPILER_VERSION%" == "10" (
-echo Using VC10 compiler
-) ELSE (
-echo Using VC9 compiler
-)
-echo ===================================================
-
-if "%TYPEACTION%"=="build" goto build
-if "%TYPEACTION%"=="clean" goto clean
-if "%TYPEACTION%"=="install" goto install
-
-:clean
-if "%TYPECOMPONENT%"=="oem" goto clean_oem
-if "%TYPECOMPONENT%"=="server" goto clean_server
-if "%TYPECOMPONENT%"=="web" goto clean_web
-if "%TYPECOMPONENT%"=="doc" goto clean_doc
-
-:clean_oem
-echo [clean]: Clean Oem
-%MSBUILD_CLEAN% %MG_OEM%\Oem%VS_SLN_SUFFIX%.sln
-echo [clean]: Clean Oem - CS-Map
-IF "%VC_COMPILER_VERSION%" == "10" (
-%MSBUILD_CLEAN% %MG_OEM%\CSMap\VC100\OpenSource.sln
-) ELSE (
-%MSBUILD_CLEAN% %MG_OEM%\CSMap\VC90\OpenSource.sln
-)
-if not "%TYPECOMPONENT%"=="all" goto quit
-
-:clean_server
-echo [clean]: Clean Server
-%MSBUILD_CLEAN% %MG_SERVER%\Server%VS_SLN_SUFFIX%.sln
-if not "%TYPECOMPONENT%"=="all" goto quit
-
-:clean_web
-echo [clean]: Clean Web
-%MSBUILD_CLEAN% %MG_WEB_SRC%\WebTier%VS_SLN_SUFFIX%.sln
-echo [clean]: Clean fusion
-%ANT% clean -f %MG_OEM%\fusion\build.xml
-if not "%TYPECOMPONENT%"=="all" goto quit
-
-:clean_doc
-echo [clean]: Clean Doc
-if exist %MG_DOC_OUTPUT% rd /S /Q %MG_DOC_OUTPUT%
-goto quit
-
-
-rem =======================================================
-rem Build Targets.... the all targets just carry on
-rem =======================================================
-
-:build
-if "%TYPECOMPONENT%"=="oem" goto build_oem
-if "%TYPECOMPONENT%"=="server" goto build_server
-if "%TYPECOMPONENT%"=="web" goto build_web
-if "%TYPECOMPONENT%"=="doc" goto build_doc
-if "%TYPECOMPONENT%"=="all" goto build_oem
-if "%TYPECOMPONENT%"=="allnodoc" goto build_oem
-SET ERRORMSG=Unrecognised component: %TYPECOMPONENT%
-goto custom_error
-
-
-
-:build_oem
-echo [build]: Building Oem
-%MSBUILD% %MG_OEM%\Oem%VS_SLN_SUFFIX%.sln
-if "%errorlevel%"=="1" goto error
-rem CsMap is not in Oem.sln, so we need to build that separately
-echo [build]: Building Oem - CSMap
-IF "%VC_COMPILER_VERSION%" == "10" (
-IF "%VC_X64_CROSS_COMPILE%" == "1" (
-echo [build]: Cross-compiling CSMap
-REM For x64 cross compilation, we build the CS-Map projects individually
-REM except for the compiler project, which we build in x86
-%MSBUILD% %MG_OEM%\CsMap\VC100\Library.vcxproj
-msbuild /p:Configuration=%CONFIGURATION%;Platform=Win32 %MG_OEM%\CsMap\VC100\Library.vcxproj
-) ELSE (
-%MSBUILD% %MG_OEM%\CsMap\VC100\OpenSource.sln
-)
-) ELSE (
-%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_server
-echo [build]: Building Server
-%MSBUILD% %MG_SERVER%\Server%VS_SLN_SUFFIX%.sln
-if "%errorlevel%"=="1" goto error
-if "%TYPECOMPONENT%"=="oem" goto quit
-if "%TYPECOMPONENT%"=="server" goto quit
-if "%TYPECOMPONENT%"=="web" goto quit
-if "%TYPECOMPONENT%"=="doc" goto quit
-
-:build_web
-echo [build]: Building Web Tier
-%MSBUILD% %MG_WEB_SRC%\WebTier%VS_SLN_SUFFIX%.sln
-if "%errorlevel%"=="1" goto error
-if "%TYPECOMPONENT%"=="oem" goto quit
-if "%TYPECOMPONENT%"=="server" goto quit
-if "%TYPECOMPONENT%"=="web" goto quit
-if "%TYPECOMPONENT%"=="doc" goto quit
-if "%TYPECOMPONENT%"=="allnodoc" goto quit
-
-rem this is left out with component allnodoc
-
-:build_doc
-echo [build]: Building Doc
-pushd %MG_DOC%
-call MgOpenSource_run_doxygen.bat
-popd
-echo [build]: MapGuide Developer's Guide
-pushd %MG_DOC%\devguide
-call make.bat html
-popd
-goto quit
-
-rem =======================================================
-rem INSTALL Targets.... the all targets just carry on
-rem =======================================================
-
-
-:install
-if "%TYPECOMPONENT%"=="all" goto install_server
-if "%TYPECOMPONENT%"=="allnodoc" goto install_server
-if "%TYPECOMPONENT%"=="server" goto install_server
-if "%TYPECOMPONENT%"=="web" goto install_web
-if "%TYPECOMPONENT%"=="doc" goto install_doc
-SET ERRORMSG=Unrecognised component: %TYPECOMPONENT%
-goto custom_error
-
-:install_server
-echo [install]: Server
-echo [install]: Server - Binaries
-%XCOPY_SINGLE% "%MG_SERVER%\bin\%TYPEBUILD%" "%MG_OUTPUT_SERVER%\bin" /EXCLUDE:svn_excludes.txt+%CONFIGURATION%_excludes.txt
-echo [install]: Server - FDO
-%XCOPY% "%MG_SERVER%\bin\%TYPEBUILD%\FDO" "%MG_OUTPUT_SERVER%\FDO" /EXCLUDE:svn_excludes.txt+%CONFIGURATION%_excludes.txt
-echo [install]: Server - Logs
-%XCOPY% "%MG_SERVER%\bin\%TYPEBUILD%\Logs" "%MG_OUTPUT_SERVER%\Logs" /EXCLUDE:svn_excludes.txt+%CONFIGURATION%_excludes.txt
-echo [install]: Server - Packages
-%XCOPY% "%MG_SERVER%\bin\%TYPEBUILD%\Packages" "%MG_OUTPUT_SERVER%\Packages" /EXCLUDE:svn_excludes.txt+%CONFIGURATION%_excludes.txt
-echo [install]: Server - Repositories
-%XCOPY% "%MG_SERVER%\bin\%TYPEBUILD%\Repositories" "%MG_OUTPUT_SERVER%\Repositories" /EXCLUDE:svn_excludes.txt+%CONFIGURATION%_excludes.txt
-echo [install]: Server - Resources
-%XCOPY% "%MG_SERVER%\bin\%TYPEBUILD%\Resources" "%MG_OUTPUT_SERVER%\Resources" /EXCLUDE:svn_excludes.txt+%CONFIGURATION%_excludes.txt
-echo [install]: Server - Schema
-%XCOPY% "%MG_SERVER%\bin\%TYPEBUILD%\Schema" "%MG_OUTPUT_SERVER%\Schema" /EXCLUDE:svn_excludes.txt+%CONFIGURATION%_excludes.txt
-echo [install]: Server - Temp
-%XCOPY% "%MG_SERVER%\bin\%TYPEBUILD%\Temp" "%MG_OUTPUT_SERVER%\Temp" /EXCLUDE:svn_excludes.txt+%CONFIGURATION%_excludes.txt
-echo [install]: Server - WFS
-%XCOPY% "%MG_SERVER%\bin\%TYPEBUILD%\wfs" "%MG_OUTPUT_SERVER%\wfs" /EXCLUDE:svn_excludes.txt+%CONFIGURATION%_excludes.txt
-echo [install]: Server - WMS
-%XCOPY% "%MG_SERVER%\bin\%TYPEBUILD%\wms" "%MG_OUTPUT_SERVER%\wms" /EXCLUDE:svn_excludes.txt+%CONFIGURATION%_excludes.txt
-echo [install]: Server - DBXML
-copy /Y "%MG_OEM%\%MG_OEM_DBXML%\%MG_OEM_DB%\build_windows\%TYPEBUILD%\*.exe" "%MG_OUTPUT_SERVER%\bin"
-copy /Y "%MG_OEM%\%MG_OEM_DBXML%\bin64\*.exe" "%MG_OUTPUT_SERVER%\bin"
-echo [install]: Server - RepositoryAdmin
-%XCOPY% "%MG_SERVER%\RepositoryAdmin" "%MG_OUTPUT_SERVER%\RepositoryAdmin" /EXCLUDE:svn_excludes.txt+%CONFIGURATION%_excludes.txt
-echo [install]: CsMap Dictionaries
-%XCOPY% "%MG_OEM%\CsMap\Dictionaries" "%MG_OUTPUT_CSMAP%\Dictionaries" /EXCLUDE:svn_excludes.txt+csmap_excludes.txt+%CONFIGURATION%_excludes.txt
-if "%TYPECOMPONENT%"=="server" goto quit
-if "%TYPECOMPONENT%"=="web" goto quit
-
-:install_web
-echo [install]: web Tier
-
-echo [install]: Web Tier - localized
-%XCOPY% "%MG_WEB_SRC%\localized" "%MG_OUTPUT_WEB%\www\localized" /EXCLUDE:%CONFIGURATION%_excludes.txt
-echo [install]: Web Tier - mapadmin
-%XCOPY% "%MG_WEB_SRC%\mapadmin" "%MG_OUTPUT_WEB%\www\mapadmin" /EXCLUDE:%CONFIGURATION%_excludes.txt
-echo [install]: Web Tier - mapagent
-%XCOPY% "%MG_WEB_SRC%\mapagent64" "%MG_OUTPUT_WEB%\www\mapagent" /EXCLUDE:svn_excludes.txt+mapagent_excludes.txt+%CONFIGURATION%_excludes.txt+%CONFIGURATION%_excludes.txt
-echo [install]: Web Tier - MapGuide API unmanaged binaries
-%XCOPY% "%MG_WEB_BIN%\%TYPEBUILD%" "%MG_OUTPUT_WEB%\www\mapagent" /EXCLUDE:php_excludes.txt+dotnetapi_excludes.txt+dotnetxml_excludes.txt+java_excludes.txt+svn_excludes.txt+%CONFIGURATION%_excludes.txt
-echo [install]: Web Tier - mapagent test forms
-%XCOPY% "%MG_UNIT_TEST%\WebTier\MapAgent\MapAgentForms" "%MG_OUTPUT_WEB%\www\mapagent" /EXCLUDE:%CONFIGURATION%_excludes.txt
-echo [install]: Web Tier - stdicons
-%XCOPY% "%MG_WEB_SRC%\stdicons" "%MG_OUTPUT_WEB%\www\stdicons" /EXCLUDE:%CONFIGURATION%_excludes.txt
-echo [install]: Web Tier - viewerfiles
-%XCOPY% "%MG_WEB_SRC%\viewerfiles" "%MG_OUTPUT_WEB%\www\viewerfiles" /EXCLUDE:%CONFIGURATION%_excludes.txt
-echo [install]: Web Tier - schemareport
-%XCOPY% "%MG_WEB_SRC%\schemareport" "%MG_OUTPUT_WEB%\www\schemareport" /EXCLUDE:%CONFIGURATION%_excludes.txt
-echo [install]: Web Tier - webconfig.ini
-copy /Y "%MG_WEB_SRC%\webconfig.ini" "%MG_OUTPUT_WEB%\www"
-echo [install]: Web Tier - mapviewerphp
-%XCOPY% "%MG_WEB_SRC%\mapviewerphp" "%MG_OUTPUT_WEB%\www\mapviewerphp" /EXCLUDE:%CONFIGURATION%_excludes.txt
-echo [install]: Web Tier - Tomcat - MapGuide API unmanaged binaries
-%XCOPY% "%MG_WEB_BIN%\%TYPEBUILD%" "%MG_OUTPUT_WEB%\Tomcat\bin"/EXCLUDE:java_excludes.txt+dotnetapi_excludes.txt+dotnetxml_excludes.txt+svn_excludes.txt+%CONFIGURATION%_excludes.txt
-echo [install]: Web Tier - php - MapGuide API unmanaged binaries
-%XCOPY% "%MG_WEB_BIN%\%TYPEBUILD%" "%MG_OUTPUT_WEB%\Php"/EXCLUDE:php_excludes.txt+dotnetapi_excludes.txt+dotnetxml_excludes.txt+svn_excludes.txt+%CONFIGURATION%_excludes.txt
-echo [install]: Web Tier - php ext - MapGuide API unmanaged binaries
-%XCOPY% "%MG_WEB_BIN%\%TYPEBUILD%" "%MG_OUTPUT_WEB%\Php\ext" /EXCLUDE:php_excludes.txt+dotnetapi_excludes.txt+dotnetxml_excludes.txt+svn_excludes.txt+%CONFIGURATION%_excludes.txt
-echo [install]: Web Tier - mapviewernet
-%XCOPY% "%MG_WEB_SRC%\mapviewernet" "%MG_OUTPUT_WEB%\www\mapviewernet" /EXCLUDE:%CONFIGURATION%_excludes.txt
-echo [install]: Web Tier - mapviewernet - MapGuide API unmanaged binaries
-%XCOPY% "%MG_WEB_BIN%\%TYPEBUILD%" "%MG_OUTPUT_WEB%\www\mapviewernet\bin" /EXCLUDE:dotnet_excludes.txt+%CONFIGURATION%_excludes.txt+%CONFIGURATION%_excludes.txt
-echo [install]: Web Tier - mapviewerjava
-%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
-REM Required for Web Tier unit tests
-copy /Y "%MG_OEM%\SQLite\bin\win64\%CONFIGURATION%\php_SQLitePhpApi.dll" "%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%\mapagent64\mod_mgmapagent.so" "%MG_OUTPUT_WEB%\Apache2\modules"
-if "%TYPECOMPONENT%"=="server" goto quit
-if "%TYPECOMPONENT%"=="web" goto quit
-
-:install_doc
-echo [install]: Documentation
-%XCOPY% "%MG_DOC_OUTPUT%" "%MG_OUTPUT_WEB%\www\help\webapi" /EXCLUDE:svn_excludes.txt+%CONFIGURATION%_excludes.txt
-echo [install]: MapGuide Developer's Guide
-%XCOPY% "%MG_DOC%\devguide\build\html" "%MG_OUTPUT_WEB%\www\help\devguide" /EXCLUDE:svn_excludes.txt+%TYPEBUILD%_excludes.txt
-echo [install]: Developer's Guide Sample Code (PHP)
-%XCOPY% "%MG_DOC_DEVGUIDE_SAMPLES%\phpsamples" "%MG_OUTPUT_WEB%\www\phpsamples" /EXCLUDE:%TYPEBUILD%_excludes.txt
-echo [install]: Developer's Guide Sample Code (Java)
-%XCOPY% "%MG_DOC_DEVGUIDE_SAMPLES%\javasamples" "%MG_OUTPUT_WEB%\www\javasamples" /EXCLUDE:%TYPEBUILD%_excludes.txt
-echo [install]: Developer's Guide Sample Code (DotNet)
-%XCOPY% "%MG_DOC_DEVGUIDE_SAMPLES%\dotnetsamples" "%MG_OUTPUT_WEB%\www\dotnetsamples" /EXCLUDE:%TYPEBUILD%_excludes.txt
-echo [install]: Developer's Guide Sample Code (PHP)
-%XCOPY% "%MG_DOC_DEVGUIDE_SAMPLES%\phpviewersample" "%MG_OUTPUT_WEB%\www\phpviewersample" /EXCLUDE:%TYPEBUILD%_excludes.txt
-echo [install]: Developer's Guide Sample Code (Java)
-%XCOPY% "%MG_DOC_DEVGUIDE_SAMPLES%\javaviewersample" "%MG_OUTPUT_WEB%\www\javaviewersample" /EXCLUDE:%TYPEBUILD%_excludes.txt
-echo [install]: Developer's Guide Sample Code (DotNet)
-%XCOPY% "%MG_DOC_DEVGUIDE_SAMPLES%\dotnetviewersample" "%MG_OUTPUT_WEB%\www\dotnetviewersample" /EXCLUDE:%TYPEBUILD%_excludes.txt
-echo [install]: Viewer API documentation
-%XCOPY% "%MG_DOC%\viewerapi" "%MG_OUTPUT_WEB%\www\help\viewerapi" /EXCLUDE:%CONFIGURATION%_excludes.txt
-echo [install]: Copy dlls into .net samples
-%XCOPY% "%MG_OUTPUT_WEB%\www\mapviewernet\bin\*.dll" "%MG_OUTPUT_WEB%\www\dotnetsamples\bin" /EXCLUDE:svn_excludes.txt+%TYPEBUILD%_excludes.txt
-%XCOPY% "%MG_OUTPUT_WEB%\www\mapviewernet\bin\*.dll" "%MG_OUTPUT_WEB%\www\dotnetviewersample\bin" /EXCLUDE:svn_excludes.txt+%TYPEBUILD%_excludes.txt
-goto quit
-
-:error
-echo [ERROR]: There was an error building the component
-exit /B 1
-
-:custom_error_no_help
-echo [ERROR]: %ERRORMSG%
-SET ERRORMSG=
-exit /B 1
-
-:custom_error
-echo [ERROR]: %ERRORMSG%
-SET ERRORMSG=
-echo Please use the format:
-: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,
-echo Component: -w[ith]=all(default),
-echo oem,
-echo server,
-echo web,
-echo doc
-echo ************************************************************************
-:quit
-SET TYPEACTION=build
-SET TYPEBUILD=Release64
-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%
Modified: trunk/MgDev/build_desktop.bat
===================================================================
--- trunk/MgDev/build_desktop.bat 2013-07-18 09:55:09 UTC (rev 7691)
+++ trunk/MgDev/build_desktop.bat 2013-07-19 06:46:26 UTC (rev 7692)
@@ -5,34 +5,32 @@
rem
rem You must call setenvironment[64].bat first with any appropriate
rem parameters before calling this script
+rem
+rem This script presumes common/oem components have already been built
+rem so you should ideally run this after running build.bat
-rem ==================================================
-rem Update solution suffix if using VC10 compiler.
-rem NOTE: VS10 solution files are suffixed with _VS2010
-rem which is why we can do it like this
-rem ==================================================
-
SET MG_OUTPUT_DESKTOP=%MG_OUTPUT%\Desktop
SET MG_OUTPUT_SAMPLES=%MG_OUTPUT%\DesktopSamples
-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
+echo ===================================================
+echo Configuration is [%TYPEBUILD%, "%CONFIGURATION%|%PLATFORM%"]
+echo Output Directory for mg-desktop: %MG_OUTPUT_DESKTOP%
+echo Output Directory for samples: %MG_OUTPUT_SAMPLES%
+echo CPU cores: %CPU_CORES%
+echo ===================================================
pushd Desktop
-echo [build]: Desktop API (%DESKTOP_PLATFORM_UNMANAGED%)
-%MSBUILD% /p:Platform=%DESKTOP_PLATFORM_UNMANAGED% MgDesktopApi%VS_SLN_SUFFIX%.sln
+echo [build]: Desktop API (%PLATFORM%, %CONFIGURATION%)
+%MSBUILD% /p:Platform=%PLATFORM% /p:Configuration=%CONFIGURATION% MgDesktopApi.sln
if "%errorlevel%"=="1" goto error
-echo [build]: .net components (%DESKTOP_PLATFORM%)
-%MSBUILD% /p:Platform=%DESKTOP_PLATFORM% MgDesktopDotNet%VS_SLN_SUFFIX%.sln
+echo [build]: .net components (%PLATFORM%)
+%MSBUILD% /p:Platform=%PLATFORM_CLR% /p:Configuration=%CONFIGURATION% MgDesktopDotNet.sln
if "%errorlevel%"=="1" goto error
popd
echo [install]: binaries
%XCOPY% "Desktop\bin\%TYPEBUILD%" "%MG_OUTPUT_DESKTOP%" /EXCLUDE:svn_excludes.txt+%CONFIGURATION%_excludes.txt
pushd "%MG_OUTPUT_DESKTOP%"
+REM Remove WebTier stuff that has no place in mg-desktop
if exist MgMapGuideCommon.dll del MgMapGuideCommon.dll
if exist OSGeo.MapGuide.MapGuideCommon.xml del OSGeo.MapGuide.MapGuideCommon.xml
if exist OSGeo.MapGuide.Web.xml del OSGeo.MapGuide.Web.xml
Modified: trunk/MgDev/setenvironment.bat
===================================================================
--- trunk/MgDev/setenvironment.bat 2013-07-18 09:55:09 UTC (rev 7691)
+++ trunk/MgDev/setenvironment.bat 2013-07-19 06:46:26 UTC (rev 7692)
@@ -5,10 +5,7 @@
rem Sets the required environment variables for the
rem build.bat script
rem
-rem Compiler defaults to vc9.0. To use the vc10
-rem compiler, call setenvironment.bat like so:
-rem
-rem setenvironment.bat vc10
+rem This script must be run from the VS2012 command prompt
rem ==================================================
rem Top-level vars
rem ==================================================
@@ -16,29 +13,30 @@
SET TYPEACTION=build
SET TYPEBUILD=Release
SET CONFIGURATION=Release
+SET PLATFORM=Win32
+SET PLATFORM_CLR=x86
SET TYPECOMPONENT=all
-SET VC_COMPILER_VERSION=9
-IF "%1" == "vc10" SET VC_COMPILER_VERSION=10
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_FDO_BIN=%MG_OEM%\FDO\Bin\%TYPEBUILD%
+SET MG_FDO_INC=%MG_OEM%\FDO\Inc
+SET MG_FDO_LIB=%MG_OEM%\FDO\Lib
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_XML=%MG_DOC%\mgopensource_xml
SET MG_DOC_OUTPUT=%MG_DOC%\MgOpensource_WebAPIReference
-SET MG_DOC_DEVGUIDE_SAMPLES=%MG_DOC%\samples\
+SET MG_DOC_DEVGUIDE_SAMPLES=%MG_DOC%\samples
SET MG_BUILD_TEMP=%MG_DEV%\BuildTemp
SET MG_OUTPUT=%MG_DEV%\%TYPEBUILD%
@@ -48,6 +46,7 @@
SET MG_BUILD_COMPONENT=
SET MG_DEFAULT_INSTALLDIR=C:\Program Files\MapGuideOpenSource2.0
+SET MG_ERROR=0
rem ==================================================
rem Extra tool paths
rem
@@ -62,7 +61,7 @@
IF "%SEVENZ%" == "" SET SEVENZ=%MG_DEV%\BuildTools\WebTools\7-Zip
IF "%ANT_HOME%" == "" SET ANT_HOME=C:\apache-ant-1.8.3
-SET PATH=%PATH%;%DOXYGEN%;%GNUWIN32%;%SEVENZ%;%ANT_HOME%\bin;%MG_DEV%\BuildTools\DoxyTransform
+SET PATH=%PATH%;%DOXYGEN%;%GNUWIN32%;%SEVENZ%;%ANT_HOME%\bin
rem ==================================================
rem MSBuild Settings
rem ==================================================
@@ -80,6 +79,6 @@
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 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
Modified: trunk/MgDev/setenvironment64.bat
===================================================================
--- trunk/MgDev/setenvironment64.bat 2013-07-18 09:55:09 UTC (rev 7691)
+++ trunk/MgDev/setenvironment64.bat 2013-07-19 06:46:26 UTC (rev 7692)
@@ -5,10 +5,10 @@
rem Sets the required environment variables for the
rem build.bat script
rem
-rem Compiler defaults to vc9.0. To use the vc10
-rem compiler, call setenvironment.bat like so:
+rem This script must be run from the VS2012 command prompt
rem
-rem setenvironment64.bat vc10
+rem Cross-compilation is no longer supported by these scripts.
+rem It's 2013, most of you should have a 64-bit box by now :)
rem ==================================================
rem Top-level vars
rem ==================================================
@@ -17,24 +17,18 @@
SET TYPEBUILD=Release64
SET CONFIGURATION=Release
SET PLATFORM=x64
+SET PLATFORM_CLR=x64
SET TYPECOMPONENT=all
-SET VC_COMPILER_VERSION=9
-IF "%1" == "vc10" (
-SET VC_COMPILER_VERSION=10
-SET VC_X64_CROSS_COMPILE=0
-)
-IF "%1" == "vc10cross" (
-SET VC_COMPILER_VERSION=10
-SET VC_X64_CROSS_COMPILE=1
-)
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_FDO_BIN=%MG_OEM%\FDO\Bin\%TYPEBUILD%
+SET MG_FDO_INC=%MG_OEM%\FDO\Inc
+SET MG_FDO_LIB=%MG_OEM%\FDO\Lib64
SET MG_COMMON=%MG_DEV%\Common
SET MG_SERVER=%MG_DEV%\Server
SET MG_WEB=%MG_DEV%\Web
@@ -71,16 +65,14 @@
IF "%SEVENZ%" == "" SET SEVENZ=%MG_DEV%\BuildTools\WebTools\7-Zip
IF "%ANT_HOME%" == "" SET ANT_HOME=C:\apache-ant-1.8.3
-SET PATH=%PATH%;%DOXYGEN%;%GNUWIN32%;%SEVENZ%;%ANT_HOME%\bin;%MG_DEV%\BuildTools\DoxyTransform
+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
SET CPU_CORES=%NUMBER_OF_PROCESSORS%
-rem 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
More information about the mapguide-commits
mailing list