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

pnacl/build.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.
 #
 #@                 Untrusted Toolchain Manager
 #@-------------------------------------------------------------------
 #@ This script builds the ARM and PNaCl untrusted toolchains.
 #@ It MUST be run from the native_client/ directory.
 #
 ######################################################################
 # Directory Layout Description
 ######################################################################
 #
 # All directories are relative to BASE which is
 # On Linux X86-64: native_client/toolchain/pnacl_linux_x86_64/
 # On Linux X86-32: native_client/toolchain/pnacl_linux_i686/
 # On Mac X86-32  : native_client/toolchain/pnacl_darwin_i386/
 #
 ######################################################################
 # Config
 ######################################################################
 
 set -o nounset
 set -o errexit
 
-# The script is located in "native_client/tools/llvm".
+# The script is located in "native_client/pnacl".
 # Set pwd to native_client/
-cd "$(dirname "$0")"/../..
+cd "$(dirname "$0")"/..
 if [[ $(basename "$(pwd)") != "native_client" ]] ; then
   echo "ERROR: cannot find native_client/ directory"
   exit -1
 fi
+
+source pnacl/scripts/common-tools.sh
+
 readonly NACL_ROOT="$(pwd)"
 
-source tools/llvm/common-tools.sh
-
-SetScriptPath "${NACL_ROOT}/tools/llvm/utman.sh"
+SetScriptPath "${NACL_ROOT}/pnacl/build.sh"
 SetLogDirectory "${NACL_ROOT}/toolchain/hg-log"
 
 # NOTE: gcc and llvm have to be synchronized
 #       we have chosen toolchains which both are based on gcc-4.2.1
 
 # For different levels of make parallelism change this in your env
-readonly UTMAN_CONCURRENCY=${UTMAN_CONCURRENCY:-8}
-readonly UTMAN_MERGE_TESTING=${UTMAN_MERGE_TESTING:-false}
-UTMAN_PRUNE=${UTMAN_PRUNE:-false}
-UTMAN_BUILD_ARM=true
+readonly PNACL_CONCURRENCY=${PNACL_CONCURRENCY:-8}
+readonly PNACL_MERGE_TESTING=${PNACL_MERGE_TESTING:-false}
+PNACL_PRUNE=${PNACL_PRUNE:-false}
+PNACL_BUILD_ARM=true
 
 if ${BUILD_PLATFORM_MAC} || ${BUILD_PLATFORM_WIN}; then
   # We don't yet support building ARM tools for mac or windows.
-  UTMAN_BUILD_ARM=false
+  PNACL_BUILD_ARM=false
 fi
 
 # Set the library mode
 readonly LIBMODE=${LIBMODE:-newlib}
 
 LIBMODE_NEWLIB=false
 LIBMODE_GLIBC=false
 if [ ${LIBMODE} == "newlib" ]; then
   LIBMODE_NEWLIB=true
 elif [ ${LIBMODE} == "glibc" ]; then
   LIBMODE_GLIBC=true
-  UTMAN_BUILD_ARM=false
+  PNACL_BUILD_ARM=false
 else
   Fatal "Unknown library mode ${LIBMODE}"
 fi
 readonly LIBMODE_NEWLIB
 readonly LIBMODE_GLIBC
 
 readonly SB_JIT=${SB_JIT:-false}
 
 # TODO(pdox): Decide what the target should really permanently be
 readonly CROSS_TARGET_ARM=arm-none-linux-gnueabi
 readonly BINUTILS_TARGET=arm-pc-nacl
 readonly REAL_CROSS_TARGET=pnacl
 readonly NACL64_TARGET=x86_64-nacl
 
 readonly DRIVER_DIR="${NACL_ROOT}/pnacl/driver"
 readonly ARM_ARCH=armv7-a
 readonly ARM_FPU=vfp
 
 
 readonly NNACL_BASE="${NACL_ROOT}/toolchain/${SCONS_BUILD_PLATFORM}_x86"
 readonly NNACL_NEWLIB_ROOT="${NNACL_BASE}_newlib"
 readonly NNACL_GLIBC_ROOT="${NNACL_BASE}"
 
-readonly MAKE_OPTS="-j${UTMAN_CONCURRENCY} VERBOSE=1"
+readonly MAKE_OPTS="-j${PNACL_CONCURRENCY} VERBOSE=1"
 
 readonly NONEXISTENT_PATH="/going/down/the/longest/road/to/nowhere"
 
 # For speculative build status output. ( see status function )
 # Leave this blank, it will be filled during processing.
 SPECULATIVE_REBUILD_SET=""
 
 readonly PNACL_ROOT="${NACL_ROOT}/pnacl"
 readonly PNACL_SUPPORT="${PNACL_ROOT}/support"
 
@@ skipping 337 matching lines @@
     "                                                        " \
     " hg/${name} needs to be updated to the stable revision  " \
     " but has local modifications.                           " \
     "                                                        " \
     " If your repository is behind stable, update it using:  " \
     "                                                        " \
     "        cd hg/${name}; hg update ${rev}                 " \
     "        (you may need to resolve conflicts)             " \
     "                                                        " \
     " If your repository is ahead of stable, then modify:    " \
-    "   ${defstr}_REV   (in tools/llvm/utman.sh)             " \
+    "   ${defstr}_REV   (in pnacl/build.sh)                  " \
     " to suppress this error message.                        "
   exit -1
 }
 
 svn-assert-safe-to-update() {
   local name="$1"
   local dir="$2"
   local rev="$3"
   local defstr=$(echo "${name}" | tr '[a-z]-' '[A-Z]_')
 
@@ skipping 10 matching lines @@
     "                                                        " \
     " hg/${name} needs to be updated to the stable revision  " \
     " but has local modifications.                           " \
     "                                                        " \
     " If your repository is behind stable, update it using:  " \
     "                                                        " \
     "        cd hg/${name}; svn update -r ${rev}             " \
     "        (you may need to resolve conflicts)             " \
     "                                                        " \
     " If your repository is ahead of stable, then modify:    " \
-    "   ${defstr}_REV   (in tools/llvm/utman.sh)             " \
+    "   ${defstr}_REV   (in pnacl/build.sh)                  " \
     " to suppress this error message.                        "
   exit -1
 }
 
 hg-bot-sanity() {
   local name="$1"
   local dir="$2"
 
-  if ! ${UTMAN_BUILDBOT} ; then
+  if ! ${PNACL_BUILDBOT} ; then
     return 0
   fi
 
   if ! hg-on-branch "${dir}" pnacl-sfi ||
      hg-has-changes "${dir}" ||
      hg-has-untracked "${dir}" ; then
     Banner "WARNING: hg/${name} is in an illegal state." \
            "         Wiping and trying again."
     rm -rf "${dir}"
     hg-checkout-${name}
   fi
 }
 
 svn-bot-sanity() {
   local name="$1"
   local dir="$2"
 
-  if ! ${UTMAN_BUILDBOT} ; then
+  if ! ${PNACL_BUILDBOT} ; then
     return 0
   fi
 
   if svn-has-changes "${dir}" ; then
     Banner "WARNING: hg/${name} is in an illegal state." \
            "         Wiping and trying again."
     rm -rf "${dir}"
     svn-checkout-${name}
   fi
 }
@@ skipping 34 matching lines @@
   if svn-at-revision "${dir}" "${rev}" ; then
     StepBanner "SVN-UPDATE" "Repo ${name} already at ${rev}"
   else
     StepBanner "SVN-UPDATE" "Updating ${name} to ${rev}"
     svn-update "${dir}" ${rev}
   fi
 }
 
 hg-update-upstream() {
   llvm-unlink-clang
-  if ! ${UTMAN_MERGE_TESTING} ; then
+  if ! ${PNACL_MERGE_TESTING} ; then
     hg-update-common "upstream" ${UPSTREAM_REV} "${TC_SRC_UPSTREAM}"
   fi
   llvm-link-clang
 }
 
 svn-update-llvm-master() {
   svn-update-common "llvm-master" ${LLVM_MASTER_REV} "${TC_SRC_LLVM_MASTER}"
 }
 
 svn-update-llvm-gcc-master() {
@@ skipping 79 matching lines @@
   svn-checkout-clang
   svn-checkout-dragonegg
   hg-checkout-binutils
   hg-checkout-newlib
   hg-checkout-compiler-rt
   hg-checkout-google-perftools
   git-sync
 }
 
 hg-checkout-upstream() {
-  if ! ${UTMAN_MERGE_TESTING} ; then
+  if ! ${PNACL_MERGE_TESTING} ; then
     hg-checkout ${REPO_UPSTREAM} "${TC_SRC_UPSTREAM}" ${UPSTREAM_REV}
   fi
   llvm-link-clang
 }
 
 svn-checkout-llvm-master() {
   svn-checkout "${REPO_LLVM_MASTER}" "${TC_SRC_LLVM_MASTER}" ${LLVM_MASTER_REV}
 }
 
 svn-checkout-llvm-gcc-master() {
@@ skipping 143 matching lines @@
 #@ everything            - Build and install untrusted SDK. no translator
 everything() {
   everything-hg
 
   everything-post-hg
 }
 
 #@ everything            - Checkout everything from the repositories
 everything-hg() {
   mkdir -p "${INSTALL_ROOT}"
-  if ${UTMAN_IN_CROS_CHROOT}; then
+  if ${PNACL_IN_CROS_CHROOT}; then
     # TODO: http://code.google.com/p/nativeclient/issues/detail?id=2295
     Banner "You are running in a ChromiumOS Chroot." \
       " You should make sure that the PNaCl sources are properly checked out " \
       " And updated outside of the chroot"
   else
     checkout-all
     StepBanner "Updating upstreaming repository"
     update-all
   fi
 }
@@ skipping 21 matching lines @@
   #      complete, so that sdk sanity checks don't fail
   misc-tools
   verify
 }
 
 #@ everything-translator   - Build and install untrusted SDK AND translator
 everything-translator() {
 
   everything
   # Building the sandboxed tools requires the SDK
-  if ${UTMAN_PRUNE}; then
+  if ${PNACL_PRUNE}; then
     prune
   fi
   sdk
   install-translators srpc
-  if ${UTMAN_PRUNE}; then
+  if ${PNACL_PRUNE}; then
     prune-translator-install srpc
     track-translator-size ${SBTC_BUILD_WITH_PNACL}
   fi
 }
 
 glibc() {
   StepBanner "GLIBC" "Copying glibc from NNaCl toolchain"
 
   mkdir -p "${INSTALL_LIB_X8632}"
   mkdir -p "${INSTALL_LIB_X8664}"
@@ skipping 174 matching lines @@
     echo "Error: untrusted_sdk needs a tarball name." >&2
     exit 1
   fi
 
   clean
   everything-translator
 
   # Remove the SDK so it doesn't end up in the tarball
   sdk-clean
 
-  if ${UTMAN_PRUNE}; then
+  if ${PNACL_PRUNE}; then
     prune
   fi
   tarball $1
 }
 
 #+ prune                 - Prune toolchain
 prune() {
   StepBanner "PRUNE" "Pruning toolchain"
   # ACCEPTABLE_SIZE should be much lower for real release,
   # but we are currently doing a debug build and not pruning
@@ skipping 785 matching lines @@
   local src="${TC_SRC_COMPILER_RT}/compiler-rt/lib"
   mkdir -p "${TC_BUILD_COMPILER_RT}"
   spushd "${TC_BUILD_COMPILER_RT}"
   StepBanner "COMPILER-RT (LIBGCC)"
   for arch in arm x86-32 x86-64; do
     StepBanner "compiler rt" "build ${arch}"
     rm -rf "${arch}"
     mkdir -p "${arch}"
     spushd "${arch}"
     RunWithLog libgcc.${arch}.make \
-        make -j ${UTMAN_CONCURRENCY} -f ${src}/Makefile-pnacl libgcc.a \
+        make -j ${PNACL_CONCURRENCY} -f ${src}/Makefile-pnacl libgcc.a \
           CC="${PNACL_CC}" \
           AR="${PNACL_AR}" \
           "SRC_DIR=${src}" \
           "CFLAGS=-arch ${arch} --pnacl-allow-translate -O3 -fPIC"
     spopd
   done
 
   StepBanner "compiler rt" "install all"
   ls -l */libgcc.a
 
@@ skipping 127 matching lines @@
 
   # Install bitcode library
   mkdir -p "${INSTALL_LIB}"
   cp "${objdir}/src/.libs/libstdc++.a" "${INSTALL_LIB}"
 
   spopd
 }
 
 #+ misc-tools            - Build and install sel_ldr and validator for ARM.
 misc-tools() {
-  if ${UTMAN_BUILD_ARM} ; then
+  if ${PNACL_BUILD_ARM} ; then
     StepBanner "MISC-ARM" "Building sel_ldr (ARM)"
 
     # TODO(robertm): revisit some of these options
     RunWithLog arm_sel_ldr \
       ./scons MODE=opt-host \
       platform=arm \
       sdl=none \
       naclsdk_validate=0 \
       sysinfo=0 \
       sel_ldr
@@ skipping 602 matching lines @@
   spopd
 }
 
 #+ google-perftools-make - Make tcmalloc-minimal in bitcode
 google-perftools-make() {
   local objdir="${TC_BUILD_GOOGLE_PERFTOOLS}"
   spushd "${objdir}"
   StepBanner "GOOGLE-PERFTOOLS" "Make"
   ts-touch-open "${objdir}"
   RunWithLog google-perftools.make \
-    make -j ${UTMAN_CONCURRENCY}
+    make -j ${PNACL_CONCURRENCY}
   ts-touch-commit "${objdir}"
   spopd
 }
 
 #+ google-perftools-install - Install libtcmalloc_minimal.a into toolchain
 google-perftools-install() {
   StepBanner "GOOGLE-PERFTOOLS" "Install"
   spushd "${TC_BUILD_GOOGLE_PERFTOOLS}"
   RunWithLog google-perftools.install \
     make install
@@ skipping 509 matching lines @@
 
     ${PNACL_AR} rc "${dest}"/libcrt_platform.a ${objs}
   done
 }
 
 #########################################################################
 #     < SDK >
 #########################################################################
 SCONS_COMMON=(./scons
               MODE=nacl
-              -j${UTMAN_CONCURRENCY}
+              -j${PNACL_CONCURRENCY}
               bitcode=1
               sdl=none
               disable_nosys_linker_warnings=1
               naclsdk_validate=0
               --verbose)
 
 sdk() {
   StepBanner "SDK"
   sdk-clean
   sdk-headers
@@ skipping 124 matching lines @@
     echo ""
     echo "*******************************************************************"
     echo "*                            ERROR                                *"
     echo "*      The NewLib include directory has local modifications       *"
     echo "*******************************************************************"
     echo "* The NewLib include directory should not be modified directly.   *"
     echo "* Instead, modifications should be done from:                     *"
     echo "*   src/trusted/service_runtime/include                           *"
     echo "*                                                                 *"
     echo "* To destroy the local changes to newlib, run:                    *"
-    echo "*  tools/llvm/utman.sh newlib-nacl-headers-clean                  *"
+    echo "*  pnacl/build.sh newlib-nacl-headers-clean                       *"
     echo "*******************************************************************"
     echo ""
-    if ${UTMAN_BUILDBOT} ; then
+    if ${PNACL_BUILDBOT} ; then
       newlib-nacl-headers-clean
     else
       exit -1
     fi
   fi
 }
 
 #+-------------------------------------------------------------------------
 #+ driver                - Install driver scripts.
 driver() {
@@ skipping 372 matching lines @@
 #
 # UTILITIES
 #
 ######################################################################
 ######################################################################
 
 #@-------------------------------------------------------------------------
 #@ show-config
 show-config() {
   Banner "Config Settings:"
-  echo "UTMAN_BUILDBOT:    ${UTMAN_BUILDBOT}"
-  echo "UTMAN_CONCURRENCY: ${UTMAN_CONCURRENCY}"
-  echo "UTMAN_DEBUG:       ${UTMAN_DEBUG}"
-  echo "UTMAN_PRUNE:       ${UTMAN_PRUNE}"
-  echo "UTMAN_VERBOSE:     ${UTMAN_VERBOSE}"
+  echo "PNACL_BUILDBOT:    ${PNACL_BUILDBOT}"
+  echo "PNACL_CONCURRENCY: ${PNACL_CONCURRENCY}"
+  echo "PNACL_DEBUG:       ${PNACL_DEBUG}"
+  echo "PNACL_PRUNE:       ${PNACL_PRUNE}"
+  echo "PNACL_VERBOSE:     ${PNACL_VERBOSE}"
   echo "LIBMODE:           ${LIBMODE}"
   Banner "Your Environment:"
-  env | grep UTMAN
+  env | grep PNACL
 }
 
 #@ help                  - Usage information.
 help() {
   Usage
 }
 
 #@ help-full             - Usage information including internal functions.
 help-full() {
   Usage2
 }
 
 has-trusted-toolchain() {
-  if [ -f toolchain/linux_arm-trusted/ld_script_arm_trusted ]; then
+  if [ -f ${NACL_ROOT}/toolchain/linux_arm-trusted/ld_script_arm_trusted ]; then
     return 0
   else
     return 1
   fi
 }
 
 check-for-trusted() {
-  if ! ${UTMAN_BUILD_ARM} ; then
+  if ! ${PNACL_BUILD_ARM} ; then
     return
   fi
 
   if ! has-trusted-toolchain; then
     echo '*******************************************************************'
     echo '*   The ARM trusted toolchain does not appear to be installed yet *'
     echo '*   It is needed to run ARM tests.                                *'
     echo '*                                                                 *'
     echo '*   To download and install the trusted toolchain, run:           *'
     echo '*                                                                 *'
-    echo '*       $ tools/llvm/utman.sh download-trusted                    *'
+    echo '*       $ pnacl/build.sh download-trusted                         *'
     echo '*                                                                 *'
     echo '*   To compile the trusted toolchain, use:                        *'
     echo '*                                                                 *'
     echo '*       $ tools/llvm/trusted-toolchain-creator.sh trusted_sdk     *'
     echo '*               (warning: this takes a while)                     *'
     echo '*******************************************************************'
 
     # If building on the bots, do not continue since it needs to run ARM tests.
-    if ${UTMAN_BUILDBOT} ; then
+    if ${PNACL_BUILDBOT} ; then
       echo "Building on bots --> need ARM trusted toolchain to run tests!"
       exit -1
     elif trusted-tc-confirm ; then
       echo "Continuing without ARM trusted toolchain"
-      UTMAN_BUILD_ARM=false
+      PNACL_BUILD_ARM=false
     else
       echo "Okay, stopping."
       exit -1
     fi
   fi
 }
 
 trusted-tc-confirm() {
   echo
   echo "Do you wish to continue without the ARM trusted TC (skip ARM testing)?"
   echo ""
   confirm-yes "Continue"
   return $?
 }
 
 DebugRun() {
-  if ${UTMAN_DEBUG} || ${UTMAN_BUILDBOT}; then
+  if ${PNACL_DEBUG} || ${PNACL_BUILDBOT}; then
     "$@"
   fi
 }
 
 ######################################################################
 # Generate chromium perf bot logs for tracking the size of
 # translator binaries.
 
 track-translator-size() {
   local platforms="$@"
@@ skipping 138 matching lines @@
 
 if [ "$(type -t $1)" != "function" ]; then
   #Usage
   echo "ERROR: unknown function '$1'." >&2
   echo "For help, try:"
   echo "    $0 help"
   exit 1
 fi
 
 "$@"