[mapguide-commits] r8914 - in trunk/Tools/Vagrant: . centos/x64 centos/x86 scripts ubuntu/x64 ubuntu/x86

svn_mapguide at osgeo.org svn_mapguide at osgeo.org
Tue Apr 12 05:24:44 PDT 2016 

Author: jng
Date: 2016-04-12 05:24:44 -0700 (Tue, 12 Apr 2016)
New Revision: 8914

Added:
   trunk/Tools/Vagrant/md5sums.bat
Modified:
   trunk/Tools/Vagrant/centos/x64/Vagrantfile
   trunk/Tools/Vagrant/centos/x86/Vagrantfile
   trunk/Tools/Vagrant/scripts/build.sh
   trunk/Tools/Vagrant/scripts/build_fdo.sh
   trunk/Tools/Vagrant/scripts/dpkgfdocore.sh
   trunk/Tools/Vagrant/scripts/dpkgfdoprovider.sh
   trunk/Tools/Vagrant/scripts/dpkgmapguide.sh
   trunk/Tools/Vagrant/scripts/mginstallcentos.sh
   trunk/Tools/Vagrant/scripts/mginstallubuntu.sh
   trunk/Tools/Vagrant/scripts/mguninstallcentos.sh
   trunk/Tools/Vagrant/scripts/provision_centos.sh
   trunk/Tools/Vagrant/scripts/provision_ubuntu.sh
   trunk/Tools/Vagrant/ubuntu/x64/Vagrantfile
   trunk/Tools/Vagrant/ubuntu/x86/Vagrantfile
Log:
Bring across the vagrant build environment from 3.0 to trunk

Modified: trunk/Tools/Vagrant/centos/x64/Vagrantfile
===================================================================
--- trunk/Tools/Vagrant/centos/x64/Vagrantfile	2016-04-11 07:04:12 UTC (rev 8913)
+++ trunk/Tools/Vagrant/centos/x64/Vagrantfile	2016-04-12 12:24:44 UTC (rev 8914)
@@ -119,5 +119,5 @@
   config.vm.provision "shell",
     privileged: false,
     path: "provision_centos.sh",
-    args: [4, 1, 0, 3, 1, 0, "trunk", "trunk", "amd64"]
+    args: [4, 1, 0, 3, 1, 0, "trunk", "trunk", "amd64", "Test", "centos6"]
 end

Modified: trunk/Tools/Vagrant/centos/x86/Vagrantfile
===================================================================
--- trunk/Tools/Vagrant/centos/x86/Vagrantfile	2016-04-11 07:04:12 UTC (rev 8913)
+++ trunk/Tools/Vagrant/centos/x86/Vagrantfile	2016-04-12 12:24:44 UTC (rev 8914)
@@ -119,5 +119,5 @@
   config.vm.provision "shell",
     privileged: false,
     path: "provision_centos.sh",
-    args: [4, 1, 0, 3, 1, 0, "trunk", "trunk", "i386"]
+    args: [4, 1, 0, 3, 1, 0, "trunk", "trunk", "i386", "Test", "centos6"]
 end

Added: trunk/Tools/Vagrant/md5sums.bat
===================================================================
--- trunk/Tools/Vagrant/md5sums.bat	                        (rev 0)
+++ trunk/Tools/Vagrant/md5sums.bat	2016-04-12 12:24:44 UTC (rev 8914)
@@ -0,0 +1,68 @@
+ at echo off
+
+rem md5sums.bat
+rem
+rem (Re)generates MD5 hashes for the various MapGuide build artifacts
+
+SET ROOT=%CD%
+
+:check_ubuntu32
+if exist %ROOT%\builds\ubuntu_x86 goto md5_ubuntu32
+goto check_ubuntu64
+:md5_ubuntu32
+echo [md5]: Ubuntu 32-bit
+pushd %ROOT%\builds\ubuntu_x86
+if exist md5sums.txt del md5sums.txt
+dir > filelist.txt
+md5sum *.sh > md5sums.txt
+md5sum *.deb >> md5sums.txt
+popd
+
+:check_ubuntu64
+if exist %ROOT%\builds\ubuntu_x64 goto md5_ubuntu64
+goto check_centos32
+:md5_ubuntu64
+echo [md5]: Ubuntu 64-bit
+pushd %ROOT%\builds\ubuntu_x64
+if exist md5sums.txt del md5sums.txt
+dir > filelist.txt
+md5sum *.sh > md5sums.txt
+md5sum *.deb >> md5sums.txt
+popd
+
+:check_centos32
+if exist %ROOT%\builds\centos_x86 goto md5_centos32
+goto check_centos64
+:md5_centos32
+echo [md5]: CentOS 32-bit
+pushd %ROOT%\builds\centos_x86
+dir > filelist.txt
+if exist md5sums.txt del md5sums.txt
+md5sum *.sh > md5sums.txt
+md5sum *.tar.xz >> md5sums.txt
+popd
+
+:check_centos64
+if exist %ROOT%\builds\centos_x64 goto md5_centos64
+goto check_windows
+:md5_centos64
+echo [md5]: CentOS 64-bit
+pushd %ROOT%\builds\centos_x64
+if exist md5sums.txt del md5sums.txt
+dir > filelist.txt
+md5sum *.sh > md5sums.txt
+md5sum *.tar.xz >> md5sums.txt
+popd
+
+:check_windows
+if exist %ROOT%\builds\windows goto md5_windows
+goto done
+:md5_windows
+echo [md5]: Windows
+pushd %ROOT%\builds\windows
+if exist md5sums.txt del md5sums.txt
+dir > filelist.txt
+md5sum *.exe > md5sums.txt
+popd
+
+:done
\ No newline at end of file

Modified: trunk/Tools/Vagrant/scripts/build.sh
===================================================================
--- trunk/Tools/Vagrant/scripts/build.sh	2016-04-11 07:04:12 UTC (rev 8913)
+++ trunk/Tools/Vagrant/scripts/build.sh	2016-04-12 12:24:44 UTC (rev 8914)
@@ -2,9 +2,16 @@
 
 # Global vars for this script. Modify as necessary
 MG_VER_MAJOR=${MG_VER_MAJOR:-3}
-MG_VER_MINOR=${MG_VER_MINOR:-1}
-MG_VER_REV=${MG_VER_REV:-0}
+MG_VER_MINOR=${MG_VER_MINOR:-0}
+MG_VER_REV=${MG_VER_REV:-1}
 
+FDO_VER_MAJOR=${FDO_VER_MAJOR:-4}
+FDO_VER_MINOR=${FDO_VER_MINOR:-0}
+FDO_VER_REV=${FDO_VER_REV:-0}
+
+MG_DISTRO=${MG_DISTRO:-centos6}
+
+FDO_INST=/usr/local/fdo-${FDO_VER_MAJOR}.${FDO_VER_MINOR}.${FDO_VER_REV}
 APIVERSION=${MG_VER_MAJOR}.${MG_VER_MINOR}
 BUILDNUM=${APIVERSION}.${MG_VER_REV}
 BUILDROOT=`pwd`
@@ -42,6 +49,8 @@
 echo " Debug Build?:                  ${MGDEBUG}"
 echo " Preserving the build dir?:     ${PRESERVE_BUILD_ROOT}"
 echo " JAVA_HOME:                     ${JAVA_HOME}"
+echo " Using FDO headers from:        ${FDO_INST}/include"
+echo " Using FDO libs from:           ${FDO_INST}/lib"
 echo "******************************************************************"
 
 # Need JAVA_HOME for JavaApi
@@ -190,16 +199,16 @@
 if [ "${MG_ARCH}" = "amd64" ] || [ $(uname -m) = "x86_64" ]; then
     MGCPUPLATFORM=amd64
     if [ ${MGDEBUG} -eq 1 ]; then
-        ./configure --disable-optimized --enable-silent-rules --enable-64bit --prefix=${INSTALLROOT}
+        ./configure --disable-optimized --enable-silent-rules --enable-64bit --prefix=${INSTALLROOT} --with-fdo-include=${FDO_INST}/include --with-fdo-lib=${FDO_INST}/lib
     else
-        ./configure --enable-optimized --enable-silent-rules --enable-64bit --prefix=${INSTALLROOT}
+        ./configure --enable-optimized --enable-silent-rules --enable-64bit --prefix=${INSTALLROOT} --with-fdo-include=${FDO_INST}/include --with-fdo-lib=${FDO_INST}/lib
     fi
 else
     MGCPUPLATFORM=i386
     if [ ${MGDEBUG} -eq 1 ]; then
-        ./configure --disable-optimized --enable-silent-rules --prefix=${INSTALLROOT}
+        ./configure --disable-optimized --enable-silent-rules --prefix=${INSTALLROOT} --with-fdo-include=${FDO_INST}/include --with-fdo-lib=${FDO_INST}/lib
     else
-        ./configure --enable-optimized --enable-silent-rules --prefix=${INSTALLROOT}
+        ./configure --enable-optimized --enable-silent-rules --prefix=${INSTALLROOT} --with-fdo-include=${FDO_INST}/include --with-fdo-lib=${FDO_INST}/lib
     fi
 fi
 make $MY_MAKE_OPTS
@@ -255,7 +264,7 @@
         mkdir -p bin
     fi
 
-    tar -Jcf bin/mapguideopensource-${BUILDNUM}.${REVISION}.${MGCPUPLATFORM}.tar.xz ${INSTALLROOT} ${LOCKFILEDIR}
+    tar -Jcf bin/mapguideopensource-${MG_DISTRO}-${BUILDNUM}.${REVISION}.${MGCPUPLATFORM}.tar.xz ${INSTALLROOT} ${LOCKFILEDIR}
 fi
 echo "Build complete!"
 echo MapGuide main build execution: `expr $end_time - $start_time` s

Modified: trunk/Tools/Vagrant/scripts/build_fdo.sh
===================================================================
--- trunk/Tools/Vagrant/scripts/build_fdo.sh	2016-04-11 07:04:12 UTC (rev 8913)
+++ trunk/Tools/Vagrant/scripts/build_fdo.sh	2016-04-12 12:24:44 UTC (rev 8914)
@@ -13,9 +13,11 @@
 
 # FDO version. Make sure this matches your FDO build source
 FDO_VER_MAJOR=${FDO_VER_MAJOR:-4}
-FDO_VER_MINOR=${FDO_VER_MINOR:-1}
+FDO_VER_MINOR=${FDO_VER_MINOR:-0}
 FDO_VER_REV=${FDO_VER_REV:-0}
 
+FDO_DISTRO=${FDO_DISTRO:-centos6}
+
 # FDO install directory
 FDO_VER_FULL=${FDO_VER_MAJOR}.${FDO_VER_MINOR}.${FDO_VER_REV}
 
@@ -319,7 +321,7 @@
        echo "the GDAL SDK files to $FDOTHIRDPARTY/gdal. "
        echo "If this value remains unchanged, the FDO build process will"
        echo "build the version of GDAL located in Thirdparty/gdal and will "
-       echo "install the resulting libraries in /usr/local/fdo-3.9.0. The FDO build"
+       echo "install the resulting libraries in $FDO_INST. The FDO build"
        echo "process will then use that location when building the GDAL and"
        echo "WMS providers. If you wish to build the FDO GDAL or WMS Providers"
        echo "using a previously installed version of GDAL, modify the setenvironment.sh "
@@ -363,8 +365,8 @@
     # parameter no installation directory is created, ie.:
     # $ source ./setenvironment.sh --noinstall
     if test ! $# -eq 1; then
-        mkdir -p "/usr/local/fdo-${FDO_VER_FULL}/lib"
-        export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/fdo-${FDO_VER_FULL}/lib:$SDEHOME/lib
+        mkdir -p "$FDO_INST/lib"
+        export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$FDO_INST/lib:$SDEHOME/lib
     fi
 
     export XERCESCROOT=$FDOTHIRDPARTY/apache/xerces
@@ -504,7 +506,7 @@
 cd ${FDO_BUILD_AREA}
 
 FDO_BUILD_COMPONENT="FDO Thirdparty"
-./build_thirdparty.sh -b ${FDO_PLATFORM} --c ${FDO_BUILD_CONF}
+./build_thirdparty.sh -b ${FDO_PLATFORM} --c ${FDO_BUILD_CONF} --p ${FDO_INST}
 check_fdo_build
 
 if [ ${CMAKE} -eq 1 ];
@@ -574,7 +576,7 @@
     FDO_BUILD_COMPONENT="Make tarball"
     # Create a binary tar ball for FDO
     cd ${FDO_INST}
-    tar -Jcf ${BUILDROOT}/fdosdk-centos6-${FDO_BUILD_CPU}-${FDO_VER_FULL}_${REVISION}.tar.xz *
+    tar -Jcf ${BUILDROOT}/fdosdk-${FDO_DISTRO}-${FDO_BUILD_CPU}-${FDO_VER_FULL}_${REVISION}.tar.xz *
     check_fdo_build
 
     if [ ${UBUNTU} -eq 1 ];

Modified: trunk/Tools/Vagrant/scripts/dpkgfdocore.sh
===================================================================
--- trunk/Tools/Vagrant/scripts/dpkgfdocore.sh	2016-04-11 07:04:12 UTC (rev 8913)
+++ trunk/Tools/Vagrant/scripts/dpkgfdocore.sh	2016-04-12 12:24:44 UTC (rev 8914)
@@ -11,8 +11,13 @@
 #       control - control file generated from dpkg-gencontrol
 #       symbols - symbols file generated from dpkg-gensymbols
 # 
+
+FDO_VER_MAJOR=${FDO_VER_MAJOR:-4}
+FDO_VER_MINOR=${FDO_VER_MINOR:-0}
+FDO_VER_REV=${FDO_VER_REV:-0}
+
 BUILDROOT=`pwd`
-FDOBUILD=3.9.0
+FDOBUILD=${FDO_VER_MAJOR}.${FDO_VER_MINOR}.${FDO_VER_REV}
 FDO=usr/local/fdo-${FDOBUILD}
 ROOT=${BUILDROOT}/debian/fdocore
 TREE=${BUILDROOT}/debian

Modified: trunk/Tools/Vagrant/scripts/dpkgfdoprovider.sh
===================================================================
--- trunk/Tools/Vagrant/scripts/dpkgfdoprovider.sh	2016-04-11 07:04:12 UTC (rev 8913)
+++ trunk/Tools/Vagrant/scripts/dpkgfdoprovider.sh	2016-04-12 12:24:44 UTC (rev 8914)
@@ -13,7 +13,7 @@
 # 
 
 FDO_VER_MAJOR=${FDO_VER_MAJOR:-4}
-FDO_VER_MINOR=${FDO_VER_MINOR:-1}
+FDO_VER_MINOR=${FDO_VER_MINOR:-0}
 FDO_VER_REV=${FDO_VER_REV:-0}
 
 # Read and validate command line parameters

Modified: trunk/Tools/Vagrant/scripts/dpkgmapguide.sh
===================================================================
--- trunk/Tools/Vagrant/scripts/dpkgmapguide.sh	2016-04-11 07:04:12 UTC (rev 8913)
+++ trunk/Tools/Vagrant/scripts/dpkgmapguide.sh	2016-04-12 12:24:44 UTC (rev 8914)
@@ -49,11 +49,11 @@
 #
 
 MG_VER_MAJOR=${MG_VER_MAJOR:-3}
-MG_VER_MINOR=${MG_VER_MINOR:-1}
-MG_VER_REV=${MG_VER_REV:-0}
+MG_VER_MINOR=${MG_VER_MINOR:-0}
+MG_VER_REV=${MG_VER_REV:-1}
 
 FDO_VER_MAJOR=${FDO_VER_MAJOR:-4}
-FDO_VER_MINOR=${FDO_VER_MINOR:-1}
+FDO_VER_MINOR=${FDO_VER_MINOR:-0}
 FDO_VER_REV=${FDO_VER_REV:-0}
 
 BUILDROOT=`pwd`

Modified: trunk/Tools/Vagrant/scripts/mginstallcentos.sh
===================================================================
--- trunk/Tools/Vagrant/scripts/mginstallcentos.sh	2016-04-11 07:04:12 UTC (rev 8913)
+++ trunk/Tools/Vagrant/scripts/mginstallcentos.sh	2016-04-12 12:24:44 UTC (rev 8914)
@@ -1,22 +1,31 @@
 #!/bin/bash
-URL_ROOT="http://download.osgeo.org/mapguide/releases/3.0.0/Beta2"
-URL_PART="centos"
-URL="$URL_ROOT/$URL_PART"
-#URL="http://192.168.0.4/downloads"
-FDOVER_MAJOR_MINOR=4.0
+URL_HOST="http://download.osgeo.org"
+URL_RELPATH="/mapguide/releases"
+FDOVER_MAJOR=0
+FDOVER_MINOR=0
+FDOVER_MAJOR_MINOR=${FDOVER_MAJOR}.${FDOVER_MINOR}
 FDOVER_POINT=0
 FDOVER_REV=0
 FDO_ARCH=i386
 FDOVER_MAJOR_MINOR_REV=${FDOVER_MAJOR_MINOR}.${FDOVER_POINT}
 FDOVER=${FDOVER_MAJOR_MINOR_REV}_${FDOVER_REV}
-MGVER_MAJOR_MINOR=3.0
+MGVER_MAJOR=0
+MGVER_MINOR=0
+MGVER_MAJOR_MINOR=${MGVER_MAJOR}.${MGVER_MINOR}
 MGVER_POINT=0
 MGVER_REV=0
 MG_ARCH=i386
 MGVER_MAJOR_MINOR_REV=${MGVER_MAJOR_MINOR}.${MGVER_POINT}
 MGVER=${MGVER_MAJOR_MINOR_REV}.${MGVER_REV}
+MGRELEASELABEL="ReleaseLabel"
+
 FDO_TARBALL=fdosdk-centos6-${FDO_ARCH}-${FDOVER}.tar.xz
-MG_TARBALL=mapguideopensource-${MGVER}.${MG_ARCH}.tar.xz
+MG_TARBALL=mapguideopensource-centos6-${MGVER}.${MG_ARCH}.tar.xz
+
+URL_ROOT="${URL_HOST}/${URL_RELPATH}/${MGVER_MAJOR_MINOR_REV}/${MGRELEASELABEL}"
+URL_PART="centos"
+URL="$URL_ROOT/$URL_PART"
+
 MG_URL=${URL}/${MG_TARBALL}
 FDO_URL=${URL}/${FDO_TARBALL}
 

Modified: trunk/Tools/Vagrant/scripts/mginstallubuntu.sh
===================================================================
--- trunk/Tools/Vagrant/scripts/mginstallubuntu.sh	2016-04-11 07:04:12 UTC (rev 8913)
+++ trunk/Tools/Vagrant/scripts/mginstallubuntu.sh	2016-04-12 12:24:44 UTC (rev 8914)
@@ -1,21 +1,30 @@
 #!/bin/bash
 TEMPDIR=/tmp/build_mapguide
-URL_ROOT="http://download.osgeo.org/mapguide/releases/3.0.0/Beta2"
-URL_PART="ubuntu12"
-URL="$URL_ROOT/$URL_PART"
-#URL="http://192.168.0.5/downloads/ubuntu12"
-FDOVER_MAJOR_MINOR=4.0
-FDOVER_MAJOR_MINOR_REV=${FDOVER_MAJOR_MINOR}.0
+URL_HOST="http://download.osgeo.org"
+URL_RELPATH="/mapguide/releases"
+FDOVER_MAJOR=0
+FDOVER_MINOR=0
+FDOVER_MAJOR_MINOR=${FDOVER_MAJOR}.${FDOVER_MINOR}
+FDOVER_POINT=0
+FDOVER_MAJOR_MINOR_REV=${FDOVER_MAJOR_MINOR}.${FDOVER_POINT}
 FDOBUILD=0
 FDOARCH=i386
 FDOVER=${FDOVER_MAJOR_MINOR_REV}-${FDOBUILD}_${FDOARCH}
-MGVER_MAJOR_MINOR=3.0
-MGVER_MAJOR_MINOR_REV=${MGVER_MAJOR_MINOR}.0
+MGVER_MAJOR=0
+MGVER_MINOR=0
+MGVER_MAJOR_MINOR=${MGVER_MAJOR}.${MGVER_MINOR}
+MGVER_POINT=0
+MGVER_MAJOR_MINOR_REV=${MGVER_MAJOR_MINOR}.${MGVER_POINT}
+MGRELEASELABEL="ReleaseLabel"
 MGBUILD=0
 MGARCH=i386
 MGVER=${MGVER_MAJOR_MINOR_REV}-${MGBUILD}_${MGARCH}
 INSTALLER_TITLE="MapGuide Open Source Ubuntu installer"
 
+URL_ROOT="${URL_HOST}/${URL_RELPATH}/${MGVER_MAJOR_MINOR_REV}/${MGRELEASELABEL}"
+URL_PART="ubuntu"
+URL="$URL_ROOT/$URL_PART"
+
 DEFAULT_SERVER_IP="127.0.0.1"
 
 DEFAULT_ADMIN_PORT=2810

Modified: trunk/Tools/Vagrant/scripts/mguninstallcentos.sh
===================================================================
--- trunk/Tools/Vagrant/scripts/mguninstallcentos.sh	2016-04-11 07:04:12 UTC (rev 8913)
+++ trunk/Tools/Vagrant/scripts/mguninstallcentos.sh	2016-04-12 12:24:44 UTC (rev 8914)
@@ -1,8 +1,12 @@
 #!/bin/bash
-FDOVER_MAJOR_MINOR=4.0
+FDOVER_MAJOR=0
+FDOVER_MINOR=0
+FDOVER_MAJOR_MINOR=${FDOVER_MAJOR}.${FDOVER_MINOR}
 FDOVER_POINT=0
 FDOVER_MAJOR_MINOR_REV=${FDOVER_MAJOR_MINOR}.${FDOVER_POINT}
-MGVER_MAJOR_MINOR=3.0
+MGVER_MAJOR=0
+MGVER_MINOR=0
+MGVER_MAJOR_MINOR=${MGVER_MAJOR}.${MGVER_MINOR}
 MGVER_POINT=0
 MGVER_MAJOR_MINOR_REV=${MGVER_MAJOR_MINOR}.${MGVER_POINT}
 

Modified: trunk/Tools/Vagrant/scripts/provision_centos.sh
===================================================================
--- trunk/Tools/Vagrant/scripts/provision_centos.sh	2016-04-11 07:04:12 UTC (rev 8913)
+++ trunk/Tools/Vagrant/scripts/provision_centos.sh	2016-04-12 12:24:44 UTC (rev 8914)
@@ -6,6 +6,7 @@
 #
 # Expected environment (set up by vagrant)
 #
+#  - Calling vagrantfile is for a CentOS 6.x box
 #  - Vagrant folder (path of the Vagrantfile) mounted as: /vagrant
 #  - Source folder mounted as: /mapguide_sources
 #     - Contains tarballs for MapGuide/FDO
@@ -21,7 +22,11 @@
 #  $7 - FDO branch name (trunk|major.minor)
 #  $8 - MG branch name (trunk|major.minor)
 #  $9 - architecture (i386|amd64)
+#  $10 - release label (eg. Beta1, RC1, Final)
+#  $11 - distro label (eg. centos6, ubuntu12) - Optional
 
+PROVISION_START_TIME=`date +%s`
+
 echo "*****************************************************"
 echo " Arg check"
 echo "  1 - ${1}"
@@ -33,6 +38,8 @@
 echo "  7 - ${7}"
 echo "  8 - ${8}"
 echo "  9 - ${9}"
+echo " 10 - ${10}"
+echo " 11 - ${11}"
 echo "*****************************************************"
 
 # FDO version
@@ -49,6 +56,10 @@
 MG_BRANCH=${8}
 
 MG_ARCH=${9}
+MG_RELEASE_LABEL=${10}
+DISTRO=${11:-centos6}
+FDO_DISTRO=${DISTRO}
+MG_DISTRO=${DISTRO}
 UBUNTU=0
 
 FDO_PLATFORM=
@@ -72,6 +83,8 @@
 export MG_BRANCH
 export MG_ARCH
 export UBUNTU
+export FDO_DISTRO
+export MG_DISTRO
 
 BUILD_COMPONENT=
 check_build()
@@ -105,9 +118,13 @@
 FDO_UNIT_TEST=0
 MAKE_FDO_SDK=0
 SCRIPT_ROOT=~/scripts
-FDO_SRC_ROOT=~/fdo
+FDO_SRC_ROOT=~/fdo/branches
 FDO_SRC_DIR=${FDO_BRANCH}
 FDO_SRC=$FDO_SRC_ROOT/$FDO_SRC_DIR
+if [ "${FDO_BRANCH}" = "trunk" ]; then
+    FDO_SRC_ROOT=~/fdo
+    FDO_SRC=$FDO_SRC_ROOT/$FDO_SRC_DIR
+fi
 FDO_LIB_SRC=~/fdo_rdbms_thirdparty
 MG_SRC_ROOT=~/mapguide/branches/${MG_BRANCH}
 if [ "${MG_BRANCH}" = "trunk" ]; then
@@ -125,7 +142,9 @@
 echo "FDO branch:       ${FDO_BRANCH}"
 echo "MG version:       ${MG_VER_MAJOR}.${MG_VER_MINOR}.${MG_VER_REV}"
 echo "MG branch:        ${MG_BRANCH}"
-echo "Build target:     centos - ${MG_ARCH}"
+echo "Build target:     ${MG_DISTRO} - ${MG_ARCH}"
+echo "Release Label:    ${MG_RELEASE_LABEL}"
+echo "FDO Distro label: ${FDO_DISTRO}"
 echo "Checking directories"
 echo "********************************************************************************"
 
@@ -269,30 +288,60 @@
 sudo mv -f ~/*.log /vagrant/build
 echo [provision]: Copy tarballs to output dir
 sudo cp bin/*.tar.xz /vagrant/build
-sudo cp fdosdk-centos6-${MG_ARCH}-${FDO_VER_MAJOR}.${FDO_VER_MINOR}.${FDO_VER_REV}_${FDO_REV}.tar.xz /vagrant/build
+sudo cp fdosdk-${FDO_DISTRO}-${MG_ARCH}-${FDO_VER_MAJOR}.${FDO_VER_MINOR}.${FDO_VER_REV}_${FDO_REV}.tar.xz /vagrant/build
 if [ $MAKE_FDO_SDK -eq 1 ]; then
     echo [provision]: Copy FDO SDK for Ubuntu builds
     # Copy SDK also to sources, so Ubuntu can pick it up
     sudo rm -f /mapguide_sources/fdosdk*.tar.xz
-    sudo cp fdosdk-centos6-${MG_ARCH}-${FDO_VER_MAJOR}.${FDO_VER_MINOR}.${FDO_VER_REV}_${FDO_REV}.tar.xz /mapguide_sources
+    sudo cp fdosdk-${FDO_DISTRO}-${MG_ARCH}-${FDO_VER_MAJOR}.${FDO_VER_MINOR}.${FDO_VER_REV}_${FDO_REV}.tar.xz /mapguide_sources
     # Record file name so Ubuntu knows what tarball to extract from
-    sudo echo fdosdk-centos6-${MG_ARCH}-${FDO_VER_MAJOR}.${FDO_VER_MINOR}.${FDO_VER_REV}_${FDO_REV}.tar.xz > /mapguide_sources/fdosdk_filename
+    sudo echo fdosdk-${FDO_DISTRO}-${MG_ARCH}-${FDO_VER_MAJOR}.${FDO_VER_MINOR}.${FDO_VER_REV}_${FDO_REV}.tar.xz > /mapguide_sources/fdosdk_filename
     sudo echo ${FDO_REV} > /mapguide_sources/fdosdk_rev
     # Export filelist to Ubuntu can deb package this SDK if needed
     sudo cp -R $SCRIPT_ROOT/fdo_build_area/install/filelist /mapguide_sources
 fi
 echo [provision]: Copy unit test logs to output dir
-sudo mv ~/unit_test_status.log /vagrant/build/unit_test_status.log
-sudo mv ~/fdo_*_unit_test.log /vagrant/build
-sudo mv ~/UnitTestResults_*.xml /vagrant/build
+if [ -f "~/unit_test_status.log" ]; then
+    sudo mv ~/unit_test_status.log /vagrant/build/unit_test_status.log
+fi
+if ls ~/fdo_*_unit_test.log 1> /dev/null 2>&1; then
+    sudo mv ~/fdo_*_unit_test.log /vagrant/build
+else
+    echo [provision]: No FDO unit test result files found. If FDO_UNIT_TEST is 0 [value is ${FDO_UNIT_TEST}], this can be safely ignored
+fi
+if ls ~/UnitTestResults_*.xml 1> /dev/null 2>&1; then
+    sudo mv ~/UnitTestResults_*.xml /vagrant/build
+else
+    echo [provision]: No MapGuide unit test result files found. If MG_UNIT_TEST is 0 [value is ${MG_UNIT_TEST}], this can be safely ignored
+fi
 echo [provision]: Copy install/uninstall scripts to output dir
-DISTNAME=centos_x86
-if [ "${MG_ARCH}" -eq "amd64" ]; then
-    DISTNAME=centos_x64
+DISTNAME=${MG_DISTRO}_x86
+if [ "${MG_ARCH}" = "amd64" ]; then
+    DISTNAME=${MG_DISTRO}_x64
 fi
-sudo sed -i 's/URL_PART="centos"/URL_PART='"$DISTNAME"'/g' /vagrant/build/mginstallcentos.sh
+
+echo [provision]: Stamping install script
 sudo cp /vagrant/mginstallcentos.sh /vagrant/build/mginstallcentos.sh
 sudo cp /vagrant/mguninstallcentos.sh /vagrant/build/mguninstallcentos.sh
+sudo sed -i 's/URL_PART="centos"/URL_PART='"$DISTNAME"'/g' /vagrant/build/mginstallcentos.sh
+sudo sed -i 's/MGRELEASELABEL="ReleaseLabel"/MGRELEASELABEL='"$MG_RELEASE_LABEL"'/g' /vagrant/build/mginstallcentos.sh
+sudo sed -i 's/FDO_ARCH=i386/FDO_ARCH='"$MG_ARCH"'/g' /vagrant/build/mginstallcentos.sh
+sudo sed -i 's/MG_ARCH=i386/MG_ARCH='"$MG_ARCH"'/g' /vagrant/build/mginstallcentos.sh
 sudo sed -i 's/FDOVER_REV=0/FDOVER_REV='"$FDO_REV"'/g' /vagrant/build/mginstallcentos.sh
 sudo sed -i 's/MGVER_REV=0/MGVER_REV='"$MG_REV"'/g' /vagrant/build/mginstallcentos.sh
-echo [provision]: Build complete
\ No newline at end of file
+sudo sed -i 's/FDOVER_MAJOR=0/FDOVER_MAJOR='"$FDO_VER_MAJOR"'/g' /vagrant/build/mginstallcentos.sh
+sudo sed -i 's/FDOVER_MINOR=0/FDOVER_MINOR='"$FDO_VER_MINOR"'/g' /vagrant/build/mginstallcentos.sh
+sudo sed -i 's/FDOVER_POINT=0/FDOVER_POINT='"$FDO_VER_REV"'/g' /vagrant/build/mginstallcentos.sh
+sudo sed -i 's/MGVER_MAJOR=0/MGVER_MAJOR='"$MG_VER_MAJOR"'/g' /vagrant/build/mginstallcentos.sh
+sudo sed -i 's/MGVER_MINOR=0/MGVER_MINOR='"$MG_VER_MINOR"'/g' /vagrant/build/mginstallcentos.sh
+sudo sed -i 's/MGVER_POINT=0/MGVER_POINT='"$MG_VER_REV"'/g' /vagrant/build/mginstallcentos.sh
+echo [provision]: Stamping variables to uninstall script
+sudo sed -i 's/FDOVER_MAJOR=0/FDOVER_MAJOR='"$FDO_VER_MAJOR"'/g' /vagrant/build/mguninstallcentos.sh
+sudo sed -i 's/FDOVER_MINOR=0/FDOVER_MINOR='"$FDO_VER_MINOR"'/g' /vagrant/build/mguninstallcentos.sh
+sudo sed -i 's/FDOVER_POINT=0/FDOVER_POINT='"$FDO_VER_REV"'/g' /vagrant/build/mguninstallcentos.sh
+sudo sed -i 's/MGVER_MAJOR=0/MGVER_MAJOR='"$MG_VER_MAJOR"'/g' /vagrant/build/mguninstallcentos.sh
+sudo sed -i 's/MGVER_MINOR=0/MGVER_MINOR='"$MG_VER_MINOR"'/g' /vagrant/build/mguninstallcentos.sh
+sudo sed -i 's/MGVER_POINT=0/MGVER_POINT='"$MG_VER_REV"'/g' /vagrant/build/mguninstallcentos.sh
+PROVISION_END_TIME=`date +%s`
+echo [provision]: Build complete
+echo [provision]: Overall build duration: `expr $PROVISION_END_TIME - $PROVISION_START_TIME` s
\ No newline at end of file

Modified: trunk/Tools/Vagrant/scripts/provision_ubuntu.sh
===================================================================
--- trunk/Tools/Vagrant/scripts/provision_ubuntu.sh	2016-04-11 07:04:12 UTC (rev 8913)
+++ trunk/Tools/Vagrant/scripts/provision_ubuntu.sh	2016-04-12 12:24:44 UTC (rev 8914)
@@ -1,11 +1,12 @@
 #!/bin/bash
 
-# provision_centos.sh
+# provision_ubuntu.sh
 #
 # Entry point provisioning shell script
 #
 # Expected environment (set up by vagrant)
 #
+#  - Calling vagrantfile is for a Ubuntu 12.04.x LTS box
 #  - Vagrant folder (path of the Vagrantfile) mounted as: /vagrant
 #  - Source folder mounted as: /mapguide_sources
 #     - Contains tarballs for MapGuide/FDO
@@ -21,7 +22,11 @@
 #  $7 - FDO branch name (trunk|major.minor)
 #  $8 - MG branch name (trunk|major.minor)
 #  $9 - architecture (i386|amd64)
+#  $10 - release label (eg. Beta1, RC1, Final)
+#  $11 - distro label (eg. centos6, ubuntu12) - Optional
 
+PROVISION_START_TIME=`date +%s`
+
 echo "*****************************************************"
 echo " Arg check"
 echo "  1 - ${1}"
@@ -33,6 +38,8 @@
 echo "  7 - ${7}"
 echo "  8 - ${8}"
 echo "  9 - ${9}"
+echo " 10 - ${10}"
+echo " 11 - ${11}"
 echo "*****************************************************"
 
 # FDO version
@@ -49,6 +56,10 @@
 MG_BRANCH=${8}
 
 MG_ARCH=${9}
+MG_RELEASE_LABEL=${10}
+DISTRO=${11:-ubuntu12}
+FDO_DISTRO=${DISTRO}
+MG_DISTRO=${DISTRO}
 UBUNTU=1
 
 FDO_PLATFORM=
@@ -72,6 +83,8 @@
 export MG_BRANCH
 export MG_ARCH
 export UBUNTU
+export FDO_DISTRO
+export MG_DISTRO
 
 BUILD_COMPONENT=
 check_build()
@@ -105,9 +118,13 @@
 FDO_UNIT_TEST=0
 MAKE_FDO_SDK=0
 SCRIPT_ROOT=~/scripts
-FDO_SRC_ROOT=~/fdo
+FDO_SRC_ROOT=~/fdo/branches
 FDO_SRC_DIR=${FDO_BRANCH}
 FDO_SRC=$FDO_SRC_ROOT/$FDO_SRC_DIR
+if [ "${FDO_BRANCH}" = "trunk" ]; then
+    FDO_SRC_ROOT=~/fdo
+    FDO_SRC=$FDO_SRC_ROOT/$FDO_SRC_DIR
+fi
 FDO_LIB_SRC=~/fdo_rdbms_thirdparty
 MG_SRC_ROOT=~/mapguide/branches/${MG_BRANCH}
 if [ "${MG_BRANCH}" = "trunk" ]; then
@@ -125,7 +142,9 @@
 echo "FDO branch:       ${FDO_BRANCH}"
 echo "MG version:       ${MG_VER_MAJOR}.${MG_VER_MINOR}.${MG_VER_REV}"
 echo "MG branch:        ${MG_BRANCH}"
-echo "Build target:     centos - ${MG_ARCH}"
+echo "Build target:     ${MG_DISTRO} - ${MG_ARCH}"
+echo "Release Label:    ${MG_RELEASE_LABEL}"
+echo "FDO Distro label: ${FDO_DISTRO}"
 echo "Checking directories"
 echo "********************************************************************************"
 
@@ -272,14 +291,14 @@
 sudo mv -f ~/*.log /vagrant/build
 echo [provision]: Copy tarballs to output dir
 sudo cp bin/*.tar.xz /vagrant/build
-sudo cp fdosdk-centos6-${MG_ARCH}-${FDO_VER_MAJOR}.${FDO_VER_MINOR}.${FDO_VER_REV}_${FDO_REV}.tar.xz /vagrant/build
+sudo cp fdosdk-${FDO_DISTRO}-${MG_ARCH}-${FDO_VER_MAJOR}.${FDO_VER_MINOR}.${FDO_VER_REV}_${FDO_REV}.tar.xz /vagrant/build
 if [ $MAKE_FDO_SDK -eq 1 ]; then
     echo [provision]: Copy FDO SDK for Ubuntu builds
     # Copy SDK also to sources, so Ubuntu can pick it up
     sudo rm -f /mapguide_sources/fdosdk*.tar.xz
-    sudo cp fdosdk-centos6-${MG_ARCH}-${FDO_VER_MAJOR}.${FDO_VER_MINOR}.${FDO_VER_REV}_${FDO_REV}.tar.xz /mapguide_sources
+    sudo cp fdosdk-${FDO_DISTRO}-${MG_ARCH}-${FDO_VER_MAJOR}.${FDO_VER_MINOR}.${FDO_VER_REV}_${FDO_REV}.tar.xz /mapguide_sources
     # Record file name so Ubuntu knows what tarball to extract from
-    sudo echo fdosdk-centos6-${MG_ARCH}-${FDO_VER_MAJOR}.${FDO_VER_MINOR}.${FDO_VER_REV}_${FDO_REV}.tar.xz > /mapguide_sources/fdosdk_filename
+    sudo echo fdosdk-${FDO_DISTRO}-${MG_ARCH}-${FDO_VER_MAJOR}.${FDO_VER_MINOR}.${FDO_VER_REV}_${FDO_REV}.tar.xz > /mapguide_sources/fdosdk_filename
     sudo echo ${FDO_REV} > /mapguide_sources/fdosdk_rev
     # Export filelist to Ubuntu can deb package this SDK if needed
     sudo cp -R $SCRIPT_ROOT/fdo_build_area/install/filelist /mapguide_sources
@@ -289,17 +308,39 @@
 echo [provision]: Copy MapGuide deb packages
 sudo cp bin/*.deb /vagrant/build
 echo [provision]: Copy unit test logs to output dir
-sudo mv ~/unit_test_status.log /vagrant/build/unit_test_status.log
-sudo mv ~/fdo_*_unit_test.log /vagrant/build
-sudo mv ~/UnitTestResults_*.xml /vagrant/build
+if [ -f "~/unit_test_status.log" ]; then
+    sudo mv ~/unit_test_status.log /vagrant/build/unit_test_status.log
+fi
+if ls ~/fdo_*_unit_test.log 1> /dev/null 2>&1; then
+    sudo mv ~/fdo_*_unit_test.log /vagrant/build
+else
+    echo [provision]: No FDO unit test result files found. If FDO_UNIT_TEST is 0 [value is ${FDO_UNIT_TEST}], this can be safely ignored
+fi
+if ls ~/UnitTestResults_*.xml 1> /dev/null 2>&1; then
+    sudo mv ~/UnitTestResults_*.xml /vagrant/build
+else
+    echo [provision]: No MapGuide unit test result files found. If MG_UNIT_TEST is 0 [value is ${MG_UNIT_TEST}], this can be safely ignored
+fi
 echo [provision]: Copy install/uninstall scripts to output dir
-DISTNAME=ubuntu12_x86
+DISTNAME=${MG_DISTRO}_x86
 if [ "${MG_ARCH}" = "amd64" ]; then
-    DISTNAME=ubuntu12_x64
+    DISTNAME=${MG_DISTRO}_x64
 fi
-sudo sed -i 's/URL_PART="ubuntu12"/URL_PART='"$DISTNAME"'/g' /vagrant/build/mginstallubuntu.sh
+echo [provision]: Stamping install script
 sudo cp /vagrant/mginstallubuntu.sh /vagrant/build/mginstallubuntu.sh
 sudo cp /vagrant/mguninstallubuntu.sh /vagrant/build/mguninstallubuntu.sh
-sudo sed -i 's/FDOVER_REV=0/FDOVER_REV='"$FDO_REV"'/g' /vagrant/build/mginstallubuntu.sh
-sudo sed -i 's/MGVER_REV=0/MGVER_REV='"$MG_REV"'/g' /vagrant/build/mginstallubuntu.sh
-echo [provision]: Build complete
\ No newline at end of file
+sudo sed -i 's/URL_PART="ubuntu12"/URL_PART='"$DISTNAME"'/g' /vagrant/build/mginstallubuntu.sh
+sudo sed -i 's/MGRELEASELABEL="ReleaseLabel"/MGRELEASELABEL='"$MG_RELEASE_LABEL"'/g' /vagrant/build/mginstallubuntu.sh
+sudo sed -i 's/FDOARCH=i386/FDOARCH='"$MG_ARCH"'/g' /vagrant/build/mginstallubuntu.sh
+sudo sed -i 's/MGARCH=i386/MGARCH='"$MG_ARCH"'/g' /vagrant/build/mginstallubuntu.sh
+sudo sed -i 's/FDOBUILD=0/FDOBUILD='"$FDO_REV"'/g' /vagrant/build/mginstallubuntu.sh
+sudo sed -i 's/MGBUILD=0/MGBUILD='"$MG_REV"'/g' /vagrant/build/mginstallubuntu.sh
+sudo sed -i 's/FDOVER_MAJOR=0/FDOVER_MAJOR='"$FDO_VER_MAJOR"'/g' /vagrant/build/mginstallubuntu.sh
+sudo sed -i 's/FDOVER_MINOR=0/FDOVER_MINOR='"$FDO_VER_MINOR"'/g' /vagrant/build/mginstallubuntu.sh
+sudo sed -i 's/FDOVER_POINT=0/FDOVER_POINT='"$FDO_VER_REV"'/g' /vagrant/build/mginstallubuntu.sh
+sudo sed -i 's/MGVER_MAJOR=0/MGVER_MAJOR='"$MG_VER_MAJOR"'/g' /vagrant/build/mginstallubuntu.sh
+sudo sed -i 's/MGVER_MINOR=0/MGVER_MINOR='"$MG_VER_MINOR"'/g' /vagrant/build/mginstallubuntu.sh
+sudo sed -i 's/MGVER_POINT=0/MGVER_POINT='"$MG_VER_REV"'/g' /vagrant/build/mginstallubuntu.sh
+PROVISION_END_TIME=`date +%s`
+echo [provision]: Build complete
+echo [provision]: Overall build duration: `expr $PROVISION_END_TIME - $PROVISION_START_TIME` s
\ No newline at end of file

Modified: trunk/Tools/Vagrant/ubuntu/x64/Vagrantfile
===================================================================
--- trunk/Tools/Vagrant/ubuntu/x64/Vagrantfile	2016-04-11 07:04:12 UTC (rev 8913)
+++ trunk/Tools/Vagrant/ubuntu/x64/Vagrantfile	2016-04-12 12:24:44 UTC (rev 8914)
@@ -119,5 +119,5 @@
   config.vm.provision "shell",
     privileged: false,
     path: "provision_ubuntu.sh",
-    args: [4, 1, 0, 3, 1, 0, "trunk", "trunk", "amd64"]
+    args: [4, 1, 0, 3, 1, 0, "trunk", "trunk", "amd64", "Test", "ubuntu12"]
 end

Modified: trunk/Tools/Vagrant/ubuntu/x86/Vagrantfile
===================================================================
--- trunk/Tools/Vagrant/ubuntu/x86/Vagrantfile	2016-04-11 07:04:12 UTC (rev 8913)
+++ trunk/Tools/Vagrant/ubuntu/x86/Vagrantfile	2016-04-12 12:24:44 UTC (rev 8914)
@@ -119,5 +119,5 @@
   config.vm.provision "shell",
     privileged: false,
     path: "provision_ubuntu.sh",
-    args: [4, 1, 0, 3, 1, 0, "trunk", "trunk", "i386"]
+    args: [4, 1, 0, 3, 1, 0, "trunk", "trunk", "i386", "Test", "ubuntu12"]
 end

More information about the mapguide-commits mailing list