[mapguide-commits] r9581 - in trunk/MgDev: . Common/Renderers

[svn_mapguide at osgeo.org]

Author: jng
Date: 2019-07-23 05:21:39 -0700 (Tue, 23 Jul 2019)
New Revision: 9581

Modified:
   trunk/MgDev/Common/Renderers/CMakeLists.txt
   trunk/MgDev/cmake_linuxapt.sh
Log:
Fix up cmake build in light of recent changes

Modified: trunk/MgDev/Common/Renderers/CMakeLists.txt
===================================================================
--- trunk/MgDev/Common/Renderers/CMakeLists.txt	2019-07-18 16:00:59 UTC (rev 9580)
+++ trunk/MgDev/Common/Renderers/CMakeLists.txt	2019-07-23 12:21:39 UTC (rev 9581)
@@ -33,10 +33,7 @@
     ${MG_OEM_AGG_SOURCE_DIR}/agg_trans_affine.cpp
     ${MG_OEM_AGG_SOURCE_DIR}/agg_vcgen_contour.cpp
     ${MG_OEM_AGG_SOURCE_DIR}/agg_vcgen_stroke.cpp
-    GDFillPatterns.cpp
-    GDRenderer.cpp
     GDUtils.cpp
-    GDW2DRewriter.cpp
     KmlContent.cpp
     KmlLineStyle.cpp
     KmlPolyStyle.cpp
@@ -50,7 +47,6 @@
     UTFGridRenderer.cpp
     UTFGridContent.cpp
     W2DRewriter.cpp
-    complex_polygon_gd.cpp
 )
 
 add_definitions(-DDWFTK_BUILD_EXPAT)

Modified: trunk/MgDev/cmake_linuxapt.sh
===================================================================
--- trunk/MgDev/cmake_linuxapt.sh	2019-07-18 16:00:59 UTC (rev 9580)
+++ trunk/MgDev/cmake_linuxapt.sh	2019-07-23 12:21:39 UTC (rev 9581)
@@ -119,9 +119,11 @@
     echo "Created LinuxApt working dir at: $LINUXAPT_WORK_DIR"
 fi
 
-PHP_VER=5.6.33
-HTTPD_VER=2.4.29
-TC_VER=1.2.42
+PHP_VER=5.6.40
+HTTPD_VER=2.4.37
+TC_VER=1.2.46
+APR_VER=1.6.5
+APR_UTIL_VER=1.6.1
 
 HTTPD_PORT=8008
 TOMCAT_PORT=8009
@@ -158,9 +160,19 @@
 
 if test $HAS_HTTPD -eq 0; then
     cd "$SOURCE_DIR/Oem/LinuxApt" || exit
-    echo "Extracting HTTPD tarballs"
+    echo "Extracting httpd tarballs"
     tar -jxf httpd-${HTTPD_VER}.tar.bz2 -C "${LA_WORKDIR}"
-    tar -jxf httpd-${HTTPD_VER}-deps.tar.bz2 -C "${LA_WORKDIR}"
+    #tar -jxf httpd-${HTTPD_VER}-deps.tar.bz2 -C "${LA_WORKDIR}"
+    if [ ! -d "${LA_WORKDIR}/httpd-$HTTPD_VER/srclib/apr" ]; then
+        echo "Extracting apr tarball"
+        tar -jxf apr-$APR_VER.tar.bz2 -C "${LA_WORKDIR}"
+        mv "${LA_WORKDIR}/apr-$APR_VER" "${LA_WORKDIR}/httpd-$HTTPD_VER/srclib/apr"
+    fi
+    if [ ! -d "${LA_WORKDIR}/httpd-$HTTPD_VER/srclib/aprutil" ]; then
+        echo "Extracting apr-util tarball"
+        tar -jxf apr-util-$APR_UTIL_VER.tar.bz2 -C "${LA_WORKDIR}"
+        mv "${LA_WORKDIR}/apr-util-$APR_UTIL_VER" "${LA_WORKDIR}/httpd-$HTTPD_VER/srclib/apr-util"
+    fi
     cd "${HTTPD_WORKDIR}" || exit
     echo "Configuring HTTPD"
     ./configure --prefix="${MG_INSTALL_WEB_PREFIX}/apache2" --enable-mods-shared-all --with-included-apr --with-port=${HTTPD_PORT} 2>&1 | tee "$LINUXAPT_WORK_DIR/configure_httpd_fake.log"