Switch devenv to use pkg 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 set to one of the following
 # values: i686 x86_64 pnacl arm
 
 
 # NAMING CONVENTION
 # =================
@@ skipping 227 matching lines @@
 
 
 # DESTDIR is where the headers, libraries, etc. will be installed
 # Default to the usr folder within the SDK.
 if [ -z "${DESTDIR:-}" ]; then
   readonly DEFAULT_DESTDIR=1
   DESTDIR=${INSTALL_DIR}
 fi
 
 DESTDIR_LIB=${DESTDIR}/${PREFIX}/lib
+DESTDIR_BIN=${DESTDIR}/${PREFIX}/bin
 DESTDIR_INCLUDE=${DESTDIR}/${PREFIX}/include
 
 PUBLISH_DIR="${NACL_PACKAGES_PUBLISH}/${PACKAGE_NAME}/${TOOLCHAIN}"
 PUBLISH_CREATE_NMF_ARGS="-L ${DESTDIR_LIB}"
 
 SKIP_SEL_LDR_TESTS=0
 
 # Skip sel_ldr tests when building for arm
 if [ "${NACL_ARCH}" = "arm" ]; then
   SKIP_SEL_LDR_TESTS=1
@@ skipping 415 matching lines @@
   # a few months.
   if [ ! -d "${NACL_PACKAGES_CACHE}" -a -d "${NACL_PACKAGES_OUT}/tarballs" ]; then
     mv "${NACL_PACKAGES_OUT}/tarballs" "${NACL_PACKAGES_CACHE}"
   fi
   MakeDir "${NACL_PACKAGES_CACHE}"
   MakeDir "${NACL_PACKAGES_PUBLISH}"
   MakeDir "${WORK_DIR}"
 }
 
 
-PublishByArchForDevEnv() {
-  MakeDir "${PUBLISH_DIR}"
-  local ARCH_DIR=${PUBLISH_DIR}/${NACL_ARCH}
-  MakeDir "${ARCH_DIR}"
-  # TODO(bradnelson): Drop this once all pors that have executables list them
-  # explicitly (required for pnacl to work right anyhow).
-  if [ "${EXECUTABLES:-}" != "" ]; then
-    local executables="${EXECUTABLES}"
-  elif [ "${OS_NAME}" != "Darwin" ]; then
-    # -executable is not supported on BSD and -perm +nn is not
-    # supported on linux
-    local executables=$(find . -type f -executable -not -path "*/.git/*")
-  else
-    local executables=$(find . -type f -perm +u+x -not -path "*/.git/*")
-  fi
-  for nexe in ${executables}; do
-    local name=$(basename ${nexe})
-    name=${name/%.nexe/}
-    name=${name/%.pexe/}
-    LogExecute cp "${nexe}" "${ARCH_DIR}/${name}"
-    # TODO(bradnelson): Do something prettier.
-    if [[ "$(head -c 2 ${nexe})" != "#!" && \
-          "$(head -c 2 ${nexe})" != "# " && \
-          "${nexe}" != *.so && \
-          "${nexe}" != *.so.* && \
-          "${nexe}" != *.txt && \
-          "${nexe}" != config.status ]]; then
-      # Strip non-scripts
-      LogExecute "${NACLSTRIP}" "${ARCH_DIR}/${name}"
-
-      # Run create_nmf for non-scripts.
-      # Stage libraries for toolchains that support dynamic linking.
-      if [[ "${TOOLCHAIN}" = "glibc" || "${TOOLCHAIN}" = "bionic" ]]; then
-        pushd "${ARCH_DIR}"
-        # Create a temporary name ending in .nexe so create_nmf does the right
-        # thing.
-        LogExecute cp "${name}" tmp.nexe
-        LogExecute python "${NACL_SDK_ROOT}/tools/create_nmf.py" \
-          tmp.nexe -s . -o tmp.nmf ${PUBLISH_CREATE_NMF_ARGS:-}
-        LogExecute rm tmp.nexe
-        LogExecute rm tmp.nmf
-        popd
-      fi
-    fi
-  done
-  ChangeDir "${ARCH_DIR}"
-  Remove "${ARCH_DIR}.zip"
-  LogExecute zip -r "${ARCH_DIR}.zip" .
-}
-
 #
 # Assemble a multi-arch version for use in the devenv packaged app.
 #
 #
 PublishMultiArch() {
   local binary=$1
   local target=$2
 
   if [ $# -gt 2 ]; then
     local assembly_dir="${PUBLISH_DIR}/$3"
@@ skipping 810 matching lines @@
     local args=""
   fi
   # Create packge in temporary location and move into place once
   # done.  This prevents partially created packages from being
   # left lying around if this process is interrupted.
   LogExecute tar cjf "${PACKAGE_FILE}.tmp" -C "${INSTALL_DIR}" ${args} .
   LogExecute mv -f "${PACKAGE_FILE}.tmp" "${PACKAGE_FILE}"
 }
 
 
-ZipPublishDir() {
-  # If something exists in the publish directory, zip it for download by mingn.
-  if [ "${NACLPORTS_QUICKBUILD}" = "1" ]; then
-    return
-  fi
-
-  if [ ! -d "${PUBLISH_DIR}" ]; then
-    return
-  fi
-
-  # If an arch specfic zip already exists (e.g. from PublishByArchForDevEnv)
-  # then skip supping the whole publish dir
-  if [ -f "${PUBLISH_DIR}/${NACL_ARCH}.zip" ]; then
-    return
-  fi
-
-  # Remove existing zip as it may contain only some architectures.
-  Remove "${PUBLISH_DIR}.zip"
-  ChangeDir "${PUBLISH_DIR}"
-  LogExecute zip -rq "${PUBLISH_DIR}.zip" ./
-}
-
-
 PackageInstall() {
   RunDownloadStep
   RunPatchStep
   RunConfigureStep
   RunBuildStep
   RunPostBuildStep
   RunTestStep
   RunInstallStep
   RunPublishStep
   RunPostInstallTestStep
-  ZipPublishDir
   PackageStep
 }
 
 
 NaclportsMain() {
   local COMMAND=PackageInstall
   if [[ $# -gt 0 ]]; then
     COMMAND=Run$1
   fi
   if [ -d "${BUILD_DIR}" ]; then
@@ skipping 98 matching lines @@
 # These functions are called when this script is imported to do
 # any essential checking/setup operations.
 ######################################################################
 CheckToolchain
 CheckPatchVersion
 PatchSpecsFile
 InjectSystemHeaders
 InstallConfigSite
 GetRevision
 MakeDirs