Add top level build script for building packages.

build_tools/common.sh

 # Copyright (c) 2012 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.
 #
 # Environment variable NACL_ARCH should be unset or set to "i686"
 # for a 32-bit build.  It should be set to "x86_64", "pnacl", or "arm"
 # for a 64-bit, pnacl, or arm builds.
 
 
 # NAMING CONVENTION
 # =================
 #
-# This file is source'd by other scripts especially those inside ports/
-# and makes functions env variables available to those scripts.
-# Only variables beginging with "NACL_" are intended to be used by those
-# scripts!
+# This file is source'd by the main naclports build script.  Functions
+# and variabled defined here are available in the build script for

[binji, 2014/01/13 23:05:42]

sp: variables

[Sam Clegg, 2014/01/14 01:54:38]

Done.

+# individual ports.  Only variables beginging with "NACL_" are intended
+# to be used by those scripts.
 
 set -o nounset
 set -o errexit
 
-# Scripts that source this file must be run from within the naclports src tree.
-# Note that default build steps reference the packages directory.
-readonly SAVE_PWD=$(pwd)
-
 readonly TOOLS_DIR=$(cd "$(dirname "$BASH_SOURCE")" ; pwd)
-readonly START_DIR=$(cd "$(dirname "$0")" ; pwd)
+readonly START_DIR=$PWD
 readonly NACL_SRC=$(dirname ${TOOLS_DIR})
 readonly NACL_PACKAGES=${NACL_SRC}
 readonly NACL_NATIVE_CLIENT_SDK=$(cd ${NACL_SRC} ; pwd)
 NACL_DEBUG=${NACL_DEBUG:-0}
 
+NACL_ENV_IMPORT=1
 . ${TOOLS_DIR}/nacl_env.sh
 
 # When run by a buildbot force all archives to come from the NaCl mirror
 # rather than using upstream URL.
 if [ -n ${BUILDBOT_BUILDERNAME:-""} ]; then
   FORCE_MIRROR=${FORCE_MIRROR:-"yes"}
 fi
 
 # sha1check python script
 readonly SHA1CHECK=${TOOLS_DIR}/sha1check.py
@@ skipping 145 matching lines @@
 if [ "${NACL_DEBUG}" = "1" ]; then
   NACL_CONFIG=Debug
 else
   NACL_CONFIG=Release
 fi
 
 # PACKAGE_DIR (the folder contained within that archive) defaults to
 # the PACKAGE_NAME.  Packages with non-standard contents can override
 # this before including common.sh
 PACKAGE_DIR=${PACKAGE_DIR:-${PACKAGE_NAME:-}}
+SRC_DIR=${NACL_PACKAGES_REPOSITORY}/${PACKAGE_DIR}
+DEFAULT_BUILD_DIR=${SRC_DIR}/${NACL_BUILD_SUBDIR}
+BUILD_DIR=${NACL_BUILD_DIR:-${DEFAULT_BUILD_DIR}}
+
 
 PUBLISH_DIR="${NACL_PACKAGES_PUBLISH}/${PACKAGE_NAME}"
 if [ "${NACL_ARCH}" = "pnacl" ]; then
   PUBLISH_DIR+=/pnacl
 else
   PUBLISH_DIR+=/${NACL_LIBC}
 fi
 
 if [ "${NACL_ARCH}" != "pnacl" -a -z "${NACL_SEL_LDR:-}" ]; then
   SKIP_SEL_LDR_TESTS=1
@@ skipping 130 matching lines @@
 # Helper functions
 ######################################################################
 
 Banner() {
   echo "######################################################################"
   echo $*
   echo "######################################################################"
 }
 
 
-Usage() {
-  egrep "^#@" $0 | cut --bytes=3-
-}
-
-
-ReadKey() {
-  read
-}
-
-
 # echo a command to stdout and then execute it.
 LogExecute() {
   echo $*
   $*
 }
 
 
 # Set the ARCHIVE_NAME variable to the nacl of the upstream
 # tarball.  If ${URL} is not define (when there is no upstream)
 # then leave ARCHIVE_NAME unset.
@@ skipping 29 matching lines @@
   local FILENAME=$2
   Banner "Fetching ${PACKAGE_NAME} (${FILENAME})"
   if which wget > /dev/null ; then
     wget ${URL} -O ${FILENAME}
   elif which curl > /dev/null ; then
     curl --fail --location --url ${URL} -o ${FILENAME}
   else
      Banner "Problem encountered"
      echo "Please install curl or wget and rerun this script"
      echo "or manually download ${URL} to ${FILENAME}"
-     echo
-     echo "press any key when done"
-     ReadKey
+     exit 1
   fi
 }
 
 
 #
 # Download a file from a given URL
 # $1 - URL to fetch
 # $2 - Filename to write to.
 #
 Fetch() {
@@ skipping 63 matching lines @@
 
   cd ${NACL_PACKAGES_REPOSITORY}
   rm -rf ${PACKAGE_DIR}
   git clone ${GIT_URL} ${PACKAGE_DIR}
   cd ${PACKAGE_DIR}
   git reset --hard ${COMMIT}
 
   TouchKeyStamp clone "$URL"
 }
 
+
 Patch() {
   local LOCAL_PATCH_FILE=$1
   if [ -e "${START_DIR}/${LOCAL_PATCH_FILE}" ]; then
     Banner "Patching $(basename ${PWD})"
     #git apply ${START_DIR}/${LOCAL_PATCH_FILE}
     patch -p1 -g0 --no-backup-if-mismatch < ${START_DIR}/${LOCAL_PATCH_FILE}
     git add .
     git commit -m "Apply naclports patch"
   fi
 }
 
 
 VerifyPath() {
   # make sure path isn't all slashes (possibly from an unset variable)
   local PATH=$1
   local TRIM=${PATH##/}
   if [ ${#TRIM} -ne 0 ]; then
     return 0
   else
     return 1
   fi
 }
 
 
 ChangeDir() {
   local NAME=$1
   if VerifyPath ${NAME}; then
+    echo "chdir ${NAME}"
     cd ${NAME}
   else
     echo "ChangeDir called with bad path."
     exit -1
   fi
 }
 
 
 Remove() {
   local NAME=$1
@@ skipping 264 matching lines @@
   export AR=${NACLAR}
   export RANLIB=${NACLRANLIB}
   export READELF=${NACLREADELF}
   export PKG_CONFIG_PATH=${NACLPORTS_LIBDIR}/pkgconfig
   export PKG_CONFIG_LIBDIR=${NACLPORTS_LIBDIR}
   export FREETYPE_CONFIG=${NACLPORTS_PREFIX_BIN}/freetype-config
   export CFLAGS=${NACLPORTS_CFLAGS}
   export CXXFLAGS=${NACLPORTS_CXXFLAGS}
   export LDFLAGS=${NACLPORTS_LDFLAGS}
   export PATH=${NACL_BIN_PATH}:${PATH};
-  local SRC_DIR=${NACL_PACKAGES_REPOSITORY}/${PACKAGE_DIR}
   local CONFIGURE=${NACL_CONFIGURE_PATH:-${SRC_DIR}/configure}
   if [ ! -f "${CONFIGURE}" ]; then
     echo "No configure script found at ${CONFIGURE}"
     return
   fi
-  local DEFAULT_BUILD_DIR=${SRC_DIR}/${NACL_BUILD_SUBDIR}
-  NACL_BUILD_DIR=${NACL_BUILD_DIR:-${DEFAULT_BUILD_DIR}}
-  MakeDir ${NACL_BUILD_DIR}
-  ChangeDir ${NACL_BUILD_DIR}
+  MakeDir ${BUILD_DIR}
+  ChangeDir ${BUILD_DIR}
 
   local conf_host=${NACL_CROSS_PREFIX}
   if [ "${NACL_ARCH}" = "pnacl" -o "${NACL_ARCH}" = "emscripten" ]; then
     # The PNaCl tools use "pnacl-" as the prefix, but config.sub
     # does not know about "pnacl".  It only knows about "le32-nacl".
     # Unfortunately, most of the config.subs here are so old that
     # it doesn't know about that "le32" either.  So we just say "nacl".
     conf_host="nacl"
   fi
 
@@ skipping 14 matching lines @@
     --${NACL_OPTION}-sse \
     --${NACL_OPTION}-sse2 \
     --${NACL_OPTION}-asm \
     --with-x=no  \
     "${EXTRA_CONFIGURE_OPTS[@]}" ${EXTRA_CONFIGURE_ARGS:-}
 }
 
 
 CMakeConfigureStep() {
   Banner "Configuring ${PACKAGE_NAME}"
-  local SRC_DIR=${NACL_PACKAGES_REPOSITORY}/${PACKAGE_DIR}
-  local DEFAULT_BUILD_DIR=${SRC_DIR}/${NACL_BUILD_SUBDIR}
-  NACL_BUILD_DIR=${NACL_BUILD_DIR:-${DEFAULT_BUILD_DIR}}
-  MakeDir ${NACL_BUILD_DIR}
-  ChangeDir ${NACL_BUILD_DIR}
+  MakeDir ${BUILD_DIR}
+  ChangeDir ${BUILD_DIR}
 
   CC="${NACLCC}" CXX="${NACLCXX}" LogExecute cmake ..\
            -DCMAKE_TOOLCHAIN_FILE=${TOOLS_DIR}/XCompile-nacl.cmake \
            -DNACLAR=${NACLAR} \
            -DNACLLD=${NACLLD} \
            -DNACL_CROSS_PREFIX=${NACL_CROSS_PREFIX} \
            -DNACL_SDK_ROOT=${NACL_SDK_ROOT} \
            -DNACL_TOOLCHAIN_ROOT=${NACL_TOOLCHAIN_ROOT} \
            -DCMAKE_INSTALL_PREFIX=${NACLPORTS_PREFIX} \
            -DCMAKE_BUILD_TYPE=RELEASE ${EXTRA_CMAKE_ARGS:-}
 }
 
 
 DefaultBuildStep() {
   Banner "Build ${PACKAGE_NAME}"
-  echo "Directory: $(pwd)"
+  ChangeDir ${BUILD_DIR}
   # Build ${MAKE_TARGETS} or default target if it is not defined
   if [ -n "${MAKEFLAGS:-}" ]; then
     echo "MAKEFLAGS=${MAKEFLAGS}"
     export MAKEFLAGS
   fi
   export PATH=${NACL_BIN_PATH}:${PATH};
   LogExecute make -j${OS_JOBS} ${MAKE_TARGETS:-}
 }
 
 
@@ skipping 274 matching lines @@
   BuildStep
   TranslateStep
   ValidateStep
   if [ "${SKIP_SEL_LDR_TESTS}" != "1" ]; then
     TestStep
   fi
   InstallStep
 }
 
 
+NaclportsMain() {
+  local COMMAND=PackageInstall
+  if [[ $# -gt 0 ]]; then
+    COMMAND=$1
+  fi
+  echo ${COMMAND}
+  ${COMMAND}
+}
+
+
 # Function entry points that packages should override in order
 # to customize the build process.
 PreInstallStep() { DefaultPreInstallStep; }
 DownloadStep()   { DefaultDownloadStep;   }
 ExtractStep()    { DefaultExtractStep;    }
 PatchStep()      { DefaultPatchStep;      }
 ConfigureStep()  { DefaultConfigureStep;  }
 BuildStep()      { DefaultBuildStep;      }
 TranslateStep()  { DefaultTranslateStep;  }
 ValidateStep()   { DefaultValidateStep;   }
 TestStep()       { DefaultTestStep;       }
 InstallStep()    { DefaultInstallStep;    }
 PackageInstall() { DefaultPackageInstall; }
 
 
 ######################################################################
 # Always run
 # These functions are called when this script is imported to do
 # any essential checking/setup operations.
 ######################################################################
 CheckToolchain
 CheckPatchVersion
 CheckSDKVersion
 PatchSpecFile
 InjectSystemHeaders
 InstallConfigSite