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

Side by Side Diff: build_tools/buildbot_common.sh

Issue 1804293003: Add support for new pnacl native toolchain driver (Closed) Base URL: https://chromium.googlesource.com/webports.git@master
Patch Set: Fix according to Brad's comments Created 4 years, 7 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 unified diff | Download patch
« no previous file with comments | « no previous file | build_tools/common.sh » ('j') | make_all.sh » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 #!/bin/bash 1 #!/bin/bash
2 # Copyright (c) 2014 The Native Client Authors. All rights reserved. 2 # Copyright (c) 2014 The Native Client Authors. All rights reserved.
3 # Use of this source code is governed by a BSD-style license that can be 3 # Use of this source code is governed by a BSD-style license that can be
4 # found in the LICENSE file. 4 # found in the LICENSE file.
5 5
6 RESULT=0 6 RESULT=0
7 MESSAGES= 7 MESSAGES=
8 8
9 # SCRIPT_DIR must be defined by the including script 9 # SCRIPT_DIR must be defined by the including script
10 readonly BASE_DIR="$(dirname ${SCRIPT_DIR})" 10 readonly BASE_DIR="$(dirname ${SCRIPT_DIR})"
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 BuildSuccess ${PACKAGE} ${NACL_ARCH} 66 BuildSuccess ${PACKAGE} ${NACL_ARCH}
67 else 67 else
68 BuildFailure ${PACKAGE} ${NACL_ARCH} 68 BuildFailure ${PACKAGE} ${NACL_ARCH}
69 fi 69 fi
70 } 70 }
71 71
72 InstallPackageMultiArch() { 72 InstallPackageMultiArch() {
73 echo "@@@BUILD_STEP ${TOOLCHAIN} $1@@@" 73 echo "@@@BUILD_STEP ${TOOLCHAIN} $1@@@"
74 74
75 if [ "${TOOLCHAIN}" = "pnacl" ]; then 75 if [ "${TOOLCHAIN}" = "pnacl" ]; then
76 arch_list="pnacl" 76 arch_list="le32"
77 elif [ "${TOOLCHAIN}" = "emscripten" ]; then 77 elif [ "${TOOLCHAIN}" = "emscripten" ]; then
78 arch_list="emscripten" 78 arch_list="emscripten"
79 else 79 else
80 arch_list="i686 x86_64 arm" 80 arch_list="i686 x86_64 arm"
81 fi 81 fi
82 82
83 export TOOLCHAIN 83 export TOOLCHAIN
84 for arch in ${arch_list}; do 84 for arch in ${arch_list}; do
85 if ! RunCmd bin/webports -a ${arch} uninstall --all ; then 85 if ! RunCmd bin/webports -a ${arch} uninstall --all ; then
86 BuildFailure $1 ${arch} 86 BuildFailure $1 ${arch}
(...skipping 11 matching lines...) Expand all
98 done 98 done
99 BuildSuccess $1 all 99 BuildSuccess $1 all
100 } 100 }
101 101
102 CleanToolchain() { 102 CleanToolchain() {
103 # Don't use TOOLCHAIN and NACL_ARCH here as we don't want to 103 # Don't use TOOLCHAIN and NACL_ARCH here as we don't want to
104 # clobber the globals. 104 # clobber the globals.
105 TC=$1 105 TC=$1
106 106
107 if [ "${TC}" = "pnacl" ]; then 107 if [ "${TC}" = "pnacl" ]; then
108 arch_list="pnacl" 108 arch_list="le32 pnacl"
109 elif [ "${TC}" = "emscripten" ]; then 109 elif [ "${TC}" = "emscripten" ]; then
110 arch_list="emscripten" 110 arch_list="emscripten"
111 elif [ "${TC}" = "glibc" ]; then 111 elif [ "${TC}" = "glibc" ]; then
112 arch_list="i686 x86_64" 112 arch_list="i686 x86_64"
113 else 113 else
114 arch_list="i686 x86_64 arm" 114 arch_list="i686 x86_64 arm"
115 fi 115 fi
116 116
117 for ARCH in ${arch_list}; do 117 for ARCH in ${arch_list}; do
118 if ! RunCmd bin/webports -a ${ARCH} -t ${TC} clean --all; then 118 if ! RunCmd bin/webports -a ${ARCH} -t ${TC} clean --all; then
119 TOOLCHAIN=${TC} BuildFailure clean ${ARCH} 119 TOOLCHAIN=${TC} BuildFailure clean ${ARCH}
120 exit 1 120 exit 1
121 fi 121 fi
122 done 122 done
123 } 123 }
124 124
125 CleanCurrentToolchain() { 125 CleanCurrentToolchain() {
126 echo "@@@BUILD_STEP clean@@@" 126 echo "@@@BUILD_STEP clean@@@"
127 CleanToolchain ${TOOLCHAIN} 127 CleanToolchain ${TOOLCHAIN}
128 } 128 }
129 129
OLDNEW
« no previous file with comments | « no previous file | build_tools/common.sh » ('j') | make_all.sh » ('J')

Powered by Google App Engine
This is Rietveld 408576698