[mapguide-commits] r10002 - trunk/MgDev
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Tue Nov 1 03:29:05 PDT 2022
Author: jng
Date: 2022-11-01 03:29:04 -0700 (Tue, 01 Nov 2022)
New Revision: 10002
Modified:
trunk/MgDev/cmake_bootstrap.sh
trunk/MgDev/cmake_build.sh
Log:
#2855: Don't build cppunit in cmake_bootstrap.sh
Modified: trunk/MgDev/cmake_bootstrap.sh
===================================================================
--- trunk/MgDev/cmake_bootstrap.sh 2022-11-01 10:23:23 UTC (rev 10001)
+++ trunk/MgDev/cmake_bootstrap.sh 2022-11-01 10:29:04 UTC (rev 10002)
@@ -2,7 +2,6 @@
OEM_WORK_DIR=~/mapguide_oem_build
INTERNAL_ACE=0
-INTERNAL_CPPUNIT=0
INTERNAL_ZLIB=0
INTERNAL_LIBPNG=0
INTERNAL_JPEG=0
@@ -34,7 +33,6 @@
;;
--with-all-internal)
INTERNAL_ACE=1
- INTERNAL_CPPUNIT=1
INTERNAL_ZLIB=1
INTERNAL_LIBPNG=1
INTERNAL_JPEG=1
@@ -46,9 +44,6 @@
--with-internal-ace)
INTERNAL_ACE=1
;;
- --with-internal-cppunit)
- INTERNAL_CPPUNIT=1
- ;;
--with-internal-zlib)
INTERNAL_ZLIB=1
;;
@@ -85,7 +80,6 @@
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-libpng [Build/Use internal libpng]"
@@ -131,7 +125,6 @@
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"
@@ -200,22 +193,8 @@
env ACE_ROOT="${ACE_PATH}" make buildbits=$ace_buildbits debug=$ace_debug optimize=$ace_optimize
check_build
fi
-if [ "$COMMON_SUBSET_ONLY" != "1" -a "$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 LDFLAGS="-ldl"
- make && make install
- check_build
-fi
mkdir -p "${OEM_WORK_DIR}/gd"
-if [ "$COMMON_SUBSET_ONLY" != "1" -a "$INTERNAL_ZLIB" = "1" ]; then
+if [ "$COMMON_SUBSET_ONLY" != "1" ] && [ "$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
@@ -222,14 +201,14 @@
if [ "$USE_CCACHE" = "1" ]; then
# Aliasing CC=ccache gcc breaks the gcc check in this configure script that
# would've inserted the required -fPIC flag. So specify manually
- CFLAGS="-O3 -fPIC" sh ./configure
+ CFLAGS="-O3 -fPIC" sh ./configure --static
else
- sh ./configure
+ sh ./configure --static
fi
make && make install
check_build
fi
-if [ "$COMMON_SUBSET_ONLY" != "1" -a "$INTERNAL_LIBPNG" = "1" ]; then
+if [ "$COMMON_SUBSET_ONLY" != "1" ] && [ "$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
@@ -245,7 +224,7 @@
check_build
fi
fi
-if [ "$COMMON_SUBSET_ONLY" != "1" -a "$INTERNAL_JPEG" = "1" ]; then
+if [ "$COMMON_SUBSET_ONLY" != "1" ] && [ "$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
@@ -270,7 +249,7 @@
check_build
fi
fi
-if [ "$COMMON_SUBSET_ONLY" != "1" -a "$INTERNAL_FREETYPE" = "1" ]; then
+if [ "$COMMON_SUBSET_ONLY" != "1" ] && [ "$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
@@ -301,7 +280,7 @@
PHP_ZLIB_DIR="$OEM_WORK_DIR/install/zlib"
fi
-if [ "$COMMON_SUBSET_ONLY" != "1" -a "$INTERNAL_GD" = "1" ]; then
+if [ "$COMMON_SUBSET_ONLY" != "1" ] && [ "$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
@@ -424,10 +403,6 @@
if [ "$INTERNAL_ACE" = "1" ]; then
OUT_INTERNAL_ACE=TRUE
fi
-OUT_INTERNAL_CPPUNIT=FALSE
-if [ "$INTERNAL_CPPUNIT" = "1" ]; then
- OUT_INTERNAL_CPPUNIT=TRUE
-fi
OUT_INTERNAL_ZLIB=FALSE
if [ "$INTERNAL_ZLIB" = "1" ]; then
OUT_INTERNAL_ZLIB=TRUE
@@ -464,7 +439,6 @@
echo "export BUILD_CONFIG=$BUILD_CONFIG"
echo "export HAVE_SYSTEM_XERCES=$HAVE_SYSTEM_XERCES"
echo "export INTERNAL_ACE=$OUT_INTERNAL_ACE"
- echo "export INTERNAL_CPPUNIT=$OUT_INTERNAL_CPPUNIT"
echo "export INTERNAL_ZLIB=$OUT_INTERNAL_ZLIB"
echo "export INTERNAL_LIBPNG=$OUT_INTERNAL_LIBPNG"
echo "export INTERNAL_JPEG=$OUT_INTERNAL_JPEG"
Modified: trunk/MgDev/cmake_build.sh
===================================================================
--- trunk/MgDev/cmake_build.sh 2022-11-01 10:23:23 UTC (rev 10001)
+++ trunk/MgDev/cmake_build.sh 2022-11-01 10:29:04 UTC (rev 10002)
@@ -118,10 +118,10 @@
echo "Setting up CMake in: $CMAKE_BUILD_DIR"
cd "$CMAKE_BUILD_DIR" || exit
if test $USE_NINJA -eq 1; then
- cmake -G Ninja "$SOURCE_DIR" -DMG_INSTALL_PREFIX=$MG_INST_PREFIX -DMG_CPU=$BUILD_CPU -DWITH_JAVA=TRUE -DUSE_LD_GOLD=$USE_LD_GOLD -DSANITIZE_ADDRESS=$USE_ASAN -DPHP_VER=$PHP_VER -DHTTPD_VER=$HTTPD_VER -DCMAKE_BUILD_TYPE=$BUILD_CONFIG -DMG_OEM_WORK_DIR=$OEM_WORK_DIR -DMG_LINUXAPT_WORK_DIR=$LINUXAPT_WORK_DIR -DINTERNAL_XERCES=$INTERNAL_XERCES -DINTERNAL_ACE=$INTERNAL_ACE -DINTERNAL_CPPUNIT=$INTERNAL_CPPUNIT -DINTERNAL_ZLIB=$INTERNAL_ZLIB -DINTERNAL_JPEG=$INTERNAL_JPEG -DINTERNAL_PNG=$INTERNAL_PNG -DINTERNAL_FREETYPE=$INTERNAL_FREETYPE -DINTERNAL_GD=$INTERNAL_GD -DINTERNAL_JSON=$INTERNAL_JSON -DINTERNAL_GEOS=$INTERNAL_GEOS -DCOMMON_SUBSET_ONLY=$COMMON_SUBSET_ONLY
+ cmake -G Ninja "$SOURCE_DIR" -DMG_INSTALL_PREFIX=$MG_INST_PREFIX -DMG_CPU=$BUILD_CPU -DWITH_JAVA=TRUE -DUSE_LD_GOLD=$USE_LD_GOLD -DSANITIZE_ADDRESS=$USE_ASAN -DPHP_VER=$PHP_VER -DHTTPD_VER=$HTTPD_VER -DCMAKE_BUILD_TYPE=$BUILD_CONFIG -DMG_OEM_WORK_DIR=$OEM_WORK_DIR -DMG_LINUXAPT_WORK_DIR=$LINUXAPT_WORK_DIR -DINTERNAL_XERCES=$INTERNAL_XERCES -DINTERNAL_ACE=$INTERNAL_ACE -DINTERNAL_ZLIB=$INTERNAL_ZLIB -DINTERNAL_JPEG=$INTERNAL_JPEG -DINTERNAL_PNG=$INTERNAL_PNG -DINTERNAL_FREETYPE=$INTERNAL_FREETYPE -DINTERNAL_GD=$INTERNAL_GD -DINTERNAL_JSON=$INTERNAL_JSON -DINTERNAL_GEOS=$INTERNAL_GEOS -DCOMMON_SUBSET_ONLY=$COMMON_SUBSET_ONLY
check_build
else
- cmake "$SOURCE_DIR" -DMG_INSTALL_PREFIX=$MG_INST_PREFIX -DMG_CPU=$BUILD_CPU -DWITH_JAVA=TRUE -DUSE_LD_GOLD=$USE_LD_GOLD -DSANITIZE_ADDRESS=$USE_ASAN -DPHP_VER=$PHP_VER -DHTTPD_VER=$HTTPD_VER -DCMAKE_BUILD_TYPE=$BUILD_CONFIG -DMG_OEM_WORK_DIR=$OEM_WORK_DIR -DMG_LINUXAPT_WORK_DIR=$LINUXAPT_WORK_DIR -DINTERNAL_XERCES=$INTERNAL_XERCES -DINTERNAL_ACE=$INTERNAL_ACE -DINTERNAL_CPPUNIT=$INTERNAL_CPPUNIT -DINTERNAL_ZLIB=$INTERNAL_ZLIB -DINTERNAL_JPEG=$INTERNAL_JPEG -DINTERNAL_PNG=$INTERNAL_PNG -DINTERNAL_FREETYPE=$INTERNAL_FREETYPE -DINTERNAL_GD=$INTERNAL_GD -DINTERNAL_JSON=$INTERNAL_JSON -DINTERNAL_GEOS=$INTERNAL_GEOS -DCOMMON_SUBSET_ONLY=$COMMON_SUBSET_ONLY
+ cmake "$SOURCE_DIR" -DMG_INSTALL_PREFIX=$MG_INST_PREFIX -DMG_CPU=$BUILD_CPU -DWITH_JAVA=TRUE -DUSE_LD_GOLD=$USE_LD_GOLD -DSANITIZE_ADDRESS=$USE_ASAN -DPHP_VER=$PHP_VER -DHTTPD_VER=$HTTPD_VER -DCMAKE_BUILD_TYPE=$BUILD_CONFIG -DMG_OEM_WORK_DIR=$OEM_WORK_DIR -DMG_LINUXAPT_WORK_DIR=$LINUXAPT_WORK_DIR -DINTERNAL_XERCES=$INTERNAL_XERCES -DINTERNAL_ACE=$INTERNAL_ACE -DINTERNAL_ZLIB=$INTERNAL_ZLIB -DINTERNAL_JPEG=$INTERNAL_JPEG -DINTERNAL_PNG=$INTERNAL_PNG -DINTERNAL_FREETYPE=$INTERNAL_FREETYPE -DINTERNAL_GD=$INTERNAL_GD -DINTERNAL_JSON=$INTERNAL_JSON -DINTERNAL_GEOS=$INTERNAL_GEOS -DCOMMON_SUBSET_ONLY=$COMMON_SUBSET_ONLY
check_build
fi
cmake --build .
More information about the mapguide-commits
mailing list