[mapguide-commits] r7982 - trunk/Tools/Vagrant/ubuntu/x86
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Tue Feb 25 02:08:56 PST 2014
Author: jng
Date: 2014-02-25 02:08:56 -0800 (Tue, 25 Feb 2014)
New Revision: 7982
Modified:
trunk/Tools/Vagrant/ubuntu/x86/Vagrantfile
trunk/Tools/Vagrant/ubuntu/x86/build_oem_ubuntu.sh
Log:
2392 attempts later, we have a working Vagrantfile that will properly provision and build MapGuide/FDO trunk on Ubuntu 12.04 32-bit from start to finish. This submission is that working vagrant configuration.
Modified: trunk/Tools/Vagrant/ubuntu/x86/Vagrantfile
===================================================================
--- trunk/Tools/Vagrant/ubuntu/x86/Vagrantfile 2014-02-24 23:22:42 UTC (rev 7981)
+++ trunk/Tools/Vagrant/ubuntu/x86/Vagrantfile 2014-02-25 10:08:56 UTC (rev 7982)
@@ -117,10 +117,17 @@
# chef.validation_client_name = "ORGNAME-validator"
$script = <<SCRIPT
+BUILD_COMPONENT=
+check_build()
+{
+ error=$?
+ if [ $error -ne 0 ]; then
+ echo "[error]: ${BUILD_COMPONENT} - Error build failed ($error)"
+ exit $error
+ fi
+}
cd ~
echo [provision]: Home directory is `pwd`
-echo [provision]: Checking required tools
-sudo apt-get -y install subversion dos2unix lintian libpcre3-dev
echo [provision]: Checking directories
HAVE_FDO=0
HAVE_FDO_LIBS=0
@@ -144,28 +151,39 @@
if [ $HAVE_FDO_LIBS -eq 0 ];
then
echo [provision]: Extracting FDO thirdparty libs
-tar -zxvf /vagrant/fdo_rdbms_thirdparty.tar.gz -C ~
+tar -zxf /vagrant/fdo_rdbms_thirdparty.tar.gz -C ~
fi
if [ $HAVE_FDO -eq 0 ];
then
echo [provision]: Extracting FDO trunk working copy
mkdir -p ~/fdo
-tar -zxvf /vagrant/fdo-checkout-trunk.tar.gz -C ~/fdo
+tar -zxf /vagrant/fdo-checkout-trunk.tar.gz -C ~/fdo
fi
if [ $HAVE_MAPGUIDE -eq 0 ];
then
echo [provision]: Extracting MapGuide trunk working copy
mkdir -p ~/mapguide/trunk
-tar -zxvf /vagrant/mapguide-checkout-trunk.tar.gz -C ~/mapguide/trunk
+tar -zxf /vagrant/mapguide-checkout-trunk.tar.gz -C ~/mapguide/trunk
fi
echo [provision]: Update working copies
+BUILD_COMPONENT="svn update FDO"
svn update ~/fdo/trunk
+check_build
+BUILD_COMPONENT="svn update MapGuide"
svn update ~/mapguide/trunk/MgDev
-cd scripts
+check_build
+echo [provision]: Ensuring the correct FDO version
+cd ~/scripts
+BUILD_COMPONENT="FDO"
sudo -E ./build_fdo.sh
+check_build
+BUILD_COMPONENT="MapGuide"
sudo -E ./build.sh
+check_build
MG_REV=`svn info ~/mapguide/trunk/MgDev | perl revnum.pl`
-./dpkgmapguide.sh i386 $MG_REV
+BUILD_COMPONENT="MapGuide deb packages"
+sudo ./dpkgmapguide.sh i386 $MG_REV
+check_build
SCRIPT
config.vm.provision "shell",
Modified: trunk/Tools/Vagrant/ubuntu/x86/build_oem_ubuntu.sh
===================================================================
--- trunk/Tools/Vagrant/ubuntu/x86/build_oem_ubuntu.sh 2014-02-24 23:22:42 UTC (rev 7981)
+++ trunk/Tools/Vagrant/ubuntu/x86/build_oem_ubuntu.sh 2014-02-25 10:08:56 UTC (rev 7982)
@@ -11,8 +11,8 @@
#**********************************************************
echo "MapGuide Open Source build script for OEM components"
-INSTALLDIR=/usr/local/mapguideopensource-2.5.0
-MY_MAKE_OPTS="-j 4"
+INSTALLDIR=/usr/local/mapguideopensource
+MY_MAKE_OPTS="-j 2"
CLEAN_FLAG=0
while [ $# -gt 0 ]; do # Until you run out of parameters...
case "$1" in
@@ -229,20 +229,19 @@
init_php()
{
- LIB_NAME="PHP 5.3.1"
+ LIB_NAME="PHP 5.5.3"
}
build_php()
{
- pushd php
- sh ./configure
- check_build
+ # Nothing to do here. build_apt.sh builds PHP
+ pushd LinuxApt/php-5.5.3
popd
}
clean_php()
{
- pushd php
+ pushd LinuxApt/php-5.5.3
make distclean
check_clean
popd
More information about the mapguide-commits
mailing list