[gcc/devel/c++-modules] Here goes nothing ...

[Nathan Sidwell]

https://gcc.gnu.org/git/gitweb.cgi?p=gcc.git;h=52ccbf1b00902d943e09282e594783778981f95b

commit 52ccbf1b00902d943e09282e594783778981f95b
Author: Nathan Sidwell <nathans@fb.com>
Date:   Mon Jan 13 05:59:09 2020 -0800

    Here goes nothing ...
    
    	gcc/cp/
    	* Make-lang.in (MODULE_REVISION): SVN's dead, man.

Diff:
---
 ChangeLog.modules   |  6 +++++-
 gcc/cp/Make-lang.in | 19 ++++---------------
 2 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/ChangeLog.modules b/ChangeLog.modules
index bf98942..227a335 100644
--- a/ChangeLog.modules
+++ b/ChangeLog.modules
@@ -1,3 +1,8 @@
+2020-01-13  Nathan Sidwell  <nathan@acm.org>
+
+	gcc/cp/
+	* Make-lang.in (MODULE_REVISION): SVN's dead, man.
+
 2020-01-10  Nathan Sidwell  <nathan@acm.org>
 
 	Merge trunk r280131.
@@ -13956,4 +13961,3 @@ Local Variables:
 mode: change-log
 change-log-default-name: "ChangeLog.modules"
 End:
-$Rev$
diff --git a/gcc/cp/Make-lang.in b/gcc/cp/Make-lang.in
index 912f4d2..5c5a320 100644
--- a/gcc/cp/Make-lang.in
+++ b/gcc/cp/Make-lang.in
@@ -65,29 +65,18 @@ cp/module.o : $(srcdir)/cp
 MODULE_VERSION := $(shell date -r $(srcdir)/cp '+%y%m%d-%H%M' 2>/dev/null\
   || date '+%y%m%d-0000' 2>/dev/null || echo 0)
 
-# Try svnversion, remove lower bound commit, but retain dirty info
-MODULE_REVISION := $(shell svnversion $(srcdir) 2>/dev/null \
-  | sed -ne 's/^\(.*:\)\?\([0-9][0-9]*M\?S\?P\?\)$$/svn-\2/p')
-ifeq ($(MODULE_REVISION),)
-# Try git commit and dirty info, similar to svnversion.
+# Try git commit and dirty info
 MODULE_REVISION := $(shell git -C $(srcdir)/.. rev-parse --short HEAD \
   2>/dev/null | sed 's/\(.\)/git-\1/')
 ifneq ($(MODULE_REVISION),)
 # It is git, figure dirty info
 MODULE_REVISION := $(MODULE_REVISION)$(shell git -C $(srcdir)/.. \
     status --porcelain 2>/dev/null | sed -ne 's/..*/M/p;q')
-# and see if there's git-svn info
-MODULE_REV_SVN := $(shell git -C $(srcdir)/.. log ChangeLog.modules \
-  2>/dev/null | sed -ne '/ *git-svn-id: /{s/.*@\([^ ]*\).*/svn-\1/p;q}')
-ifneq ($(MODULE_REV_SVN),)
-MODULE_REVISION := $(MODULE_REVISION):$(MODULE_REV_SVN)
-endif
-endif
 endif
 ifeq ($(MODULE_REVISION),)
-# Get a rev from Changelog.modules
-MODULE_REVISION := $(shell tail -1 $(srcdir)/../ChangeLog.modules \
-  2>/dev/null | sed -ne 's/^\$$Rev: *\([0-9][0-9]*\) \$$$$/log-\1/p')
+# Git does not have keyword expansion, use the date of the most recent entry.
+MODULE_REVISION := $(shell head -1 $(srcdir)/../ChangeLog.modules \
+  2>/dev/null | sed -ne 's/^\([0-9]\+\)-\([0-9]\+\)-\([0-9]\+\) .*/log-\1\2\3/p')
 endif
 ifeq ($(MODULE_REVISION),)
 MODULE_REVISION := unknown