Windows: Always use the depot_tools SVN version instead of the system SVN version.
git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1398 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
parent
4ca8905881
commit
28974d096c
|
@ -50,7 +50,7 @@ def get_svn_info(path):
|
||||||
try:
|
try:
|
||||||
if sys.platform == 'win32':
|
if sys.platform == 'win32':
|
||||||
# Force use of the SVN version bundled with depot_tools.
|
# Force use of the SVN version bundled with depot_tools.
|
||||||
svn = 'svn.bat'
|
svn = os.path.join(depot_tools_dir, 'svn.bat')
|
||||||
else:
|
else:
|
||||||
svn = 'svn'
|
svn = 'svn'
|
||||||
(stream_in, stream_out, stream_err) = os.popen3(svn+' info --xml '+path)
|
(stream_in, stream_out, stream_err) = os.popen3(svn+' info --xml '+path)
|
||||||
|
@ -262,9 +262,6 @@ if not os.path.exists(depot_tools_dir):
|
||||||
# checkout depot_tools
|
# checkout depot_tools
|
||||||
run('svn checkout '+depot_tools_url+' '+depot_tools_dir, download_dir)
|
run('svn checkout '+depot_tools_url+' '+depot_tools_dir, download_dir)
|
||||||
|
|
||||||
# Add depot_tools to the system path
|
|
||||||
sys.path.insert(1, depot_tools_dir)
|
|
||||||
|
|
||||||
if not options.url is None:
|
if not options.url is None:
|
||||||
# set the CEF URL
|
# set the CEF URL
|
||||||
cef_url = check_url(options.url)
|
cef_url = check_url(options.url)
|
||||||
|
|
Loading…
Reference in New Issue