[mapguide-commits] r8072 - trunk/Tools/Vagrant/scripts

[svn_mapguide at osgeo.org]

Author: jng
Date: 2014-04-25 10:14:28 -0700 (Fri, 25 Apr 2014)
New Revision: 8072

Modified:
   trunk/Tools/Vagrant/scripts/build.sh
   trunk/Tools/Vagrant/scripts/build_fdo.sh
Log:
Vagrant build script updates:
 - Ensure all svn exports are quiet
 - Use build_oem.sh for all distros

Modified: trunk/Tools/Vagrant/scripts/build.sh
===================================================================
--- trunk/Tools/Vagrant/scripts/build.sh	2014-04-25 16:24:42 UTC (rev 8071)
+++ trunk/Tools/Vagrant/scripts/build.sh	2014-04-25 17:14:28 UTC (rev 8072)
@@ -96,21 +96,10 @@
 check_build
 popd
 
-# Need an ubuntu-flavoured build_oem.sh if we're doing ubuntu
-if [ ${UBUNTU} -eq 1 ]
-then
-    cp ${BUILDROOT}/build_oem_ubuntu.sh .
-    chmod +x build_oem_ubuntu.sh
-    echo "Building Oem (Ubuntu)"
-    BUILD_COMPONENT="Oem (Ubuntu)"
-    ./build_oem_ubuntu.sh --prefix ${INSTALLROOT}
-    check_build
-else
-    echo "Building Oem (Regular)"
-    BUILD_COMPONENT="Oem (Regular)"
-    ./build_oem.sh --prefix ${INSTALLROOT}
-    check_build
-fi
+echo "Building Oem"
+BUILD_COMPONENT="Oem"
+./build_oem.sh --prefix ${INSTALLROOT}
+check_build
 
 echo "Building Fusion"
 pushd ${MGSOURCE}/Oem/fusion

Modified: trunk/Tools/Vagrant/scripts/build_fdo.sh
===================================================================
--- trunk/Tools/Vagrant/scripts/build_fdo.sh	2014-04-25 16:24:42 UTC (rev 8071)
+++ trunk/Tools/Vagrant/scripts/build_fdo.sh	2014-04-25 17:14:28 UTC (rev 8072)
@@ -150,7 +150,7 @@
 			rm -rf ${FDO_BUILD_AREA}
 			if [ ${LOCALSVN} -eq 1 ] 
 			then
-				svn export ${FDO_SRC} ${FDO_BUILD_AREA}
+				svn export -q ${FDO_SRC} ${FDO_BUILD_AREA}
 				modify_sdk_paths
 			else
 				echo "[info]: Performing fresh SVN export of ${FDO_SRC} (r${REVISION}) to ${FDO_BUILD_AREA}"
@@ -163,7 +163,7 @@
 		echo "[info]: Exporting svn revision ${REVISION}"
 		if [ ${LOCALSVN} -eq 1 ] 
 		then
-			svn export ${FDO_SRC} ${FDO_BUILD_AREA}
+			svn export -q ${FDO_SRC} ${FDO_BUILD_AREA}
 			modify_sdk_paths
 		else
 			echo "[info]: Performing fresh SVN export of ${FDO_SRC} (r${REVISION}) to ${FDO_BUILD_AREA}"