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

ruby-changes:34373

From: nobu <ko1@a...>
Date: Tue, 17 Jun 2014 05:23:38 +0900 (JST)
Subject: [ruby-changes:34373] nobu:r46454 (trunk): configure.in: extract date at build time

nobu	2014-06-17 05:23:23 +0900 (Tue, 17 Jun 2014)

  New Revision: 46454

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=46454

  Log:
    configure.in: extract date at build time
    
    * Makefile.in, configure.in (Makefile): extract RUBY_RELEASE_DATE from
      version.h at each build time.

  Modified files:
    trunk/Makefile.in
    trunk/configure.in
Index: configure.in
===================================================================
--- configure.in	(revision 46453)
+++ configure.in	(revision 46454)
@@ -197,8 +197,6 @@ AC_SUBST(MINOR) https://github.com/ruby/ruby/blob/trunk/configure.in#L197
 AC_SUBST(TEENY)
 RUBY_PROGRAM_VERSION=`sed -n 's/^#define RUBY_VERSION "\(.*\)"/\1/p' $srcdir/version.h`
 AC_SUBST(RUBY_PROGRAM_VERSION)
-RUBY_RELEASE_DATE=`sed -n 's/^#define RUBY_RELEASE_DATE "\(.*\)"/\1/p' $srcdir/version.h`
-AC_SUBST(RUBY_RELEASE_DATE)
 RUBY_PATCHLEVEL=`sed -n 's/^#define RUBY_PATCHLEVEL //p' $srcdir/version.h`
 AC_DEFINE(CANONICALIZATION_FOR_MATHN)
 dnl checks for alternative programs
@@ -4154,6 +4152,7 @@ AC_CONFIG_FILES(Makefile, [ https://github.com/ruby/ruby/blob/trunk/configure.in#L4152
 		["git svn"], [VCSUP='$(VCS) rebase $(GITSVNREBASEOPTIONS)'],
 		[git],       [VCSUP='$(VCS) pull $(GITPULLOPTIONS)'],
 		[VCSUP='$(VCS)'])
+	sed -n 's/^@%:@define \(RUBY_RELEASE_DATE\) "\(.*\)"/\1 = \2/p' "$srcdir/version.h"
 	sed '/^MISSING/s/\$U\././g;/^VCS *=/s#@VCS@#'"$VCS"'#;/^VCSUP *=/s#@VCSUP@#'"$VCSUP"'#' Makefile
 	echo; test x"$EXEEXT" = x || echo 'miniruby: miniruby$(EXEEXT)'
 	if test "$gnumake" != yes; then
Index: Makefile.in
===================================================================
--- Makefile.in	(revision 46453)
+++ Makefile.in	(revision 46454)
@@ -90,7 +90,6 @@ RUBY_BASE_NAME=@RUBY_BASE_NAME@ https://github.com/ruby/ruby/blob/trunk/Makefile.in#L90
 RUBY_PROGRAM_VERSION=@RUBY_PROGRAM_VERSION@
 RUBY_INSTALL_NAME=@RUBY_INSTALL_NAME@
 RUBY_SO_NAME=@RUBY_SO_NAME@
-RUBY_RELEASE_DATE=@RUBY_RELEASE_DATE@
 EXEEXT = @EXEEXT@
 LIBEXT = @LIBEXT@
 PROGRAM=$(RUBY_INSTALL_NAME)$(EXEEXT)
@@ -255,7 +254,7 @@ install-cross: $(arch)-fake.rb $(RBCONFI https://github.com/ruby/ruby/blob/trunk/Makefile.in#L254
 
 Makefile:	$(srcdir)/Makefile.in $(srcdir)/enc/Makefile.in
 
-$(MKFILES): config.status
+$(MKFILES): config.status $(srcdir)/version.h
 		@[ -f $@ ] && mv $@ $@.old
 		MAKE=$(MAKE) $(SHELL) ./config.status $@
 		@cmp $@ $@.old > /dev/null 2>&1 && echo $@ unchanged && exit 0; \

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

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