[ros-diffs] [cfinck] 32797: - Check the revision to build and cancel if it's older than 30846. The Buildslaves have Gentoo x64 installed and the ROS source code doesn't compile under this OS with revs older than 30846. - Remove some cleaning steps, which are not needed, if we build r30846 or later.

Author: cfinck
Date: Mon Mar 31 11:44:48 2008
New Revision: 32797

URL: http://svn.reactos.org/svn/reactos?rev=32797&view=rev
Log:
- Check the revision to build and cancel if it's older than 30846.
  The Buildslaves have Gentoo x64 installed and the ROS source code doesn't compile under this OS with revs older than 30846.
- Remove some cleaning steps, which are not needed, if we build r30846 or later.

Added:
    trunk/tools/buildbot/scripts/Linux/checkrev   (with props)
Modified:
    trunk/tools/buildbot/scripts/Linux/build.32
    trunk/tools/buildbot/scripts/Linux/build.64
    trunk/tools/buildbot/scripts/Linux/makeclean
    trunk/tools/buildbot/scripts/Linux/uploadiso

Modified: trunk/tools/buildbot/scripts/Linux/build.32
URL: http://svn.reactos.org/svn/reactos/trunk/tools/buildbot/scripts/Linux/build....
==============================================================================
--- trunk/tools/buildbot/scripts/Linux/build.32 [iso-8859-1] (original)
+++ trunk/tools/buildbot/scripts/Linux/build.32 [iso-8859-1] Mon Mar 31 11:44:48 2008
@@ -3,6 +3,8 @@
 TIME="$(dirname $0)/time"

$TIME bash -c "(
+	source "checkrev"
+	
    export CCACHE_DIR=/opt/buildbot/ccache
    export CCACHE_PATH=/usr/local/rosbe/bin:$PATH
    export CCACHE_HARDLINK=1

Modified: trunk/tools/buildbot/scripts/Linux/build.64
URL: http://svn.reactos.org/svn/reactos/trunk/tools/buildbot/scripts/Linux/build....
==============================================================================
--- trunk/tools/buildbot/scripts/Linux/build.64 [iso-8859-1] (original)
+++ trunk/tools/buildbot/scripts/Linux/build.64 [iso-8859-1] Mon Mar 31 11:44:48 2008
@@ -3,6 +3,8 @@
 TIME="$(dirname $0)/time"

$TIME bash -c "(
+	source "checkrev"
+	
    export CCACHE_DIR=/opt/buildbot/ccache
    export CCACHE_PATH=/usr/local/rosbe/bin:$PATH
    export CCACHE_HARDLINK=1

Added: trunk/tools/buildbot/scripts/Linux/checkrev
URL: http://svn.reactos.org/svn/reactos/trunk/tools/buildbot/scripts/Linux/checkr...
==============================================================================
--- trunk/tools/buildbot/scripts/Linux/checkrev (added)
+++ trunk/tools/buildbot/scripts/Linux/checkrev [iso-8859-1] Mon Mar 31 11:44:48 2008
@@ -1,0 +1,8 @@
+#!/bin/bash
+
+LIMIT=30846
+
+if [ $REV -lt $LIMIT ]; then
+	echo "* This Buildslave cannot build revisions older than $LIMIT"
+	exit 1
+fi

Propchange: trunk/tools/buildbot/scripts/Linux/checkrev
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: trunk/tools/buildbot/scripts/Linux/makeclean
URL: http://svn.reactos.org/svn/reactos/trunk/tools/buildbot/scripts/Linux/makecl...
==============================================================================
--- trunk/tools/buildbot/scripts/Linux/makeclean [iso-8859-1] (original)
+++ trunk/tools/buildbot/scripts/Linux/makeclean [iso-8859-1] Mon Mar 31 11:44:48 2008
@@ -6,6 +6,12 @@
 OUTPUT=${ROS_OUTPUT:=output-i386}

$TIME bash -c "( 
+    echo -e '\n* Getting revision number...'
+    export REV=$(svnversion .)
+    echo -e "* Revision $REV.\n"
+    
+    source "checkrev"
+    
     echo -e '\n* Cleaning...'

if [ -f makefile.auto ]; then
@@ -17,11 +23,10 @@
     rm -rf $OBJ
     echo '  * output-i386'
     rm -rf $OUTPUT
+    echo '  * reactos'
+    rm -rf "reactos."
     echo '  * CD images'
     rm -f *.iso
-
-    echo -e '\n* Deleting unversioned files from the source...'
-    ../../svn-clean --exclude '^.buildbot-sourcedata'

if [ $# -eq 1 ]; then
         echo -e '\n* Recreating config.rbuild...'
@@ -30,9 +35,5 @@
         fi
     fi

-    echo -e '\n* Compiling tools...'
-    ../../build clean
-    echo -e '* Done compiling tools.'
-
     exit 0
 )"

Modified: trunk/tools/buildbot/scripts/Linux/uploadiso
URL: http://svn.reactos.org/svn/reactos/trunk/tools/buildbot/scripts/Linux/upload...
==============================================================================
--- trunk/tools/buildbot/scripts/Linux/uploadiso [iso-8859-1] (original)
+++ trunk/tools/buildbot/scripts/Linux/uploadiso [iso-8859-1] Mon Mar 31 11:44:48 2008
@@ -1,4 +1,6 @@
 #!/bin/bash
+
+source "checkrev"

KEY=../../fezile.cute.se.key
 SSHUSER=rosbuild
@@ -22,10 +24,6 @@
    echo "* There are no ISO files to process."
    exit 2
 fi
-
-echo "* Getting revision number..."
-REV=$(svnversion .)
-echo -e "* Revision $REV.\n"

BOOT=bootcd-$REV-$1
 LIVE=livecd-$REV-$1