[前][次][番号順一覧][スレッド一覧]

ruby-changes:73730

From: Nobuyoshi <ko1@a...>
Date: Sun, 25 Sep 2022 22:40:28 +0900 (JST)
Subject: [ruby-changes:73730] dc7d929e54 (master): Extract `RUBY_RELEASE_DATE` from also revision.h

https://git.ruby-lang.org/ruby.git/commit/?id=dc7d929e54

From dc7d929e542a3372113f7864b26384ceab596197 Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@r...>
Date: Sun, 25 Sep 2022 22:40:05 +0900
Subject: Extract `RUBY_RELEASE_DATE` from also revision.h

This make variable is very useful for daily build.
---
 configure.ac         | 15 +++++++++------
 template/Makefile.in |  2 +-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/configure.ac b/configure.ac
index d477ea1dc4..55288b92c0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4384,12 +4384,15 @@ AC_CONFIG_FILES(Makefile:template/Makefile.in, [ https://github.com/ruby/ruby/blob/trunk/configure.ac#L4384
 	AS_CASE("$VCS",
 		['$(GIT)'|git], [VCSUP='$(VCS) pull --rebase $(GITPULLOPTIONS)'],
 		[VCSUP='$(VCS)'])
-	sed -n \
-	    -e '[/^@%:@define \(RUBY_RELEASE_[A-Z]*\) \([0-9][0-9]*\)/]{' \
-	    -e   's//\1 = \2/' \
-	    -e   '[s/ \([0-9]\)$/ 0\1/]' \
-	    -e   p \
-	    -e '}' "$srcdir/version.h"
+	for f in "$srcdir/version.h" "$srcdir/revision.h"; do
+            test -f "$f" || continue
+	    sed -n \
+	        -e '[/^@%:@define \(RUBY_RELEASE_[A-Z]*\) \([0-9][0-9]*\)/]{' \
+	        -e   's//\1 = \2/' \
+	        -e   '[s/ \([0-9]\)$/ 0\1/]' \
+	        -e   p \
+	        -e '}' "$f"
+        done
 	sed '/^MISSING/s/\$U\././g;/^VCS *=/s#@VCS@#'"$VCS"'#;/^VCSUP *=/s#@VCSUP@#'"$VCSUP"'#' Makefile
 	echo; test x"$EXEEXT" = x || echo 'miniruby: miniruby$(EXEEXT)'
 	AS_IF([test "$gnumake" != yes], [
diff --git a/template/Makefile.in b/template/Makefile.in
index 1a7843edb6..854b0f0014 100644
--- a/template/Makefile.in
+++ b/template/Makefile.in
@@ -381,7 +381,7 @@ install-cross: $(arch)-fake.rb $(RBCONFIG) rbconfig.rb $(arch_hdrdir)/ruby/confi https://github.com/ruby/ruby/blob/trunk/template/Makefile.in#L381
 
 Makefile:	$(srcdir)/template/Makefile.in $(srcdir)/enc/Makefile.in
 
-$(MKFILES): config.status $(srcdir)/version.h $(ABI_VERSION_HDR)
+$(MKFILES): config.status $(srcdir)/version.h $(srcdir)/revision.h $(ABI_VERSION_HDR)
 		@[ -f $@ ] && mv $@ $@.old
 		MAKE=$(MAKE) $(SHELL) ./config.status $@
 		@cmp $@ $@.old > /dev/null 2>&1 && echo $@ unchanged && exit 0; \
-- 
cgit v1.2.1


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]