[mapguide-commits] r8131 - branches/2.6/vagrant/scripts
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Wed May 14 15:46:15 PDT 2014
Author: jng
Date: 2014-05-14 15:46:15 -0700 (Wed, 14 May 2014)
New Revision: 8131
Added:
branches/2.6/vagrant/scripts/mapguidecommon_excludes.txt
branches/2.6/vagrant/scripts/platformbase_excludes.txt
Modified:
branches/2.6/vagrant/scripts/dpkgbuild.sh
branches/2.6/vagrant/scripts/dpkgmapguide.sh
branches/2.6/vagrant/scripts/mginstallubuntu.sh
branches/2.6/vagrant/scripts/mguninstallubuntu.sh
Log:
This submission includes the following changes:
- #2408: Split mapguideopensource-common into the following sub-packages:
- mapguideopensource-platformbase: Containing the PlatformBase components
- mapguideopensource-coordsys: Containing the CS-Map coordinate system dictionaries
- mapgudieopensource-common: Containing the MgMapGuideCommon and dbxml components
- Use rsync for copying files for packaging as this allows us to specify file exclusion lists
- Make dpkg-gensymbols quiet
- Use lzma compression for building deb packages which reduces overall file size
- Update install/uninstall scripts to ensure the new sub-packages are installed/uninstalled
Modified: branches/2.6/vagrant/scripts/dpkgbuild.sh
===================================================================
--- branches/2.6/vagrant/scripts/dpkgbuild.sh 2014-05-12 19:39:07 UTC (rev 8130)
+++ branches/2.6/vagrant/scripts/dpkgbuild.sh 2014-05-14 22:46:15 UTC (rev 8131)
@@ -14,7 +14,13 @@
for dirname in ${DIRLIST}
do
mkdir -p ${CPROOT}/${dirname}
- cp -ar /${MGINST}/${dirname} ${CPROOT}
+ #cp -ar /${MGINST}/${dirname} ${CPROOT}
+ echo "[rsync] From: /${MGINST}/${dirname}/ To: ${CPROOT}/${dirname}/"
+ if [ -z ${EXCLUDEFILE} ]; then
+ rsync -a /${MGINST}/${dirname}/ ${CPROOT}/${dirname}/
+ else
+ rsync -a --exclude-from=${EXCLUDEFILE} /${MGINST}/${dirname}/ ${CPROOT}/${dirname}/
+ fi
done
# Remove all files in the REMOVELIST
@@ -46,9 +52,10 @@
# Shared library symlinks point back to install directory
# Add install directory to path to compensate
# Also add FDO libs to path
-export LD_LIBRARY_PATH=/usr/local/fdo-3.5.0/lib:${CPROOT}/lib:/${MGINST}/lib
+export LD_LIBRARY_PATH=/usr/local/fdo-${FDOBUILD}/lib:${CPROOT}/lib:/${MGINST}/lib
+echo "Using LD_LIBRARY_PATH of $LD_LIBRARY_PATH"
dpkg-shlibdeps -p${PACKAGEDIR} --ignore-missing-info ${CPROOT}/lib/*.so
-dpkg-gensymbols -p"${PACKAGENAME}" -P"debian/${PACKAGEDIR}"
+dpkg-gensymbols -q -p"${PACKAGENAME}" -P"debian/${PACKAGEDIR}"
export LD_LIBRARY_PATH=
# Now generate a filled in control file for the binary package
@@ -57,7 +64,7 @@
# Build binary package from ROOT
# And move resulting debian package and lintian results to build directory
-dpkg-deb --build ${ROOT}
+dpkg-deb -Zlzma --build ${ROOT}
lintian -i debian/${PACKAGEDIR}.deb > tmp/${PACKAGEDIR}.lintian
mv debian/${PACKAGEDIR}.deb bin/${PACKAGENAME}_${MGBUILD}-${BUILDNUM}_${ARCH}.deb
popd
Modified: branches/2.6/vagrant/scripts/dpkgmapguide.sh
===================================================================
--- branches/2.6/vagrant/scripts/dpkgmapguide.sh 2014-05-12 19:39:07 UTC (rev 8130)
+++ branches/2.6/vagrant/scripts/dpkgmapguide.sh 2014-05-14 22:46:15 UTC (rev 8131)
@@ -6,25 +6,31 @@
# changelog - generated changelog file
# substvars - subst params created by dpkg-shlibdeps
# mapguidecommon/ - packaging directory for common MapGuide components
-# usr/local/mapguideopensource-2.4.0/ - copied tree for common components
+# usr/local/mapguideopensource-2.6.0/ - copied tree for common components
# DEBIAN/
# control - control file generated from dpkg-gencontrol
# symbols - symbols file generated from dpkg-gensymbols
#
+# mapguidecoordsys/ - packaging directory for CS-Map coordinate system dictionaries
+# usr/local/mapguideopensource-2.6.0/ - copied tree for common components
+# DEBIAN/
+# control - control file generated from dpkg-gencontrol
+# symbols - symbols file generated from dpkg-gensymbols
+#
# mapguideserver/ - packaging directory for MapGuide Server
-# usr/local/mapguideopensource-2.4.0/ - copied tree for Server
+# usr/local/mapguideopensource-2.6.0/ - copied tree for Server
# DEBIAN/
# control - control file generated from dpkg-gencontrol
# symbols - symbols file generated from dpkg-gensymbols
#
# mapguidewebextensions/ - packaging directory for Web Extensions
-# usr/local/mapguideopensource-2.4.0/ - copied tree for Web Extensions
+# usr/local/mapguideopensource-2.6.0/ - copied tree for Web Extensions
# DEBIAN/
# control - control file generated from dpkg-gencontrol
# symbols - symbols file generated from dpkg-gensymbols
#
# mapguidehttpd/ - packaging directory for Apache Bundle
-# usr/local/mapguideopensource-2.4.0/ - copied tree for Apache bundle
+# usr/local/mapguideopensource-2.6.0/ - copied tree for Apache bundle
# DEBIAN/
# control - control file generated from dpkg-gencontrol
# symbols - symbols file generated from dpkg-gensymbols
@@ -34,9 +40,8 @@
BUILDROOT=`pwd`
MGBUILD=2.6.0
+FDOBUILD=3.9.0
MGINST=usr/local/mapguideopensource-${MGBUILD}
-ROOT=${BUILDROOT}/debian/mapguidecommon
-TREE=${BUILDROOT}/debian
CPROOT=${ROOT}/${MGINST}
# Create output directory structure and ignore errors
@@ -90,13 +95,27 @@
Priority: optional
Homepage: http://mapguide.osgeo.org
+Package: mapguideopensource-platformbase
+Architecture: ${ARCH}
+Section: misc
+Priority: optional
+Depends: \${mapguideplatformbase:Depends}
+Description: Base platform components for OSGeo MapGuide ${MGBUILD}
+
Package: mapguideopensource-common
Architecture: ${ARCH}
Section: misc
Priority: optional
Depends: \${mapguidecommon:Depends}
-Description: OSGeo MapGuide ${MGBUILD} common components
+Description: OSGeo MapGuide ${MGBUILD} server-specific common components
+Package: mapguideopensource-coordsys
+Architecture: ${ARCH}
+Section: msic
+Priority: optional
+Depends: \${mapguidecoordsys:Depends}
+Description: CS-Map Coordinate System Dictionary data files
+
Package: mapguideopensource-server
Architecture: ${ARCH}
Section: misc
@@ -137,14 +156,44 @@
wget -N http://svn.osgeo.org/mapguide/trunk/MgDev/License.txt -O tmp/copyright
iconv -f ISO-8859-1 -t UTF-8 tmp/copyright > debian/copyright
+MGINST=usr/local/mapguideopensource-${MGBUILD}
+PACKAGENAME=mapguideopensource-platformbase
+PACKAGEDIR=mapguideplatformbase
+ROOT=${BUILDROOT}/debian/mapguideplatformbase
+TREE=${BUILDROOT}/debian
+CPROOT=${ROOT}/${MGINST}
+DIRLIST="lib"
+REMOVELIST="\.a\$ \.la\$"
+STRIPLIST="\.so\$ libdwf"
+EXCLUDEFILE=platformbase_excludes.txt
+
+source ./dpkgbuild.sh
+
+MGINST=usr/local/mapguideopensource-${MGBUILD}
PACKAGENAME=mapguideopensource-common
PACKAGEDIR=mapguidecommon
-DIRLIST="lib share"
+ROOT=${BUILDROOT}/debian/mapguidecommon
+TREE=${BUILDROOT}/debian
+CPROOT=${ROOT}/${MGINST}
+DIRLIST="lib"
REMOVELIST="\.a\$ \.la\$"
STRIPLIST="\.so\$ libdwf"
+EXCLUDEFILE=mapguidecommon_excludes.txt
source ./dpkgbuild.sh
+EXCLUDEFILE=
+PACKAGENAME=mapguideopensource-coordsys
+PACKAGEDIR=mapguidecoordsys
+ROOT=${BUILDROOT}/debian/mapguidecoordsys
+TREE=${BUILDROOT}/debian
+CPROOT=${ROOT}/${MGINST}
+DIRLIST="share"
+REMOVELIST="\.a\$ \.la\$ \.c\$ \.o\$ \.mak\$ \.nmk\$"
+STRIPLIST="\.so\$"
+
+source ./dpkgbuild.sh
+
MGINST=usr/local/mapguideopensource-${MGBUILD}/server
ROOT=${BUILDROOT}/debian/mapguideserver
TREE=${BUILDROOT}/debian
Added: branches/2.6/vagrant/scripts/mapguidecommon_excludes.txt
===================================================================
--- branches/2.6/vagrant/scripts/mapguidecommon_excludes.txt (rev 0)
+++ branches/2.6/vagrant/scripts/mapguidecommon_excludes.txt 2014-05-14 22:46:15 UTC (rev 8131)
@@ -0,0 +1,27 @@
+libACE.so
+libACE.so.5.8.0
+libdwfcore-1.1.1.so
+libdwfemap-1.0.0.so
+libdwftk-7.1.1.so
+libMgFoundation-2.6.0.so
+libMgFoundation.so
+libMgGeometry-2.6.0.so
+libMgGeometry.so
+libMgGwsCommon-2.6.0.so
+libMgGwsCommon.so
+libMgGwsQueryEngine-2.6.0.so
+libMgGwsQueryEngine.so
+libMgGwsResource-2.6.0.so
+libMgGwsResource.so
+libMgMdfModel-2.6.0.so
+libMgMdfModel.so
+libMgMdfParser-2.6.0.so
+libMgMdfParser.so
+libMgPlatformBase-2.6.0.so
+libMgPlatformBase.so
+libMgRenderers-2.6.0.so
+libMgRenderers.so
+libMgStylization-2.6.0.so
+libMgStylization.so
+libxerces-c-3.1.so
+libxerces-c.so
Modified: branches/2.6/vagrant/scripts/mginstallubuntu.sh
===================================================================
--- branches/2.6/vagrant/scripts/mginstallubuntu.sh 2014-05-12 19:39:07 UTC (rev 8130)
+++ branches/2.6/vagrant/scripts/mginstallubuntu.sh 2014-05-14 22:46:15 UTC (rev 8131)
@@ -1,7 +1,7 @@
#!/bin/bash
TEMPDIR=/tmp/build_mapguide
-URL="http://download.osgeo.org/mapguide/releases/2.6/Beta1/ubuntu14"
-#URL="http://192.168.0.5/downloads/ubuntu14"
+URL="http://download.osgeo.org/mapguide/releases/2.6/RC1/ubuntu12"
+#URL="http://192.168.0.5/downloads/ubuntu12"
FDOVER_MAJOR_MINOR=3.9
FDOVER_MAJOR_MINOR_REV=${FDOVER_MAJOR_MINOR}.0
FDOBUILD=0
@@ -310,7 +310,7 @@
install_mapguide_packages()
{
# Download Ubuntu packages for MapGuide
- for file in common server webextensions httpd
+ for file in platformbase coordsys common server webextensions httpd
do
echo "Downloading: ${URL}/mapguideopensource-${file}_${MGVER}.deb"
wget -N ${URL}/mapguideopensource-${file}_${MGVER}.deb
Modified: branches/2.6/vagrant/scripts/mguninstallubuntu.sh
===================================================================
--- branches/2.6/vagrant/scripts/mguninstallubuntu.sh 2014-05-12 19:39:07 UTC (rev 8130)
+++ branches/2.6/vagrant/scripts/mguninstallubuntu.sh 2014-05-14 22:46:15 UTC (rev 8131)
@@ -7,7 +7,7 @@
fi
# Remove Ubuntu packages for MapGuide
-for file in server webextensions httpd common
+for file in server webextensions httpd coordsys common platformbase
do
dpkg --remove mapguideopensource-${file}
done
Added: branches/2.6/vagrant/scripts/platformbase_excludes.txt
===================================================================
--- branches/2.6/vagrant/scripts/platformbase_excludes.txt (rev 0)
+++ branches/2.6/vagrant/scripts/platformbase_excludes.txt 2014-05-14 22:46:15 UTC (rev 8131)
@@ -0,0 +1,13 @@
+libdb-4.8.so
+libdb-4.so
+libdb_cxx-4.8.so
+libdb_cxx-4.so
+libdb_cxx.so
+libdbxml-2.5.so
+libdbxml.so
+liblib_json.so
+libMgMapGuideCommon-2.6.0.so
+libMgMapGuideCommon.so
+libxqilla.so
+libxqilla.so.5
+libxqilla.so.5.0.4
More information about the mapguide-commits
mailing list