[mapguide-commits] r9422 - in trunk/MgDev: . Web/src/HttpHandler

svn_mapguide at osgeo.org svn_mapguide at osgeo.org
Fri Dec 14 07:28:35 PST 2018


Author: jng
Date: 2018-12-14 07:28:35 -0800 (Fri, 14 Dec 2018)
New Revision: 9422

Modified:
   trunk/MgDev/CMakeLists.txt
   trunk/MgDev/Web/src/HttpHandler/CMakeLists.txt
   trunk/MgDev/cmake_bootstrap.sh
Log:
#2786: Update cmake_bootstrap.sh to effectively be build_oem.sh with support for building all the internal thirdparty libs if required

Modified: trunk/MgDev/CMakeLists.txt
===================================================================
--- trunk/MgDev/CMakeLists.txt	2018-12-10 14:54:00 UTC (rev 9421)
+++ trunk/MgDev/CMakeLists.txt	2018-12-14 15:28:35 UTC (rev 9422)
@@ -207,26 +207,146 @@
 endif ()
 
 find_package(Sanitizers)
-find_package(GEOS REQUIRED)
-find_package(ACE REQUIRED)
-if (NOT INTERNAL_XERCES)
-    find_package(XercesC REQUIRED)
-else (NOT INTERNAL_XERCES)
-    message(STATUS "Using internal xerces-c")
-endif (NOT INTERNAL_XERCES)
-find_package(GD REQUIRED)
-find_package(Freetype REQUIRED)
-find_package(JPEG REQUIRED)
-find_package(PNG REQUIRED)
-find_package(FDO REQUIRED)
-find_package(CppUnit REQUIRED)
-find_package(TCLAP REQUIRED)
-find_package(LinuxApt REQUIRED)
-find_package(DbXmlInternal REQUIRED)
-if (INTERNAL_XERCES)
-    # This will be the same
-    set(XERCESC_INCLUDE_DIR "${DBXML_INCLUDE_DIR}")
-endif (INTERNAL_XERCES)
+
+######################## Begin Thirdparty Section ###############################
+
+set(INTERNAL_ACE true)
+set(INTERNAL_JSONCPP true)
+set(INTERNAL_GD true)
+
+# ACE
+if (NOT INTERNAL_ACE)
+    message(STATUS "Finding ACE (system)")
+    find_package(ACE REQUIRED)
+else (NOT INTERNAL_ACE)
+    message(STATUS "Setting up ACE (internal)")
+    set(ACE_BUILD_BITS 32)
+    set(ACE_DEBUG 0)
+    set(ACE_OPTIMIZE 1)
+    if (CMAKE_BUILD_TYPE MATCHES Debug)
+        set(ACE_DEBUG 1)
+        set(ACE_OPTIMIZE 0)
+    endif (CMAKE_BUILD_TYPE MATCHES Debug)
+    if (MG_CPU EQUAL 64)
+        set(ACE_BUILD_BITS 64)
+    endif (MG_CPU EQUAL 64)
+    set(ACE_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/Oem/ACE)
+    set(ACE_WORKING_DIR ${CMAKE_CURRENT_BINARY_DIR}/Oem/ACE)
+    ExternalProject_Add(ACE
+        SOURCE_DIR ${ACE_SOURCE_DIR}
+        BINARY_DIR ${ACE_WORKING_DIR}
+        BUILD_IN_SOURCE 0
+        BUILD_COMMAND env ACE_ROOT=${ACE_WORKING_DIR}/ACE_wrappers make buildbits=${ACE_BUILD_BITS} debug=${ACE_DEBUG} optimize=${ACE_OPTIMIZE}
+    )
+endif (NOT INTERNAL_ACE)
+
+# DbXml
+
+# HTTPD
+
+# PHP
+
+# Tomcat Connector
+
+# CppUnit
+
+# ZLib
+if (NOT INTERNAL_ZLIB)
+    message(STATUS "Finding zlib (system)")
+    find_package(GD REQUIRED)
+else (NOT INTERNAL_ZLIB)
+    message(STATUS "Setting up zlib (internal)")
+    set(ZLIB_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/Oem/gd/zlib)
+    set(ZLIB_WORKING_DIR ${CMAKE_CURRENT_BINARY_DIR}/Oem/gd/zlib)
+    ExternalProject_Add(zlib
+        SOURCE_DIR ${FREETYPE_SOURCE_DIR}
+        BINARY_DIR ${FREETYPE_WORKING_DIR}
+        BUILD_IN_SOURCE 0
+        CONFIGURE_COMMAND ./configure
+        BUILD_COMMAND make
+    )
+endif (NOT INTERNAL_ZLIB)
+
+# LibPNG
+
+# Jpeg
+
+# freetype
+if (NOT INTERNAL_FREETYPE)
+    message(STATUS "Finding freetype (system)")
+    find_package(GD REQUIRED)
+else (NOT INTERNAL_FREETYPE)
+    message(STATUS "Setting up freetype (internal)")
+    set(FREETYPE_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/Oem/gd/gd)
+    set(FREETYPE_WORKING_DIR ${CMAKE_CURRENT_BINARY_DIR}/Oem/gd/gd)
+    ExternalProject_Add(freetype
+        SOURCE_DIR ${FREETYPE_SOURCE_DIR}
+        BINARY_DIR ${FREETYPE_WORKING_DIR}
+        BUILD_IN_SOURCE 0
+        CONFIGURE_COMMAND ./configure --enable-static --disable-shared --without-fontconfig --enable-silent-rules --with-pic 
+        BUILD_COMMAND make
+    )
+endif (NOT INTERNAL_FREETYPE)
+
+# gd
+if (NOT INTERNAL_GD)
+    message(STATUS "Finding GD (system)")
+    find_package(GD REQUIRED)
+else (NOT INTERNAL_GD)
+    message(STATUS "Setting up GD (internal)")
+    set(GD_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/Oem/gd/gd)
+    set(GD_WORKING_DIR ${CMAKE_CURRENT_BINARY_DIR}/Oem/gd/gd)
+    ExternalProject_Add(GD
+        SOURCE_DIR ${GD_SOURCE_DIR}
+        BINARY_DIR ${GD_WORKING_DIR}
+        BUILD_IN_SOURCE 0
+        CONFIGURE_COMMAND ./configure --enable-static --disable-shared --without-fontconfig --enable-silent-rules --with-pic 
+        BUILD_COMMAND make
+    )
+endif (NOT INTERNAL_GD)
+
+# jsoncpp
+
+if (NOT INTERNAL_JSONCPP)
+    message(STATUS "Finding JsonCpp (system)")
+    find_package (JsonCpp REQUIRED)
+else (NOT INTERNAL_JSONCPP)
+    message(STATUS "Setting up JsonCpp (internal)")
+    set(JSONCPP_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/Oem/jsoncpp)
+    set(JSONCPP_WORKING_DIR ${CMAKE_CURRENT_BINARY_DIR}/Oem/jsoncpp)
+    ExternalProject_Add(JsonCpp
+        SOURCE_DIR ${JSONCPP_SOURCE_DIR}
+        BINARY_DIR ${JSONCPP_WORKING_DIR}
+        BUILD_IN_SOURCE 0
+        BUILD_COMMAND scons platform=linux-gcc
+    )
+    set(JsonCpp_INCLUDE_DIR ${JSONCPP_WORKING_DIR}/include)
+    set(JsonCpp_LIBRARY lib_json)
+endif (NOT INTERNAL_JSONCPP)
+
+#find_package(GEOS REQUIRED)
+#find_package(ACE REQUIRED)
+#if (NOT INTERNAL_XERCES)
+#    find_package(XercesC REQUIRED)
+#else (NOT INTERNAL_XERCES)
+#    message(STATUS "Using internal xerces-c")
+#endif (NOT INTERNAL_XERCES)
+#find_package(GD REQUIRED)
+#find_package(Freetype REQUIRED)
+#find_package(JPEG REQUIRED)
+#find_package(PNG REQUIRED)
+#find_package(FDO REQUIRED)
+#find_package(CppUnit REQUIRED)
+#find_package(TCLAP REQUIRED)
+#find_package(LinuxApt REQUIRED)
+#find_package(DbXmlInternal REQUIRED)
+#if (INTERNAL_XERCES)
+#    # This will be the same
+#    set(XERCESC_INCLUDE_DIR "${DBXML_INCLUDE_DIR}")
+#endif (INTERNAL_XERCES)
+
+######################## End Thirdparty Section ###############################
+
 find_package(Ant REQUIRED)
 
 # Set internal tool paths

Modified: trunk/MgDev/Web/src/HttpHandler/CMakeLists.txt
===================================================================
--- trunk/MgDev/Web/src/HttpHandler/CMakeLists.txt	2018-12-10 14:54:00 UTC (rev 9421)
+++ trunk/MgDev/Web/src/HttpHandler/CMakeLists.txt	2018-12-14 15:28:35 UTC (rev 9422)
@@ -1,5 +1,3 @@
-find_package (JsonCpp REQUIRED)
-
 include_directories(${JsonCpp_INCLUDE_DIR}
     ${MG_COMMON_DIR}/MdfModel
     ${MG_COMMON_DIR}/Foundation

Modified: trunk/MgDev/cmake_bootstrap.sh
===================================================================
--- trunk/MgDev/cmake_bootstrap.sh	2018-12-10 14:54:00 UTC (rev 9421)
+++ trunk/MgDev/cmake_bootstrap.sh	2018-12-14 15:28:35 UTC (rev 9422)
@@ -2,6 +2,15 @@
 
 MG_INST_PREFIX=/usr/local/mapguideopensource-3.3.0
 OEM_WORK_DIR=~/mapguide_oem_build
+INTERNAL_ACE=0
+INTERNAL_CPPUNIT=0
+INTERNAL_ZLIB=0
+INTERNAL_LIBPNG=0
+INTERNAL_JPEG=0
+INTERNAL_FREETYPE=0
+INTERNAL_GD=0
+INTERNAL_JSON=0
+INTERNAL_GEOS=0
 BUILD_CPU=32
 BUILD_CONFIG=Release
 HAVE_SYSTEM_XERCES=0
@@ -24,6 +33,41 @@
             BUILD_CONFIG=$2
             shift
             ;;
+        --with-all-internal)
+            INTERNAL_ACE=1
+            INTERNAL_CPPUNIT=1
+            INTERNAL_ZLIB=1
+            INTERNAL_LIBPNG=1
+            INTERNAL_JPEG=1
+            INTERNAL_FREETYPE=1
+            INTERNAL_GD=1
+            INTERNAL_JSON=1
+            INTERNAL_GEOS=1
+            ;;
+        --with-internal-ace)
+            INTERNAL_ACE=1
+            ;;
+        --with-internal-cppunit)
+            INTERNAL_CPPUNIT=1
+            ;;
+        --with-internal-zlib)
+            INTERNAL_ZLIB=1
+            ;;
+        --with-internal-jpeg)
+            INTERNAL_JPEG=1
+            ;;
+        --with-internal-freetype)
+            INTERNAL_FREETYPE=1
+            ;;
+        --with-internal-gd)
+            INTERNAL_GD=1
+            ;;
+        --with-internal-json)
+            INTERNAL_JSON=1
+            ;;
+        --with-internal-geos)
+            INTERNAL_GEOS=1
+            ;;
         --have-system-xerces)
             HAVE_SYSTEM_XERCES=1
             ;;
@@ -39,6 +83,16 @@
             echo "  --config [Release(default)|Debug]"
             echo "  --have-system-xerces [Use system-installed xerces]"
             echo "  --help [Display usage]"
+            echo "  --with-internal-ace [Build/Use internal ACE]"
+            echo "  --with-internal-cppunit [Build/Use internal CppUnit]"
+            echo "  --with-internal-zlib [Build/Use internal zlib]"
+            echo "  --with-internal-jpeg [Build/Use internal jpeg]"
+            echo "  --with-internal-freetype [Build/Use internal freetype]"
+            echo "  --with-internal-gd [Build/Use internal GD]"
+            echo "  --with-internal-json [Build/Use internal JsonCpp]"
+            echo "  --with-internal-geos [Build/Use internal GEOS]"
+            echo "  --with-all-internal [Build/Use all internal libs]"
+            echo "  --with-ccache [Use ccache]"
             exit
             ;;
     esac
@@ -74,6 +128,15 @@
 echo "Using system xerces: $HAVE_SYSTEM_XERCES"
 echo "OEM Working Directory is: $OEM_WORK_DIR"
 echo "Using ccache: $USE_CCACHE"
+echo "INTERNAL_ACE      = $INTERNAL_ACE"
+echo "INTERNAL_CPPUNIT  = $INTERNAL_CPPUNIT"
+echo "INTERNAL_ZLIB     = $INTERNAL_ZLIB"
+echo "INTERNAL_LIBPNG   = $INTERNAL_LIBPNG"
+echo "INTERNAL_JPEG     = $INTERNAL_JPEG"
+echo "INTERNAL_FREETYPE = $INTERNAL_FREETYPE"
+echo "INTERNAL_GD       = $INTERNAL_GD"
+echo "INTERNAL_JSON     = $INTERNAL_JSON"
+echo "INTERNAL_GEOS     = $INTERNAL_GEOS"
 
 if [ "$USE_CCACHE" = "1" ]; then
     export CC="ccache gcc"
@@ -87,6 +150,133 @@
     echo "Created OEM working dir at: $OEM_WORK_DIR"
 fi
 
+OEM_INSTALL_STAGE="${OEM_WORK_DIR}/install"
+mkdir -p "$OEM_INSTALL_STAGE"
+
+if [ "$INTERNAL_ACE" = "1" ]; then
+    echo "Building ACE (internal)"
+    cp -Rf "${SOURCE_DIR}/Oem/ACE" "${OEM_WORK_DIR}/ACE"
+    ace_buildbits=32
+    ace_debug=0
+    ace_optimize=1
+    if [ $BUILD_CONFIG = "Debug" ]; then
+        ace_debug=1
+        ace_optimize=0
+    chmod +x bin/*.sh
+    fi
+    if [ $BUILD_CPU -eq 64 ]; then
+        ace_buildbits=64
+    fi
+    cd "${OEM_WORK_DIR}/ACE/ACE_wrappers" || exit
+    ACE_PATH="${PWD}"
+    cd ace || exit
+    env ACE_ROOT="${ACE_PATH}" make buildbits=$ace_buildbits debug=$ace_debug optimize=$ace_optimize
+    check_build
+fi
+if [ "$INTERNAL_CPPUNIT" = "1" ]; then
+    echo "Building CppUnit (internal)"
+    cp -Rf "${SOURCE_DIR}/Oem/CppUnit-1.9.14" "${OEM_WORK_DIR}/CppUnit"
+    cd "${OEM_WORK_DIR}/CppUnit" || exit
+    # Force regen of configure to cover our bases
+    aclocal -I config
+    libtoolize --copy --force
+    autoconf
+    automake --add-missing --copy --force-missing
+    # -ldl is to prevent undefined reference to dlsym/dlopen/dlclose
+    sh ./configure --enable-silent-rules --prefix="${MG_INST_PREFIX}" LDFLAGS="-ldl"
+    make && make install
+    check_build
+fi
+mkdir -p "${OEM_WORK_DIR}/gd"
+if [ "$INTERNAL_ZLIB" = "1" ]; then
+    echo "Building zlib (internal)"
+    cp -Rf "${SOURCE_DIR}/Oem/gd/zlib" "${OEM_WORK_DIR}/gd/zlib"
+    cd "${OEM_WORK_DIR}/gd/zlib" || exit
+    sh ./configure --prefix="${OEM_INSTALL_STAGE}/zlib"
+    make && make install
+    check_build
+fi
+if [ "$INTERNAL_LIBPNG" = "1" ]; then
+    echo "Building libpng (internal)"
+    cp -Rf "${SOURCE_DIR}/Oem/gd/lpng" "${OEM_WORK_DIR}/gd/lpng"
+    cd "${OEM_WORK_DIR}/gd/lpng" || exit
+    # Need to ensure these directories exist first for our custom prefix to work
+    mkdir -p "${OEM_INSTALL_STAGE}/libpng"
+    mkdir -p "${OEM_INSTALL_STAGE}/libpng/usr/local"
+    cp scripts/makefile.std makefile
+    if [ $BUILD_CPU -eq 64 ]; then
+        #Inject -fPIC to CFLAGS for 64-bit
+        sed 's/^CFLAGS=/CFLAGS= -fPIC -m64 /g' makefile > makefile64
+        make -fmakefile64 DESTDIR="${OEM_INSTALL_STAGE}/libpng"
+        make -fmakefile64 DESTDIR="${OEM_INSTALL_STAGE}/libpng" install
+        check_build
+    else
+        make && make DESTDIR="${OEM_INSTALL_STAGE}/libpng" install
+        check_build
+    fi
+fi
+if [ "$INTERNAL_JPEG" = "1" ]; then
+    echo "Building libjpeg (internal)"
+    cp -Rf "${SOURCE_DIR}/Oem/gd/jpeg" "${OEM_WORK_DIR}/gd/jpeg"
+    cd "${OEM_WORK_DIR}/gd/jpeg" || exit
+    # Need to ensure these directories exist first for our custom prefix to work
+    mkdir -p "${OEM_INSTALL_STAGE}/libjpeg/bin"
+    mkdir -p "${OEM_INSTALL_STAGE}/libjpeg/man/man1"
+    # A jconfig.h that is not modifed by ./configure will trip up make, so nuke it first
+    rm -f jconfig.h
+    if [ $BUILD_CPU -eq 64 ]; then
+        sh ./configure --enable-static --disable-shared --prefix="${OEM_INSTALL_STAGE}/libjpeg"
+        #--with-pic does nothing (probably ancient configure script), so do some sed trickery
+        #to inject this flag. Know a better way? Enlighten us :)
+        sed 's/^CFLAGS=/CFLAGS= -fPIC -m64 /g' Makefile > Makefile64
+        make -fMakefile64
+        check_build
+        make -fMakefile64 install
+        check_build
+    else
+        sh ./configure --enable-static --disable-shared --prefix="${OEM_INSTALL_STAGE}/libjpeg"
+        make
+        check_build
+        make install
+        check_build
+    fi
+    # Make some symlinks so that PHP can work with this
+    ln -s "${OEM_WORK_DIR}/gd/jpeg" "${OEM_INSTALL_STAGE}/libjpeg/include"
+    ln -s "${OEM_WORK_DIR}/gd/jpeg/.libs" "${OEM_INSTALL_STAGE}/libjpeg/lib"
+fi
+if [ "$INTERNAL_FREETYPE" = "1" ]; then
+    echo "Building freetype (internal)"
+    cp -Rf "${SOURCE_DIR}/Oem/gd/freetype" "${OEM_WORK_DIR}/gd/freetype"
+    cd "${OEM_WORK_DIR}/gd/freetype" || exit
+    if [ $BUILD_CPU -eq 64 ]; then
+        sh ./configure --enable-static --disable-shared --with-pic --prefix="${OEM_INSTALL_STAGE}/freetype"
+    else
+    	sh ./configure --enable-static --disable-shared --prefix="${OEM_INSTALL_STAGE}/freetype"
+    fi
+    make && make install
+    check_build
+fi
+if [ "$INTERNAL_GD" = "1" ]; then
+    echo "Building GD (internal)"
+    cp -Rf "${SOURCE_DIR}/Oem/gd/gd" "${OEM_WORK_DIR}/gd/gd"
+    cd "${OEM_WORK_DIR}/gd/gd" || exit
+    if [ $BUILD_CPU -eq 64 ]; then
+        sh ./configure --enable-static --disable-shared --without-fontconfig --enable-silent-rules --with-pic --prefix="${OEM_INSTALL_STAGE}/gd"
+    else
+        sh ./configure --enable-static --disable-shared --without-fontconfig --enable-silent-rules --prefix="${OEM_INSTALL_STAGE}/gd"
+    fi
+    make && make install
+    check_build
+fi
+if [ "$INTERNAL_JSON" = "1" ]; then
+    echo "Building JsonCpp (internal)"
+    cp -Rf "${SOURCE_DIR}/Oem/jsoncpp" "${OEM_WORK_DIR}/jsoncpp"
+    cd "${OEM_WORK_DIR}/jsoncpp" || exit
+    # Use system scons
+    scons platform=linux-gcc
+    check_build
+fi
+
 echo "Checking if we need to build DBXML"
 # Basically perform the same checks as FindDbXml.cmake
 HAS_DBXML_HEADERS=0
@@ -113,7 +303,7 @@
 # (Re)build DBXML if any of the above is false
 if test $HAS_DBXML_HEADERS -eq 0 -o $HAS_DBCXX_LIB -eq 0 -o $HAS_DBXML_LIB -eq 0 -o $HAS_XQILLA_LIB -eq 0; then
     echo "Re-building DBXML (${BUILD_CONFIG})"
-    cp -Rf Oem/dbxml "${OEM_WORK_DIR}/dbxml"
+    cp -Rf "${SOURCE_DIR}/Oem/dbxml" "${OEM_WORK_DIR}/dbxml"
     cd "${OEM_WORK_DIR}/dbxml" || exit
     if test $HAVE_SYSTEM_XERCES -eq 1; then
         echo "Building DBXML with system-installed xerces. Please wait"
@@ -202,14 +392,34 @@
     cd "$SOURCE_DIR/Oem/LinuxApt" || exit
     echo "Extracting PHP tarball"
     tar -jxf php-${PHP_VER}.tar.bz2 -C "${LA_WORKDIR}"
+
+    echo "Configuring PHP"
+    PHP_JPEG_DIR=/usr/lib
+    PHP_PNG_DIR=/usr/lib
+    PHP_FREETYPE_DIR=/usr/lib
+    PHP_ZLIB_DIR=/usr/lib
+    if [ "$INTERNAL_JPEG" = "1" ]; then
+        PHP_JPEG_DIR="$OEM_WORK_DIR/install/libjpeg"
+    fi
+    if [ "$INTERNAL_LIBPNG" = "1" ]; then
+        PHP_PNG_DIR="$OEM_WORK_DIR/install/libpng/usr/local"
+    fi    
+    if [ "$INTERNAL_FREETYPE" = "1" ]; then
+        PHP_FREETYPE_DIR="$OEM_WORK_DIR/install/freetype"
+    fi
+    if [ "$INTERNAL_ZLIB" = "1" ]; then
+        PHP_ZLIB_DIR="$OEM_WORK_DIR/install/zlib"
+    fi
     cd "${PHP_WORKDIR}" || exit
-    echo "Configuring PHP"
-    ./configure --prefix="${MG_INSTALL_WEB_PREFIX}/php" --with-apxs2="${MG_INSTALL_WEB_PREFIX}/apache2/bin/apxs" --with-openssl --with-curl --enable-xml --enable-wddx --enable-shared --with-zlib --enable-zip --enable-mbstring=all --with-xsl=/usr/lib --with-gd --with-png-dir=/usr/lib --with-jpeg-dir=/usr/lib --with-freetype-dir=/usr/lib 2>&1 | tee "$OEM_WORK_DIR/configure_php.log"
+    # TODO: Patch out the use of meta_ccld so ccache can work: https://bugs.php.net/bug.php?id=75940
+    # if/when we finally move to PHP 7, this patch is already applied
+    ./configure --prefix="${MG_INSTALL_WEB_PREFIX}/php" --with-apxs2="${MG_INSTALL_WEB_PREFIX}/apache2/bin/apxs" --with-openssl --with-curl --enable-xml --enable-wddx --enable-shared --with-zlib-dir="$PHP_ZLIB_DIR" --enable-zip --enable-mbstring=all --with-xsl=/usr/lib --with-gd --with-png-dir="$PHP_PNG_DIR" --with-jpeg-dir="$PHP_JPEG_DIR" --with-freetype-dir="$PHP_FREETYPE_DIR" 2>&1 | tee "$OEM_WORK_DIR/configure_php.log"
     check_build
     echo "Building PHP. Please wait"
     make 2>&1 | tee "$OEM_WORK_DIR/make_php.log"
     check_build
 fi
+
 cd "${PHP_WORKDIR}" || exit
 echo "Installing PHP"
 make install 2>&1 | tee "$OEM_WORK_DIR/make_install_php.log"
@@ -244,6 +454,15 @@
     echo "export HTTPD_PORT=$HTTPD_PORT"
     echo "export TOMCAT_PORT=$TOMCAT_PORT"
     echo "export HAVE_SYSTEM_XERCES=$HAVE_SYSTEM_XERCES"
+    echo "export INTERNAL_ACE=$INTERNAL_ACE"
+    echo "export INTERNAL_CPPUNIT=$INTERNAL_CPPUNIT"
+    echo "export INTERNAL_ZLIB=$INTERNAL_ZLIB"
+    echo "export INTERNAL_LIBPNG=$INTERNAL_LIBPNG"
+    echo "export INTERNAL_JPEG=$INTERNAL_JPEG"
+    echo "export INTERNAL_FREETYPE=$INTERNAL_FREETYPE"
+    echo "export INTERNAL_GD=$INTERNAL_GD"
+    echo "export INTERNAL_JSON=$INTERNAL_JSON"
+    echo "export INTERNAL_GEOS=$INTERNAL_GEOS"
 } > "$OEM_WORK_DIR/env_vars.sh"
 chmod +x "$OEM_WORK_DIR/env_vars.sh"
 



More information about the mapguide-commits mailing list