Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(647)

Unified Diff: build_tools/common.sh

Issue 1285953002: Switch devenv to use pkg packages (Closed) Base URL: https://chromium.googlesource.com/external/naclports.git@toolchain_install
Patch Set: Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | lib/naclports/source_package.py » ('j') | ports/curl/nacl.patch » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build_tools/common.sh
diff --git a/build_tools/common.sh b/build_tools/common.sh
index 692a0838cdac4fd7137e0db04247f66914861cc9..3d71550ee6a41c622207d874d3c74b3c48c23b36 100644
--- a/build_tools/common.sh
+++ b/build_tools/common.sh
@@ -680,56 +680,6 @@ MakeDirs() {
}
-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.
#
@@ -1560,29 +1510,6 @@ PackageStep() {
}
-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
@@ -1593,7 +1520,6 @@ PackageInstall() {
RunInstallStep
RunPublishStep
RunPostInstallTestStep
- ZipPublishDir
PackageStep
}
« no previous file with comments | « no previous file | lib/naclports/source_package.py » ('j') | ports/curl/nacl.patch » ('J')

Powered by Google App Engine
This is Rietveld 408576698