bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Change automate-git.py to use a Git checkout of depot_tools (issue #1376).

Browse Source 
git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1834 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2014-09-11 21:30:57 +00:00
parent 61ffc55ec3
commit d94aec3839
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
tools/automate/automate-git.py
View File

@@ -17,7 +17,8 @@ import zipfile
# Default URLs. # Default URLs.
## ##
depot_tools_url = 'http://src.chromium.org/svn/trunk/tools/depot_tools' depot_tools_url = 'https://chromium.googlesource.com/chromium/tools/depot_tools.git'
depot_tools_archive_url = 'https://src.chromium.org/svn/trunk/tools/depot_tools.zip'
cef_git_trunk_url = 'https://chromiumembedded@bitbucket.org/chromiumembedded/trunk-cef3.git' cef_git_trunk_url = 'https://chromiumembedded@bitbucket.org/chromiumembedded/trunk-cef3.git'
cef_git_branch_url = 'https://chromiumembedded@bitbucket.org/chromiumembedded/branches-%1-cef3.git' cef_git_branch_url = 'https://chromiumembedded@bitbucket.org/chromiumembedded/branches-%1-cef3.git'
@@ -507,6 +508,11 @@ else:
msg("Depot Tools Directory: %s" % (depot_tools_dir)) msg("Depot Tools Directory: %s" % (depot_tools_dir))
if not os.path.exists(depot_tools_dir): if not os.path.exists(depot_tools_dir):
if platform == 'windows' and options.depottoolsarchive == '':
# On Windows download depot_tools as an archive file since we can't assume
# that git is already installed.
options.depottoolsarchive = depot_tools_archive_url
if options.depottoolsarchive != '': if options.depottoolsarchive != '':
# Extract depot_tools from an archive file. # Extract depot_tools from an archive file.
msg('Extracting %s to %s.' % \ msg('Extracting %s to %s.' % \
@@ -515,11 +521,12 @@ if not os.path.exists(depot_tools_dir):
download_and_extract(options.depottoolsarchive, depot_tools_dir, \ download_and_extract(options.depottoolsarchive, depot_tools_dir, \
'depot_tools/') 'depot_tools/')
else: else:
# Checkout depot_tools. # On Linux and OS X check out depot_tools using Git.
run('svn checkout '+depot_tools_url+' '+depot_tools_dir, download_dir) run('git clone '+depot_tools_url+' '+depot_tools_dir, download_dir)
if not options.noupdate: if not options.noupdate:
# Update depot_tools. It will download required scripts (svn, git, python). # Update depot_tools.
# On Windows this will download required python and git binaries.
if platform == 'windows': if platform == 'windows':
run('update_depot_tools.bat', depot_tools_dir, depot_tools_dir); run('update_depot_tools.bat', depot_tools_dir, depot_tools_dir);
else: else: