Update to latest objc-build-scripts

Author: jspahrsummers

script/bootstrap

@@ -2,32 +2,12 @@
 
 export SCRIPT_DIR=$(dirname "$0")
 
-##
-## Configuration Variables
-##
-
-config ()
-{
-    # A whitespace-separated list of executables that must be present and locatable.
-    : ${REQUIRED_TOOLS="xctool"}
-    
-    export REQUIRED_TOOLS
-}
-
 ##
 ## Bootstrap Process
 ##
 
 main ()
 {
-    config
-
-    if [ -n "$REQUIRED_TOOLS" ]
-    then
-        echo "*** Checking dependencies..."
-        check_deps
-    fi
-
     local submodules=$(git submodule status)
     local result=$?
 
@@ -43,19 +23,6 @@ main ()
     fi
 }
 
-check_deps ()
-{
-    for tool in $REQUIRED_TOOLS
-    do
-        which -s "$tool"
-        if [ "$?" -ne "0" ]
-        then
-            echo "*** Error: $tool not found. Please install it and bootstrap again."
-            exit 1
-        fi
-    done
-}
-
 bootstrap_submodule ()
 {
     local bootstrap="script/bootstrap"

script/cibuild

@@ -41,11 +41,15 @@ config ()
     # Individual names can be quoted to avoid word splitting.
     : ${SCHEMES:=$(xcodebuild -list -project "$XCODEPROJ" 2>/dev/null | awk -f "$SCRIPT_DIR/schemes.awk")}
 
+    # A whitespace-separated list of executables that must be present and locatable.
+    : ${REQUIRED_TOOLS="xctool"}
+
     export XCWORKSPACE
     export XCODEPROJ
     export BOOTSTRAP
     export XCTOOL_OPTIONS
     export SCHEMES
+    export REQUIRED_TOOLS
 }
 
 ##
@@ -56,6 +60,12 @@ main ()
 {
     config
 
+    if [ -n "$REQUIRED_TOOLS" ]
+    then
+        echo "*** Checking dependencies..."
+        check_deps
+    fi
+
     if [ -f "$BOOTSTRAP" ]
     then
         echo "*** Bootstrapping..."
@@ -78,6 +88,19 @@ main ()
     )
 }
 
+check_deps ()
+{
+    for tool in $REQUIRED_TOOLS
+    do
+        which -s "$tool"
+        if [ "$?" -ne "0" ]
+        then
+            echo "*** Error: $tool not found. Please install it and cibuild again."
+            exit 1
+        fi
+    done
+}
+
 find_pattern ()
 {
     ls -d $1 2>/dev/null | head -n 1
@@ -106,9 +129,6 @@ build_scheme ()
 {
     local scheme=$1
 
-    echo "*** Cleaning $scheme..."
-    run_xctool -scheme "$scheme" clean >/dev/null || exit $?
-
     echo "*** Building and testing $scheme..."
     echo