[mapguide-commits] r8680 - sandbox/jng/diet/Web/src/MapGuideApi

[svn_mapguide at osgeo.org]

Author: jng
Date: 2015-05-27 08:21:28 -0700 (Wed, 27 May 2015)
New Revision: 8680

Modified:
   sandbox/jng/diet/Web/src/MapGuideApi/copydlls.bat
Log:
Update copydlls.bat to use our environment variable paths

Modified: sandbox/jng/diet/Web/src/MapGuideApi/copydlls.bat
===================================================================
--- sandbox/jng/diet/Web/src/MapGuideApi/copydlls.bat	2015-05-26 15:12:52 UTC (rev 8679)
+++ sandbox/jng/diet/Web/src/MapGuideApi/copydlls.bat	2015-05-27 15:21:28 UTC (rev 8680)
@@ -35,16 +35,16 @@
 if not exist %WEB_BIN_RELEASE% mkdir %WEB_BIN_RELEASE%
 
 echo Copying ACE Release DLL to %WEB_BIN_RELEASE%
-xcopy /r /d /y "..\..\..\Oem\ACE\ACE_wrappers\lib\%2\ACE.dll" %WEB_BIN_RELEASE%
+xcopy /r /d /y "%MG_OEM_ACE_BIN_DIR%\ACE.dll" %WEB_BIN_RELEASE%
 
 echo Copying GEOS Release DLL to %WEB_BIN_RELEASE%
-xcopy /r /d /y "..\..\..\Oem\geos\VisualStudio\%2\GEOS.dll" %WEB_BIN_RELEASE%
+xcopy /r /d /y "%MG_OEM_GEOS_BIN_DIR%\GEOS.dll" %WEB_BIN_RELEASE%
 
 echo Copying JSON Release DLL to %WEB_BIN_RELEASE%
-xcopy /r /d /y "..\..\..\Oem\jsoncpp\lib\%2\lib_json.dll" %WEB_BIN_RELEASE%
+xcopy /r /d /y "%MG_OEM_JSONCPP_BIN_DIR%\lib_json.dll" %WEB_BIN_RELEASE%
 
 echo Copying Xerces Release DLL to %WEB_BIN_RELEASE%
-xcopy /r /d /y "..\..\..\Oem\dbxml\bin\%2\xerces-c_3_1mg.dll" %WEB_BIN_RELEASE%
+xcopy /r /d /y "%MG_OEM_DBXML_BIN_DIR%\xerces-c_3_1mg.dll" %WEB_BIN_RELEASE%
 
 echo Copying MgFoundation Release DLL to %WEB_BIN_RELEASE%
 xcopy /r /d /y %COMMON_BIN_RELEASE%\MgFoundation.dll %WEB_BIN_RELEASE%
@@ -75,16 +75,16 @@
 if not exist %WEB_BIN_RELEASE%64 mkdir %WEB_BIN_RELEASE%64
 
 echo Copying ACE Release DLL to %WEB_BIN_RELEASE%64
-xcopy /r /d /y "..\..\..\Oem\ACE\ACE_wrappers\lib64\%2\ACE.dll" %WEB_BIN_RELEASE%64
+xcopy /r /d /y "%MG_OEM_ACE_BIN_DIR%\ACE.dll" %WEB_BIN_RELEASE%64
 
 echo Copying GEOS Release DLL to %WEB_BIN_RELEASE%64
-xcopy /r /d /y "..\..\..\Oem\geos\VisualStudio\%264\GEOS.dll" %WEB_BIN_RELEASE%64
+xcopy /r /d /y "%MG_OEM_GEOS_BIN_DIR%\GEOS.dll" %WEB_BIN_RELEASE%64
 
 echo Copying JSON Release DLL to %WEB_BIN_RELEASE%64
-xcopy /r /d /y "..\..\..\Oem\jsoncpp\lib64\%2\lib_json.dll" %WEB_BIN_RELEASE%64
+xcopy /r /d /y "%MG_OEM_JSONCPP_BIN_DIR%\lib_json.dll" %WEB_BIN_RELEASE%64
 
 echo Copying Xerces Release DLL to %WEB_BIN_RELEASE%64
-xcopy /r /d /y "..\..\..\Oem\dbxml\bin64\%2\xerces-c_3_1mg.dll" %WEB_BIN_RELEASE%64
+xcopy /r /d /y "%MG_OEM_DBXML_BIN_DIR%\xerces-c_3_1mg.dll" %WEB_BIN_RELEASE%64
 
 echo Copying MgFoundation Release DLL to %WEB_BIN_RELEASE%64
 xcopy /r /d /y %COMMON_BIN_RELEASE%64\MgFoundation.dll %WEB_BIN_RELEASE%64
@@ -115,16 +115,16 @@
 if not exist %WEB_BIN_DEBUG% mkdir %WEB_BIN_DEBUG%
 
 echo Copying ACE Debug DLL to %WEB_BIN_DEBUG%
-xcopy /r /d /y "..\..\..\Oem\ACE\ACE_wrappers\lib\%2\ACEd.dll" %WEB_BIN_DEBUG%
+xcopy /r /d /y "%MG_OEM_ACE_BIN_DIR%\ACEd.dll" %WEB_BIN_DEBUG%
 
 echo Copying GEOS Debug DLL to %WEB_BIN_DEBUG%
-xcopy /r /d /y "..\..\..\Oem\geos\VisualStudio\%2\GEOSd.dll" %WEB_BIN_DEBUG%
+xcopy /r /d /y "%MG_OEM_GEOS_BIN_DIR%\GEOSd.dll" %WEB_BIN_DEBUG%
 
 echo Copying JSON Debug DLL to %WEB_BIN_DEBUG%
-xcopy /r /d /y "..\..\..\Oem\jsoncpp\lib\%2\lib_jsond.dll" %WEB_BIN_DEBUG%
+xcopy /r /d /y "%MG_OEM_JSONCPP_BIN_DIR%\lib_jsond.dll" %WEB_BIN_DEBUG%
 
 echo Copying Xerces Debug DLL to %WEB_BIN_DEBUG%
-xcopy /r /d /y "..\..\..\Oem\dbxml\bin\%2\xerces-c_3_1mgD.dll" %WEB_BIN_DEBUG%
+xcopy /r /d /y "%MG_OEM_DBXML_BIN_DIR%\xerces-c_3_1mgD.dll" %WEB_BIN_DEBUG%
 
 echo Copying MgFoundation Debug DLL to %WEB_BIN_DEBUG%
 xcopy /r /d /y %COMMON_BIN_DEBUG%\MgFoundationd.dll %WEB_BIN_DEBUG%
@@ -155,16 +155,16 @@
 if not exist %WEB_BIN_DEBUG%64 mkdir %WEB_BIN_DEBUG%64
 
 echo Copying ACE Debug DLL to %WEB_BIN_DEBUG%64
-xcopy /r /d /y "..\..\..\Oem\ACE\ACE_wrappers\lib64\%2\ACEd.dll" %WEB_BIN_DEBUG%64
+xcopy /r /d /y "%MG_OEM_ACE_BIN_DIR%\ACEd.dll" %WEB_BIN_DEBUG%64
 
 echo Copying GEOS Debug DLL to %WEB_BIN_DEBUG%64
-xcopy /r /d /y "..\..\..\Oem\geos\VisualStudio\%264\GEOSd.dll" %WEB_BIN_DEBUG%64
+xcopy /r /d /y "%MG_OEM_GEOS_BIN_DIR%\GEOSd.dll" %WEB_BIN_DEBUG%64
 
 echo Copying JSON Debug DLL to %WEB_BIN_DEBUG%64
-xcopy /r /d /y "..\..\..\Oem\jsoncpp\lib64\%2\lib_jsond.dll" %WEB_BIN_DEBUG%64
+xcopy /r /d /y "%MG_OEM_JSONCPP_BIN_DIR%\lib_jsond.dll" %WEB_BIN_DEBUG%64
 
 echo Copying Xerces Debug DLL to %WEB_BIN_DEBUG%64
-xcopy /r /d /y "..\..\..\Oem\dbxml\bin64\%2\xerces-c_3_1mgD.dll" %WEB_BIN_DEBUG%64
+xcopy /r /d /y "%MG_OEM_DBXML_BIN_DIR%\xerces-c_3_1mgD.dll" %WEB_BIN_DEBUG%64
 
 echo Copying MgFoundation Debug DLL to %WEB_BIN_DEBUG%64
 xcopy /r /d /y %COMMON_BIN_DEBUG%64\MgFoundationd.dll %WEB_BIN_DEBUG%64