[mapguide-commits] r9985 - in trunk/MgDev: . Oem
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Thu Oct 13 02:17:25 PDT 2022
Author: jng
Date: 2022-10-13 02:17:25 -0700 (Thu, 13 Oct 2022)
New Revision: 9985
Removed:
trunk/MgDev/Oem/Makefile.am
trunk/MgDev/Oem/SWIGEx/
trunk/MgDev/build_oem.sh
Modified:
trunk/MgDev/Oem/CMakeLists.txt
Log:
#2852: Remove Oem/SWIGEx. SWIG is now a tool that must be externally acquired.
#2853: Remove Oem/Makefile.am and build_oem.sh
Modified: trunk/MgDev/Oem/CMakeLists.txt
===================================================================
--- trunk/MgDev/Oem/CMakeLists.txt 2022-10-13 09:08:46 UTC (rev 9984)
+++ trunk/MgDev/Oem/CMakeLists.txt 2022-10-13 09:17:25 UTC (rev 9985)
@@ -32,6 +32,5 @@
if (NOT MG_COMMON_SUBSET_ONLY)
add_subdirectory(zlib_minizip)
- add_subdirectory(SWIGEx)
add_subdirectory(LinuxApt)
endif (NOT MG_COMMON_SUBSET_ONLY)
\ No newline at end of file
Deleted: trunk/MgDev/Oem/Makefile.am
===================================================================
--- trunk/MgDev/Oem/Makefile.am 2022-10-13 09:08:46 UTC (rev 9984)
+++ trunk/MgDev/Oem/Makefile.am 2022-10-13 09:17:25 UTC (rev 9985)
@@ -1,21 +0,0 @@
-AUTOMAKE_OPTIONS = foreign
-prefix=@prefix@
-
-SUBDIRS = $(map_opt_oem_subdirs)
-DIST_SUBDIRS =
-EXTRA_DIST = ACE CsMap jsoncpp CppUnit-1.9.14 dbxml DWFTK FDO/ProviderList/ServerCommunity fusion fusionMG gd agg-2.4 geos-2.2.0 jsoncpp LinuxApt php SQLite SWIGEx oem.sln
-
-dist-hook:
-
-
-install-exec-am:
- @mkdir -p ${prefix}/lib
- @cp -fp ACE/ACE_wrappers/ace/*.so ${prefix}/lib
- @cp -fp jsoncpp/lib/*.so ${prefix}/lib
- @cp -fpd dbxml/install/lib/libxerces-c*.so* ${prefix}/lib
- @cp -fpd dbxml/install/lib/libxqilla*.so* ${prefix}/lib
- @cp -fpd dbxml/install/lib/libdb-*.so* ${prefix}/lib
- @cp -fpd dbxml/install/lib/libdb_cxx*.so* ${prefix}/lib
- @cp -fpd dbxml/install/lib/libdbxml*.so* ${prefix}/lib
- @cp -fp DWFTK/develop/global/src/dwfcore/.libs/libdwfcore-* ${prefix}/lib
- @cp -fp DWFTK/develop/global/src/dwf/.libs/libdwftk-* ${prefix}/lib
Deleted: trunk/MgDev/build_oem.sh
===================================================================
--- trunk/MgDev/build_oem.sh 2022-10-13 09:08:46 UTC (rev 9984)
+++ trunk/MgDev/build_oem.sh 2022-10-13 09:17:25 UTC (rev 9985)
@@ -1,700 +0,0 @@
-#
-#! /bin/bash
-#
-
-#
-# MapGuide Open Source build script.
-#
-
-#**********************************************************
-# Initialization
-#**********************************************************
-
-echo "MapGuide Open Source build script for OEM components"
-INSTALLDIR=/usr/local/mapguideopensource
-CLEAN_FLAG=0
-BUILD_CPU=32
-BUILD_CONFIG=release
-while [ $# -gt 0 ]; do # Until you run out of parameters...
- case "$1" in
- -prefix|--prefix)
- INSTALLDIR="$2"
- shift
- ;;
- -clean|--clean)
- CLEAN_FLAG=1
- shift
- ;;
- -build|--build)
- BUILD_CPU=$2
- shift
- ;;
- -config|--config)
- BUILD_CONFIG=$2
- shift
- ;;
- -help|--help)
- echo "Usage: $0 (options)"
- echo "Options:"
- echo " --prefix [installation directory]"
- echo " --clean [clean all objects and binaries in Oem]"
- echo " --build [32(default)|64]"
- echo " --config [release(default)|debug]"
- echo " --help [Display usage]"
- exit
- ;;
- esac
- shift # Check next set of parameters.
-done
-
-echo "OEM Build Initialization ............................"
-echo "Oem Libraries will be installed at: ${INSTALLDIR}"
-
-LIB_NAME=""
-
-#**********************************************************
-# Generic Functions
-#**********************************************************
-
-check_build()
-{
- error=$?
- if [ $error -ne 0 ]; then
- echo "$LIB_NAME: Error build failed ($error)................."
- exit $error
- fi
-}
-
-check_clean()
-{
- error=$?
- if [ $error -ne 0 ]; then
- echo "$LIB_NAME: Error clean failed ($error)................."
- exit $error
- fi
-}
-
-#**********************************************************
-# Build Apache/PHP
-# Notes: none
-#**********************************************************
-
-init_linuxapt()
-{
- LIB_NAME="Apache/PHP/Tomcat"
-}
-
-build_linuxapt()
-{
- pushd LinuxApt
- ./build_apt.sh --prefix "${INSTALLDIR}" --with-tomcat
- check_build
- popd
-}
-
-clean_linuxapt()
-{
- echo "Nothing to clean for LinuxApt"
-}
-
-#**********************************************************
-# Build ACE 6.2.6
-# Notes: none
-#**********************************************************
-
-init_ace()
-{
- LIB_NAME="ACE 6.2.6"
- 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
-}
-
-build_ace()
-{
- pushd ACE/ACE_wrappers
- ACE_PATH="${PWD}"
- pushd ace
- env ACE_ROOT="${ACE_PATH}" make buildbits=$ace_buildbits debug=$ace_debug optimize=$ace_optimize
- check_build
- popd
- popd
-}
-
-clean_ace()
-{
- pushd ACE/ACE_wrappers
- ACE_PATH="${PWD}"
- pushd ace
- env ACE_ROOT="${ACE_PATH}" make clean buildbits=$ace_buildbits debug=$ace_debug optimize=$ace_optimize
- check_clean
- popd
- popd
-}
-
-#**********************************************************
-# Build DWFCORE 1.0
-# Notes: none
-#**********************************************************
-
-init_dwfcore()
-{
- LIB_NAME="DWFCORE 1.0"
- pushd DWFTK/develop/global/build/gnu/dwfcore
- if [ $CLEAN_FLAG -eq 0 ]; then
- sh ./build_setup.sh
- fi
- popd
-}
-
-build_dwfcore()
-{
- pushd DWFTK/develop/global/src/dwfcore
- aclocal
- libtoolize --copy --force
- automake --add-missing --copy
- autoconf
- if [ $BUILD_CONFIG = "debug" ]; then
- sh ./configure --disable-optimized --enable-silent-rules --prefix="${INSTALLDIR}"
- else
- sh ./configure --enable-optimized --enable-silent-rules --prefix="${INSTALLDIR}"
- fi
- make
- check_build
- popd
-}
-
-clean_dwfcore()
-{
- pushd DWFTK/develop/global/src/dwfcore
- make clean
- check_clean
- popd
-}
-
-#**********************************************************
-# Build DWFTOOLKIT 7.7
-# Notes: none
-#**********************************************************
-
-init_dwftk()
-{
- LIB_NAME="DWFTK 7.7"
- pushd DWFTK/develop/global/build/gnu/dwftoolkit
- if [ $CLEAN_FLAG -eq 0 ]; then
- sh ./build_setup.sh
- fi
- popd
-}
-
-build_dwftk()
-{
- pushd DWFTK/develop/global/src/dwf
- aclocal
- libtoolize --copy --force
- automake --add-missing --copy
- autoconf
- if [ $BUILD_CONFIG = "debug" ]; then
- sh ./configure --disable-optimized --enable-silent-rules --prefix="${INSTALLDIR}"
- else
- sh ./configure --enable-optimized --enable-silent-rules --prefix="${INSTALLDIR}"
- fi
- make
- check_build
- popd
-}
-
-clean_dwftk()
-{
- pushd DWFTK/develop/global/src/dwf
- make clean
- check_clean
- popd
-}
-
-#**********************************************************
-# Build GEOS 3.4.2
-# Notes: none
-#**********************************************************
-
-init_geos()
-{
- LIB_NAME="GEOS 3.4.2"
-}
-
-build_geos()
-{
- pushd geos
- # For this version of GEOS, don't run the aclocal/libtoolize/automake/autoconf quartet as we normally do, as it
- # may produce an unusable configure script. Just run autoreconf to regenerate the configure script from configure.in
- autoreconf
-
- # Fix for error:
- # virtual void geos::geom::GeometryComponentFilter::filter_ro(const geos::geom::Geometry*): Assertion `0' failed
- #
- # Based on this GEOS ticket: https://trac.osgeo.org/geos/ticket/469
- # The fix to to set the appropriate CFLAGS/CPPFLAGS/CXXFLAGS/LDFLAGS/FFLAGS before calling the configure script
- #
- # If we upgrade our internal copy of GEOS in the future, this should be reviewed
- chmod +x configure
- if [ $BUILD_CPU -eq 64 ]; then
- CFLAGS="-m64" CPPFLAGS="-m64" CXXFLAGS="-m64" LDFLAGS="-m64" FFLAGS="-m64" LDFLAGS="-L/usr/lib64" ./configure --with-pic --enable-silent-rules --prefix="${INSTALLDIR}"
- else
- CFLAGS="-m32" CPPFLAGS="-m32" CXXFLAGS="-m32" LDFLAGS="-m32" FFLAGS="-m32" LDFLAGS="-L/usr/lib" ./configure --enable-silent-rules --prefix="${INSTALLDIR}"
- fi
- make
- # The check build is disabled as the build will fail with automake version < 2.59
- check_build
- popd
-}
-
-clean_geos()
-{
- pushd geos
- make clean
- check_clean
- popd
-}
-
-#**********************************************************
-# Build SWIGEx 1.0
-# Notes: none
-#**********************************************************
-
-init_swigex()
-{
- LIB_NAME="SWIGEx 1.0"
-}
-
-build_swigex()
-{
- pushd SWIGEx
- mkdir -p Linux/obj/release
- make
- check_build
- popd
-}
-
-clean_swigex()
-{
- pushd SWIGEx
- # Note: the qmake system is required to regenerate the Makefile.
- # This is disabled.
- # make clean
- # check_clean
- popd
-}
-
-#**********************************************************
-# Build BDBXML
-# Notes: none
-#**********************************************************
-
-init_bdbxml()
-{
- LIB_NAME="BDBXML"
-}
-
-build_bdbxml()
-{
- # Need to force regen of the correct xerces config header before building dbxml proper
- pushd dbxml/xerces-c-src
- sh ./configure
- popd
- # Also need to check and set executable flag for s_paths
- pushd dbxml/dbxml/dist
- chmod +x s_paths
- popd
- pushd dbxml
- if [ $BUILD_CONFIG = "debug" ]; then
- sh ./buildall.sh --enable-debug
- else
- sh ./buildall.sh
- fi
- check_build
- popd
-}
-
-clean_bdbxml()
-{
- pushd dbxml
- sh ./buildall.sh --clean
- check_clean
- popd
-}
-
-#**********************************************************
-# Build CPPUNIT 1.9.14
-# Notes: none
-#**********************************************************
-
-init_cppunit()
-{
- LIB_NAME="CPPUNIT 1.9.14"
-}
-
-build_cppunit()
-{
- pushd CppUnit-1.9.14
- # 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="${INSTALLDIR}" LDFLAGS="-ldl"
- make
- check_build
- popd
-}
-
-clean_cppunit()
-{
- pushd CppUnit-1.9.14
- make clean
- check_clean
- popd
-}
-
-#**********************************************************
-# Build IMake 1.0
-# Notes: none
-#**********************************************************
-
-init_imake()
-{
- LIB_NAME="IMake 1.0"
-}
-
-build_imake()
-{
- pushd ../BuildTools/WebTools/IMake
- mkdir -p Linux/obj/debug
- make
- check_build
- popd
-}
-
-clean_imake()
-{
- pushd ../BuildTools/WebTools/IMake
- # Note: does not support clean as qmake is needed to regenerate the Makefile.
- # make clean
- # check_clean
- popd
-}
-
-#**********************************************************
-# Build ZLIB 1.2.3
-# Notes: none
-#**********************************************************
-
-init_zlib()
-{
- LIB_NAME="ZLIB 1.2.3"
-}
-
-build_zlib()
-{
- pushd gd/zlib
- sh ./configure
- make
- check_build
- popd
-}
-
-clean_zlib()
-{
- pushd gd/zlib
- make clean
- check_clean
- popd
-}
-
-#**********************************************************
-# Build LIBPNG 1.2.8
-# Notes: none
-#**********************************************************
-
-init_libpng()
-{
- LIB_NAME="LIBPNG 1.2.8"
-}
-
-build_libpng()
-{
- pushd gd/lpng
- 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
- else
- make
- fi
- check_build
- popd
-}
-
-clean_libpng()
-{
- pushd gd/lpng
- make clean
- check_clean
- popd
-}
-
-#**********************************************************
-# Build JPEG 6b
-# Notes: none
-#**********************************************************
-
-init_jpeg()
-{
- LIB_NAME="JPEG 6b"
-}
-
-build_jpeg()
-{
- pushd gd/jpeg
- # 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
- #--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
- else
- sh ./configure --enable-static --disable-shared
- make
- fi
- check_build
- popd
-}
-
-clean_jpeg()
-{
- pushd gd/jpeg
- make clean
- check_clean
- popd
-}
-
-#**********************************************************
-# Build FREETYPE 2.1.10
-# Notes: none
-#**********************************************************
-
-init_freetype()
-{
- LIB_NAME="FREETYPE 2.1.10"
-}
-
-build_freetype()
-{
- pushd gd/freetype
- if [ $BUILD_CPU -eq 64 ]; then
- sh ./configure --enable-static --disable-shared --with-pic
- else
- sh ./configure --enable-static --disable-shared
- fi
- make
- check_build
- popd
-}
-
-clean_freetype()
-{
- pushd gd/freetype
- make clean
- check_clean
- popd
-}
-
-#**********************************************************
-# Build GD 2.0.33
-# Notes: none
-#**********************************************************
-
-init_gd()
-{
- LIB_NAME="GD 2.0.33"
-}
-
-build_gd()
-{
- pushd gd/gd
- if [ $BUILD_CPU -eq 64 ]; then
- sh ./configure --enable-static --disable-shared --without-fontconfig --enable-silent-rules --with-pic
- else
- sh ./configure --enable-static --disable-shared --without-fontconfig --enable-silent-rules
- fi
- make
- check_build
- popd
-}
-
-clean_gd()
-{
- pushd gd/gd
- make clean
- check_clean
- popd
-}
-
-#**********************************************************
-# Build AGG 2.4
-# Notes: none
-#**********************************************************
-
-init_agg()
-{
- LIB_NAME="AGG 2.4"
-}
-
-build_agg()
-{
- pushd agg-2.4
- if [ $BUILD_CPU -eq 64 ]; then
- make EXTRACXXFLAGS="-fPIC -m64"
- else
- make
- fi
- check_build
- popd
-}
-
-clean_agg()
-{
- pushd agg-2.4
- make clean
- check_clean
- popd
-}
-
-#**********************************************************
-# Build JSON
-# Notes: none
-#**********************************************************
-
-init_json()
-{
- LIB_NAME="JSON"
-}
-
-build_json()
-{
- pushd jsoncpp
- # Use system scons
- scons platform=linux-gcc
- popd
-}
-
-clean_json()
-{
- pushd jsoncpp
- rm -rf lib buildscons dist
- popd
-}
-
-#**********************************************************
-# Build CSMAP
-# Notes: none
-#**********************************************************
-
-init_csmap()
-{
- LIB_NAME="CSMAP"
-}
-
-build_csmap()
-{
- pushd CsMap/CsMapDev
- mkdir -p .libs
- pushd Source
- if [ $BUILD_CPU -eq 64 ]; then
- make -fLibrary.mak PROCESSOR=x64
- else
- make -fLibrary.mak PROCESSOR=x86
- fi
- cp ../lib47/Linux$BUILD_CPU/CsMap.a ../.libs/libCsmap.a
- popd
- pushd Dictionaries
- if [ $BUILD_CPU -eq 64 ]; then
- make -fCompiler.mak PROCESSOR=x64
- else
- make -fCompiler.mak PROCESSOR=x86
- fi
-
- popd
- check_build
- popd
-}
-
-clean_csmap()
-{
- pushd CsMap/CsMapDev/Source
- if [ $BUILD_CPU -eq 64 ]; then
- make clean -fLibrary.mak PROCESSOR=x64
- else
- make clean -fLibrary.mak PROCESSOR=x86
- fi
- check_clean
- popd
-}
-
-#**********************************************************
-# Build Fusion
-# Notes: requires Apache Ant
-#**********************************************************
-
-init_fusion()
-{
- LIB_NAME="Fusion"
-}
-
-build_fusion()
-{
- pushd fusion
- ant prepare
- ant compress
- popd
-}
-
-clean_fusion()
-{
- pushd fusion
- ant clean
- popd
-}
-
-#**********************************************************
-# Script loop
-#**********************************************************
-
-pushd Oem
-for lib in linuxapt fusion ace dwfcore dwftk bdbxml cppunit imake zlib libpng jpeg freetype gd agg json csmap geos;
-do
- echo "$lib: Initialization..........................."
- init_"$lib"
-
- if test "$CLEAN_FLAG" = "1"; then
- echo "$lib: Clean ....................................."
- clean_"$lib"
- echo "$lib: Clean Successful .........................."
- else
- echo "$lib: Configure/Build ..........................."
- build_"$lib"
- echo "$lib: Build Successful .........................."
- fi
-done
-popd
More information about the mapguide-commits
mailing list