trunk/platform_tools/nacl/nacl_make - Issue 14771017: Copy NaCl directory into trunk/platform_tools, adjust paths

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: trunk/platform_tools/nacl/nacl_make

Issue 14771017: Copy NaCl directory into trunk/platform_tools, adjust paths (Closed) Base URL: http://skia.googlecode.com/svn/

Patch Set: Created 7 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:

OLD	NEW
1 #!/bin/bash	1 #!/bin/bash

2	2

3 function setenv {	3 function setenv {

4 if [ -z "$1" ]; then	4 if [ -z "$1" ]; then

5 echo "ERROR: setenv() requires one argument."	5 echo "ERROR: setenv() requires one argument."

6 exit 1	6 exit 1

7 fi	7 fi

8 if [ -z "${NACL_SDK_ROOT}" ]; then	8 if [ -z "${NACL_SDK_ROOT}" ]; then

9 echo "ERROR: This script requires NACL_SDK_ROOT to be set."	9 echo "ERROR: This script requires NACL_SDK_ROOT to be set."

10 exit 1	10 exit 1

(...skipping 81 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
92 if [[ -n "$NACL_MAKE_CCACHE" ]]; then	92 if [[ -n "$NACL_MAKE_CCACHE" ]]; then

93 $NACL_MAKE_CCACHE --version &> /dev/null	93 $NACL_MAKE_CCACHE --version &> /dev/null

94 if [[ "$?" != "0" ]]; then	94 if [[ "$?" != "0" ]]; then

95 echo "Unable to find ccache!"	95 echo "Unable to find ccache!"

96 exit 1	96 exit 1

97 fi	97 fi

98 fi	98 fi

99	99

100 build 32 && \	100 build 32 && \

101 build 64 && \	101 build 64 && \

102 if ! [ -L ../nacl/out ]; then	102 if ! [ -L platform_tools/nacl/out ]; then

103 ln -s ../trunk/out ../nacl	103 ln -s ../../out platform_tools/nacl

104 fi	104 fi

OLD	NEW