[mapguide-commits] r7735 - trunk/MgDev

[svn_mapguide at osgeo.org]

Author: jng
Date: 2013-08-05 09:29:26 -0700 (Mon, 05 Aug 2013)
New Revision: 7735

Modified:
   trunk/MgDev/build.bat
   trunk/MgDev/setenvironment.bat
   trunk/MgDev/setenvironment64.bat
Log:
#2318: Ensure the correct mapagent files are copied to the staging area by build.bat

Modified: trunk/MgDev/build.bat
===================================================================
--- trunk/MgDev/build.bat	2013-08-05 14:28:48 UTC (rev 7734)
+++ trunk/MgDev/build.bat	2013-08-05 16:29:26 UTC (rev 7735)
@@ -278,7 +278,7 @@
 echo [install]: Web Tier - mapadmin
 %XCOPY% "%MG_WEB_SRC%\mapadmin" "%MG_OUTPUT_WEB%\www\mapadmin" /EXCLUDE:%TYPEBUILD%_excludes.txt
 echo [install]: Web Tier - mapagent
-%XCOPY% "%MG_WEB_SRC%\mapagent" "%MG_OUTPUT_WEB%\www\mapagent" /EXCLUDE:svn_excludes.txt+mapagent_excludes.txt+%TYPEBUILD%_excludes.txt+%TYPEBUILD%_excludes.txt
+%XCOPY% "%MG_BUILD_MAPAGENT_PATH%" "%MG_OUTPUT_WEB%\www\mapagent" /EXCLUDE:svn_excludes.txt+mapagent_excludes.txt+%TYPEBUILD%_excludes.txt+%TYPEBUILD%_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+%TYPEBUILD%_excludes.txt
 echo [install]: Web Tier - mapagent test forms

Modified: trunk/MgDev/setenvironment.bat
===================================================================
--- trunk/MgDev/setenvironment.bat	2013-08-05 14:28:48 UTC (rev 7734)
+++ trunk/MgDev/setenvironment.bat	2013-08-05 16:29:26 UTC (rev 7735)
@@ -64,7 +64,8 @@
 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_BUILD_MAPAGENT_PATH=%MG_WEB_SRC%\mapagent
+SET MG_BUILD_MAPAGENT=%MG_BUILD_MAPAGENT_PATH%\mod_mgmapagent.so
 
 SET MG_OUTPUT=%MG_DEV%\%TYPEBUILD%
 SET MG_OUTPUT_SERVER=%MG_OUTPUT%\Server

Modified: trunk/MgDev/setenvironment64.bat
===================================================================
--- trunk/MgDev/setenvironment64.bat	2013-08-05 14:28:48 UTC (rev 7734)
+++ trunk/MgDev/setenvironment64.bat	2013-08-05 16:29:26 UTC (rev 7735)
@@ -68,7 +68,8 @@
 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_BUILD_MAPAGENT_PATH=%MG_WEB_SRC%\mapagent64
+SET MG_BUILD_MAPAGENT=%MG_BUILD_MAPAGENT_PATH%\mod_mgmapagent.so
 
 SET MG_OUTPUT=%MG_DEV%\%TYPEBUILD%
 SET MG_OUTPUT_SERVER=%MG_OUTPUT%\Server