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

Side by Side Diff: build/install-build-deps.sh

Issue 24231003: Move call to install-chromeos-fonts after running apt-get (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 3 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 #!/bin/bash -e 1 #!/bin/bash -e
2 2
3 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 3 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
4 # Use of this source code is governed by a BSD-style license that can be 4 # Use of this source code is governed by a BSD-style license that can be
5 # found in the LICENSE file. 5 # found in the LICENSE file.
6 6
7 # Script to install everything needed to build chromium (well, ideally, anyway) 7 # Script to install everything needed to build chromium (well, ideally, anyway)
8 # See http://code.google.com/p/chromium/wiki/LinuxBuildInstructions 8 # See http://code.google.com/p/chromium/wiki/LinuxBuildInstructions
9 # and http://code.google.com/p/chromium/wiki/LinuxBuild64Bit 9 # and http://code.google.com/p/chromium/wiki/LinuxBuild64Bit
10 10
(...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after
214 do_inst_syms=1 214 do_inst_syms=1
215 fi 215 fi
216 fi 216 fi
217 if test "$do_inst_syms" = "1"; then 217 if test "$do_inst_syms" = "1"; then
218 echo "Installing debugging symbols." 218 echo "Installing debugging symbols."
219 else 219 else
220 echo "Skipping installation of debugging symbols." 220 echo "Skipping installation of debugging symbols."
221 dbg_list= 221 dbg_list=
222 fi 222 fi
223 223
224 # Install the Chrome OS default fonts.
225 if test "$do_inst_chromeos_fonts" != "0"; then
226 echo
227 echo "Installing Chrome OS fonts."
228 dir=`echo $0 | sed -r -e 's/\/[^/]+$//'`
229 if ! sudo $dir/linux/install-chromeos-fonts.py; then
230 echo "ERROR: The installation of the Chrome OS default fonts failed."
231 if [ `stat -f -c %T $dir` == "nfs" ]; then
232 echo "The reason is that your repo is installed on a remote file system."
233 else
234 echo "This is expected if your repo is installed on a remote file system."
235 fi
236 echo "It is recommended to install your repo on a local file system."
237 echo "You can skip the installation of the Chrome OS default founts with"
238 echo "the command line option: --no-chromeos-fonts."
239 exit 1
240 fi
241 else
242 echo "Skipping installation of Chrome OS fonts."
243 fi
244
245 # When cross building for arm on 64-bit systems the host binaries 224 # When cross building for arm on 64-bit systems the host binaries
246 # that are part of v8 need to be compiled with -m32 which means 225 # that are part of v8 need to be compiled with -m32 which means
247 # that basic multilib support is needed. 226 # that basic multilib support is needed.
248 if [ "$(uname -m)" = "x86_64" ]; then 227 if [ "$(uname -m)" = "x86_64" ]; then
249 arm_list="$arm_list g++-multilib" 228 arm_list="$arm_list g++-multilib"
250 fi 229 fi
251 230
252 if test "$do_inst_arm" = "1"; then 231 if test "$do_inst_arm" = "1"; then
253 . /etc/lsb-release 232 . /etc/lsb-release
254 if test "$DISTRIB_CODENAME" != "precise"; then 233 if test "$DISTRIB_CODENAME" != "precise"; then
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
298 echo "The following command failed: " ${new_list_cmd} 277 echo "The following command failed: " ${new_list_cmd}
299 echo 278 echo
300 echo "It produces the following output:" 279 echo "It produces the following output:"
301 yes n | $new_list_cmd || true 280 yes n | $new_list_cmd || true
302 echo 281 echo
303 echo "You will have to install the above packages yourself." 282 echo "You will have to install the above packages yourself."
304 echo 283 echo
305 exit 100 284 exit 100
306 fi 285 fi
307 286
287 # Install the Chrome OS default fonts. This must go after running
288 # apt-get, since install-chromeos-fonts depends on curl.
289 if test "$do_inst_chromeos_fonts" != "0"; then
290 echo
291 echo "Installing Chrome OS fonts."
292 dir=`echo $0 | sed -r -e 's/\/[^/]+$//'`
293 if ! sudo $dir/linux/install-chromeos-fonts.py; then
294 echo "ERROR: The installation of the Chrome OS default fonts failed."
295 if [ `stat -f -c %T $dir` == "nfs" ]; then
296 echo "The reason is that your repo is installed on a remote file system."
297 else
298 echo "This is expected if your repo is installed on a remote file system."
299 fi
300 echo "It is recommended to install your repo on a local file system."
301 echo "You can skip the installation of the Chrome OS default founts with"
302 echo "the command line option: --no-chromeos-fonts."
303 exit 1
304 fi
305 else
306 echo "Skipping installation of Chrome OS fonts."
307 fi
308
308 # Install 32bit backwards compatibility support for 64bit systems 309 # Install 32bit backwards compatibility support for 64bit systems
309 if [ "$(uname -m)" = "x86_64" ]; then 310 if [ "$(uname -m)" = "x86_64" ]; then
310 if test "$do_inst_lib32" != "1" 311 if test "$do_inst_lib32" != "1"
311 then 312 then
312 echo "NOTE: If you were expecting the option to install 32bit libs," 313 echo "NOTE: If you were expecting the option to install 32bit libs,"
313 echo "please run with the --lib32 flag." 314 echo "please run with the --lib32 flag."
314 echo 315 echo
315 echo "Installation complete." 316 echo "Installation complete."
316 exit 0 317 exit 0
317 else 318 else
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after
506 sed -e 's/[.]so[.][0-9].*/.so/' | 507 sed -e 's/[.]so[.][0-9].*/.so/' |
507 sort -u); do 508 sort -u); do
508 [ "x${i##*/}" = "xld-linux.so" ] && continue 509 [ "x${i##*/}" = "xld-linux.so" ] && continue
509 [ -r "$i" ] && continue 510 [ -r "$i" ] && continue
510 j="$(ls "$i."* | sed -e 's/.*[.]so[.]\([^.]*\)$/\1/;t;d' | 511 j="$(ls "$i."* | sed -e 's/.*[.]so[.]\([^.]*\)$/\1/;t;d' |
511 sort -n | tail -n 1)" 512 sort -n | tail -n 1)"
512 [ -r "$i.$j" ] || continue 513 [ -r "$i.$j" ] || continue
513 sudo ln -s "${i##*/}.$j" "$i" 514 sudo ln -s "${i##*/}.$j" "$i"
514 done 515 done
515 fi 516 fi
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698