[mapguide-commits] r6582 - trunk/Installer/scripts

[svn_mapguide at osgeo.org]

Author: jng
Date: 2012-04-20 10:26:54 -0700 (Fri, 20 Apr 2012)
New Revision: 6582

Modified:
   trunk/Installer/scripts/build.sh
   trunk/Installer/scripts/setvars.sh
Log:
Build script modifications to allow for build directory preservation

Modified: trunk/Installer/scripts/build.sh
===================================================================
--- trunk/Installer/scripts/build.sh	2012-04-20 13:27:15 UTC (rev 6581)
+++ trunk/Installer/scripts/build.sh	2012-04-20 17:26:54 UTC (rev 6582)
@@ -8,19 +8,27 @@
 exit
 fi
 
-sudo rm -rf ${MGSOURCE}
+if [ ${PRESERVE_BUILD_ROOT} != 1 ]
+then
+    sudo rm -rf ${MGSOURCE}
+else
+    echo "Preserving existing build dir"
+fi
 sudo rm -rf ${INSTALLROOT}
 
 REVISION=`svn info ${SVNROOT}${SVNRELPATH} | perl revnum.pl`
 echo ${REVISION} > revnum.txt
-echo "Exporting svn revision ${REVISION}"
-if [ ${LOCALSVN} = 1 ] 
+if [ ${PRESERVE_BUILD_ROOT} != 1 ];
 then
-    echo "Making local SVN copy to ${MGSOURCE}"
-    cp -R ${SVNROOT}${SVNRELPATH} ${MGSOURCE}
-else
-    echo "Performing fresh SVN export to ${MGSOURCE}"
-    svn export -q -r ${REVISION} ${SVNROOT}${SVNRELPATH} ${MGSOURCE}
+    echo "Exporting svn revision ${REVISION}"
+    if [ ${LOCALSVN} = 1 ] 
+    then
+        echo "Making local SVN copy to ${MGSOURCE}"
+        cp -R ${SVNROOT}${SVNRELPATH} ${MGSOURCE}
+    else
+        echo "Performing fresh SVN export to ${MGSOURCE}"
+        svn export -q -r ${REVISION} ${SVNROOT}${SVNRELPATH} ${MGSOURCE}
+    fi
 fi
 echo "Building Revision ${BUILDNUM}.${REVISION}" 
 cd ${MGSOURCE}

Modified: trunk/Installer/scripts/setvars.sh
===================================================================
--- trunk/Installer/scripts/setvars.sh	2012-04-20 13:27:15 UTC (rev 6581)
+++ trunk/Installer/scripts/setvars.sh	2012-04-20 17:26:54 UTC (rev 6582)
@@ -12,10 +12,19 @@
 # Use LOCALSVN=1 if you want to build from an existing copy instead of building
 # from an export
 export LOCALSVN=1
-export SVNROOT=/home/jackie
-export SVNRELPATH=/mg-2.4/MgDev
+export SVNROOT=/home/user
+export SVNRELPATH=/mapguide/trunk/MgDev
 #export SVNROOT="svn://svn.bld.mgproto.net"
 #export SVNROOT="http://svn.osgeo.org"
 #export SVNRELPATH=/mapguide/trunk/MgDev
 export MY_MAKE_OPTS="-j 4"
 export UBUNTU=1
+export PRESERVE_BUILD_ROOT=1
+
+echo "******************************************************************"
+echo " MapGuide will be installed to: ${INSTALLROOT}"
+echo " SVN Source is: ${SVNROOT}${SVNRELPATH}"
+echo " Make Options: ${MY_MAKE_OPTS}"
+echo " Is Ubuntu?: ${UBUNTU}"
+echo " Preserving the build dir?: ${PRESERVE_BUILD_ROOT}"
+echo "******************************************************************"