src/native_client/scons - Issue 6719038: Revert r4644, "Updated NaCl's build system to use SCons 2.0.1."

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: src/native_client/scons

Issue 6719038: Revert r4644, "Updated NaCl's build system to use SCons 2.0.1." (Closed) Base URL: svn://svn.chromium.org/native_client/trunk/src/native_client

Patch Set: Created 9 years, 8 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 | « src/native_client/SConstruct ('k') | src/native_client/scons.bat » ('j') | no next file with comments »

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

2 # Copyright 2008, Google Inc.	2 # Copyright 2008, Google Inc.

3 # All rights reserved.	3 # All rights reserved.

4 #	4 #

5 # Redistribution and use in source and binary forms, with or without	5 # Redistribution and use in source and binary forms, with or without

6 # modification, are permitted provided that the following conditions are	6 # modification, are permitted provided that the following conditions are

7 # met:	7 # met:

8 #	8 #

9 # * Redistributions of source code must retain the above copyright	9 # * Redistributions of source code must retain the above copyright

10 # notice, this list of conditions and the following disclaimer.	10 # notice, this list of conditions and the following disclaimer.

(...skipping 29 matching lines...) Expand all Loading...
40 export PATH=${PATH/#\/bin*([^:])/}	40 export PATH=${PATH/#\/bin*([^:])/}

41 export PATH=${PATH//:\/bin*([^:])/}	41 export PATH=${PATH//:\/bin*([^:])/}

42 export PATH=${PATH/#\/usr*([^:])/}	42 export PATH=${PATH/#\/usr*([^:])/}

43 export PATH=${PATH//:\/usr*([^:])/}	43 export PATH=${PATH//:\/usr*([^:])/}

44 export PATH=${PATH/#([^:])cygwin([^:])/}	44 export PATH=${PATH/#([^:])cygwin([^:])/}

45 export PATH=${PATH//:([^:])cygwin([^:])/}	45 export PATH=${PATH//:([^:])cygwin([^:])/}

46 "${SCRIPT_DIR_ABS}/scons.bat" $*	46 "${SCRIPT_DIR_ABS}/scons.bat" $*

47 exit	47 exit

48 fi	48 fi

49	49

50 readonly BASE_SCRIPT="${SCRIPT_DIR_ABS}/../third_party/scons-2.0.1/script/scons"	50 readonly BASE_SCRIPT="${SCRIPT_DIR_ABS}/../third_party/scons/scons.py"

51	51

52 export PYTHONPATH="${SCRIPT_DIR_ABS}/../third_party/scons-2.0.1/engine"	52 export PYTHONPATH="${SCRIPT_DIR_ABS}/../third_party/scons/scons-local"

53	53

54 "${BASE_SCRIPT}" $*	54 "${BASE_SCRIPT}" $*

55	55

OLD	NEW