[mapguide-commits] r7006 - branches/2.4/MgDev

[svn_mapguide at osgeo.org]

Author: jng
Date: 2012-09-12 09:18:17 -0700 (Wed, 12 Sep 2012)
New Revision: 7006

Modified:
   branches/2.4/MgDev/build.bat
   branches/2.4/MgDev/build64.bat
   branches/2.4/MgDev/setenvironment.bat
   branches/2.4/MgDev/setenvironment64.bat
Log:
#2114: Build the .net intellisense files as part of the main build process

Modified: branches/2.4/MgDev/build.bat
===================================================================
--- branches/2.4/MgDev/build.bat	2012-09-12 14:51:41 UTC (rev 7005)
+++ branches/2.4/MgDev/build.bat	2012-09-12 16:18:17 UTC (rev 7006)
@@ -388,7 +388,8 @@
 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
-
+echo [build]: .net intellisense files
+DoxyTransform.exe dotnet "%MG_DOC_XML%" "%MG_OUTPUT_WEB%\www\mapviewernet\bin"
 goto quit
 
 :error

Modified: branches/2.4/MgDev/build64.bat
===================================================================
--- branches/2.4/MgDev/build64.bat	2012-09-12 14:51:41 UTC (rev 7005)
+++ branches/2.4/MgDev/build64.bat	2012-09-12 16:18:17 UTC (rev 7006)
@@ -420,7 +420,8 @@
 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
-
+echo [build]: .net intellisense files
+DoxyTransform.exe dotnet "%MG_DOC_XML%" "%MG_OUTPUT_WEB%\www\mapviewernet\bin"
 goto quit
 
 :error

Modified: branches/2.4/MgDev/setenvironment.bat
===================================================================
--- branches/2.4/MgDev/setenvironment.bat	2012-09-12 14:51:41 UTC (rev 7005)
+++ branches/2.4/MgDev/setenvironment.bat	2012-09-12 16:18:17 UTC (rev 7006)
@@ -36,6 +36,7 @@
 @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_BUILD_TEMP=%MG_DEV%\BuildTemp
@@ -55,13 +56,13 @@
 rem running
 rem ==================================================
 
-IF "%JAVA_HOME%" == "" SET JAVA_HOME=C:\Program Files\Java\jdk1.6.0_21
+IF "%JAVA_HOME%" == "" SET JAVA_HOME=C:\Program Files\Java\jdk1.6.0_31
 IF "%DOXYGEN%" == "" SET DOXYGEN=%MG_DEV%\BuildTools\doxygen
-IF "%GNUWIN32%" == "" SET GNUWIN32=C:\Program Files\GnuWin32\bin
+IF "%GNUWIN32%" == "" SET GNUWIN32=C:\Program Files (x86)\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
+IF "%ANT_HOME%" == "" SET ANT_HOME=C:\apache-ant-1.8.3
 
-SET PATH=%PATH%;%DOXYGEN%;%GNUWIN32%;%SEVENZ%;%ANT_HOME%\bin
+SET PATH=%PATH%;%DOXYGEN%;%GNUWIN32%;%SEVENZ%;%ANT_HOME%\bin;%MG_DEV%\BuildTools\DoxyTransform
 rem ==================================================
 rem MSBuild Settings
 rem ==================================================

Modified: branches/2.4/MgDev/setenvironment64.bat
===================================================================
--- branches/2.4/MgDev/setenvironment64.bat	2012-09-12 14:51:41 UTC (rev 7005)
+++ branches/2.4/MgDev/setenvironment64.bat	2012-09-12 16:18:17 UTC (rev 7006)
@@ -43,6 +43,7 @@
 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
@@ -64,13 +65,13 @@
 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 "%JAVA_HOME%" == "" SET JAVA_HOME=C:\Program Files\Java\jdk1.6.0_31
+IF "%DOXYGEN%" == "" SET DOXYGEN=C:\Program Files\doxygen\bin
+IF "%GNUWIN32%" == "" SET GNUWIN32=C:\Program Files (x86)\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
+IF "%ANT_HOME%" == "" SET ANT_HOME=C:\apache-ant-1.8.3
 
-SET PATH=%PATH%;%DOXYGEN%;%GNUWIN32%;%SEVENZ%;%ANT_HOME%\bin
+SET PATH=%PATH%;%DOXYGEN%;%GNUWIN32%;%SEVENZ%;%ANT_HOME%\bin;%MG_DEV%\BuildTools\DoxyTransform
 
 rem ==================================================
 rem MSBuild Settings
@@ -78,8 +79,8 @@
 
 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
+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