Part 2 of 3: Moving tools/llvm to pnacl/

buildbot/buildbot_pnacl_merge.sh

 #!/bin/bash
 # Copyright (c) 2011 The Native Client Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 set -u
 set -e
 set -x
 
 # Script assumed to be run in native_client/
 if [[ $(pwd) != */native_client ]]; then
   echo 'ERROR: must be run in native_client/ directory!'
   echo "       (Current directory is $(pwd))"
   exit 1
 fi
 
 echo "****************** Environment ******************"
 env
 
 TOOLCHAIN_LABEL="pnacl_linux_x86_64_newlib"
 GSBASE="gs://nativeclient-archive2/pnacl/between_bots/llvm"
 
-export UTMAN_BUILDBOT=true
+export PNACL_BUILDBOT=true
 
 GSUTIL=buildbot/gsutil.sh
-UTMAN=tools/llvm/utman.sh
+PNACL_BUILD=pnacl/build.sh
 MERGE_TOOL=tools/llvm/merge-tool.sh
 SPEC2K_SCRIPT=buildbot/buildbot_spec2k.sh
 PNACL_SCRIPT=buildbot/buildbot_pnacl.sh
 
 clobber() {
   echo @@@BUILD_STEP clobber@@@
   rm -rf scons-out
   rm -rf toolchain/pnacl*
   # Try to clobber /tmp/ contents to clear temporary chrome files.
   rm -rf /tmp/.org.chromium.Chromium.*
@@ skipping 28 matching lines @@
   ${MERGE_TOOL} auto ${BUILDBOT_REVISION} || ret=$?
   if [ ${ret} -eq 55 ] ; then
     echo '@@@BUILD_STEP No changes, skipping tests@@@'
     exit 0
   elif [ ${ret} -ne 0 ]; then
     echo '@@@STEP_FAILURE@@@'
     exit 1
   fi
 
   echo "@@@BUILD_STEP show-config@@@"
-  ${UTMAN} show-config
+  ${PNACL_BUILD} show-config
 
-  # Variables for utman.sh
+  # Variables for build.sh
   export LLVM_PROJECT_REV=${BUILDBOT_REVISION}
-  export UTMAN_MERGE_TESTING=true
-  export UTMAN_PRUNE=true
+  export PNACL_MERGE_TESTING=true
+  export PNACL_PRUNE=true
 
   # Build the un-sandboxed toolchain
   echo "@@@BUILD_STEP compile_toolchain@@@"
-  ${UTMAN} clean
-  ${UTMAN} untrusted_sdk pnaclsdk.tgz
+  ${PNACL_BUILD} clean
+  ${PNACL_BUILD} untrusted_sdk pnaclsdk.tgz
 
   #echo "@@@BUILD_STEP archive_toolchain@@@"
   #${GSUTIL} cp pnaclsdk.tgz \
   #  ${GSBASE}/${BUILDBOT_BUILDNUMBER}/pnaclsdk.tgz
 
   # For now, run all these on a single bot, since the waterfall
   # won't behave correctly otherwise.
   scons-bot
   spec2k-x86-bot
   spec2k-arm-bot
@@ skipping 36 matching lines @@
   exit 1
 fi
 
 if [ "$(type -t $1)" != "function" ]; then
   Usage
   echo "ERROR: unknown mode '$1'." >&2
   exit 1
 fi
 
 "$@"