[mapguide-commits] r8254 - in sandbox/jng/ace62x: . Oem/ACE/ACE_wrappers/include/makeinclude Server/src/Core

[svn_mapguide at osgeo.org]

Author: jng
Date: 2014-06-21 03:10:51 -0700 (Sat, 21 Jun 2014)
New Revision: 8254

Added:
   sandbox/jng/ace62x/Oem/ACE/ACE_wrappers/include/makeinclude/platform_macros.GNU
Modified:
   sandbox/jng/ace62x/Server/src/Core/main.cpp
   sandbox/jng/ace62x/build_oem.sh
Log:
Updates to ensure new ACE builds on Linux

Added: sandbox/jng/ace62x/Oem/ACE/ACE_wrappers/include/makeinclude/platform_macros.GNU
===================================================================
--- sandbox/jng/ace62x/Oem/ACE/ACE_wrappers/include/makeinclude/platform_macros.GNU	                        (rev 0)
+++ sandbox/jng/ace62x/Oem/ACE/ACE_wrappers/include/makeinclude/platform_macros.GNU	2014-06-21 10:10:51 UTC (rev 8254)
@@ -0,0 +1 @@
+include ${ACE_ROOT}/include/makeinclude/platform_linux.GNU

Modified: sandbox/jng/ace62x/Server/src/Core/main.cpp
===================================================================
--- sandbox/jng/ace62x/Server/src/Core/main.cpp	2014-06-21 00:30:31 UTC (rev 8253)
+++ sandbox/jng/ace62x/Server/src/Core/main.cpp	2014-06-21 10:10:51 UTC (rev 8254)
@@ -29,6 +29,8 @@
 #define _CRTDBG_MAP_ALLOC
 #include <stdlib.h>
 #include <crtdbg.h>
+#else
+#include <malloc.h>
 #endif
 
 #ifdef _WIN32

Modified: sandbox/jng/ace62x/build_oem.sh
===================================================================
--- sandbox/jng/ace62x/build_oem.sh	2014-06-21 00:30:31 UTC (rev 8253)
+++ sandbox/jng/ace62x/build_oem.sh	2014-06-21 10:10:51 UTC (rev 8254)
@@ -75,19 +75,20 @@
 }
 
 #**********************************************************
-# Build ACE 5.7
+# Build ACE 6.2.6
 # Notes: none
 #**********************************************************
 
 init_ace()
 {
-    LIB_NAME="ACE 5.7"
+    LIB_NAME="ACE 6.2.6"
 }
 
 build_ace()
 {
     pushd ACE/ACE_wrappers
     ACE_PATH="${PWD}"
+    chmod +x bin/*.sh
     pushd ace
     env ACE_ROOT="${ACE_PATH}" make
     check_build