aboutsummaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2020-01-13 16:32:57 +0000
committerJoseph Myers <joseph@codesourcery.com>2020-01-13 16:32:57 +0000
commitbc487d714191e91789ad420de274e789f710cac3 (patch)
tree10d52fbce465b026ec02e51aa0af0b852405eedd /scripts
parent3c8639b02efcbc5e8087b0f9bc63da8aeb203549 (diff)
downloadglibc-bc487d714191e91789ad420de274e789f710cac3.zip
glibc-bc487d714191e91789ad420de274e789f710cac3.tar.gz
glibc-bc487d714191e91789ad420de274e789f710cac3.tar.bz2
Update build-many-glibcs.py for GCC move to git.
This patch updates build-many-glibcs.py for the move of GCC to git, teaching it to do the initial checkout from git, to replace an SVN checkout with a git one if --replace-sources is used, and to get the commit identifier from a git checkout after updating it.
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/build-many-glibcs.py27
1 files changed, 17 insertions, 10 deletions
diff --git a/scripts/build-many-glibcs.py b/scripts/build-many-glibcs.py
index 1bd7f24..90b76ca 100755
--- a/scripts/build-many-glibcs.py
+++ b/scripts/build-many-glibcs.py
@@ -803,12 +803,10 @@ class Context(object):
return self.git_checkout(component, git_url, git_branch, update)
elif component == 'gcc':
if version == 'mainline':
- branch = 'trunk'
+ branch = 'master'
else:
- trans = str.maketrans({'.': '_'})
- branch = 'branches/gcc-%s-branch' % version.translate(trans)
- svn_url = 'svn://gcc.gnu.org/svn/gcc/%s' % branch
- return self.gcc_checkout(svn_url, update)
+ branch = 'releases/gcc-%s' % version
+ return self.gcc_checkout(branch, update)
elif component == 'glibc':
git_url = 'git://sourceware.org/git/glibc.git'
if version == 'mainline':
@@ -884,14 +882,23 @@ class Context(object):
to_touch = os.path.join(dirpath, f)
subprocess.run(['touch', to_touch], check=True)
- def gcc_checkout(self, svn_url, update):
- """Check out GCC from SVN. Return the revision number."""
+ def gcc_checkout(self, branch, update):
+ """Check out GCC from git. Return the commit identifier."""
+ if os.access(os.path.join(self.component_srcdir('gcc'), '.svn'),
+ os.F_OK):
+ if not self.replace_sources:
+ print('error: GCC has moved from SVN to git, use '
+ '--replace-sources to check out again')
+ exit(1)
+ shutil.rmtree(self.component_srcdir('gcc'))
+ update = False
if not update:
- subprocess.run(['svn', 'co', '-q', svn_url,
- self.component_srcdir('gcc')], check=True)
+ self.git_checkout('gcc', 'git://gcc.gnu.org/git/gcc.git',
+ branch, update)
subprocess.run(['contrib/gcc_update', '--silent'],
cwd=self.component_srcdir('gcc'), check=True)
- r = subprocess.run(['svnversion', self.component_srcdir('gcc')],
+ r = subprocess.run(['git', 'rev-parse', 'HEAD'],
+ cwd=self.component_srcdir('gcc'),
stdout=subprocess.PIPE,
check=True, universal_newlines=True).stdout
return r.rstrip()