yugui	2008-12-22 22:19:17 +0900 (Mon, 22 Dec 2008)

  New Revision: 20920

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

  Log:
    * common.mk (revision.h): uses tool/file2lastrev.rb to support
      git-svn.
    * version.h: changed version string as
      `ruby 1.9.1 (2008-12-22 patchlevel-5000 trunk 20912)
      [i386-darwin9.6.0]'.

  Modified files:
    trunk/ChangeLog
    trunk/common.mk
    trunk/version.h

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 20919)
+++ ChangeLog	(revision 20920)
@@ -1,3 +1,12 @@
+Mon Dec 22 19:31:19 2008  Yuki Sonoda (Yugui)  <yugui@y...>
+
+	* common.mk (revision.h): uses tool/file2lastrev.rb to support
+	  git-svn.
+
+	* version.h: changed version string as
+	  `ruby 1.9.1 (2008-12-22 patchlevel-5000 trunk 20912)
+	  [i386-darwin9.6.0]'.
+
 Mon Dec 22 15:56:49 2008  Yuki Sonoda (Yugui)  <yugui@y...>
 
 	* Doxyfile.in: new file. Template of a configuration file.
Index: common.mk
===================================================================
--- common.mk	(revision 20919)
+++ common.mk	(revision 20920)
@@ -684,10 +684,8 @@
 preludes: {$(VPATH)}miniprelude.c
 preludes: {$(srcdir)}golf_prelude.c
 
-$(srcdir)/revision.h: $(srcdir)/version.h $(srcdir)/ChangeLog $(REVISION_FORCE)
-	@set LC_MESSAGES=C
-	-@$(SET_LC_MESSAGES) $(VCS) info "$(@D)" | \
-	sed -n "s/.*Rev:/#define RUBY_REVISION/p" > "$@.tmp"
+$(srcdir)/revision.h: $(srcdir)/version.h $(srcdir)/ChangeLog $(srcdir)/tool/file2lastrev.rb $(REVISION_FORCE)
+	$(BASERUBY) $(srcdir)/tool/file2lastrev.rb --revision.h "$(@D)" > "$@.tmp"
 	@$(IFCHANGE) "$@" "$@.tmp"
 
 $(srcdir)/ext/ripper/ripper.c:
Index: version.h
===================================================================
--- version.h	(revision 20919)
+++ version.h	(revision 20920)
@@ -1,6 +1,7 @@
 #define RUBY_VERSION "1.9.1"
 #define RUBY_RELEASE_DATE "2008-12-22"
 #define RUBY_PATCHLEVEL 5000
+#define RUBY_BRANCH_NAME "trunk"
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
@@ -30,20 +31,16 @@
 #define RUBY_REVISION 0
 #endif
 
-#if RUBY_PATCHLEVEL && RUBY_PATCHLEVEL < 5000
-#define RUBY_PATCHLEVEL_STR " patchlevel "STRINGIZE(RUBY_PATCHLEVEL)
-#else
-#define RUBY_PATCHLEVEL_STR ""
-#endif
+#define RUBY_PATCHLEVEL_STR " patchlevel-"STRINGIZE(RUBY_PATCHLEVEL)
 #if RUBY_REVISION
-#ifdef RUBY_BRANCH_NAME
-#define RUBY_REVISION_STR " "RUBY_BRANCH_NAME" "STRINGIZE(RUBY_REVISION)
+# ifdef RUBY_BRANCH_NAME
+#  define RUBY_REVISION_STR " "RUBY_BRANCH_NAME" "STRINGIZE(RUBY_REVISION)
+# else
+#  define RUBY_REVISION_STR " revision "STRINGIZE(RUBY_REVISION)
+# endif
 #else
-#define RUBY_REVISION_STR " revision "STRINGIZE(RUBY_REVISION)
+# define RUBY_REVISION_STR ""
 #endif
-#else
-#define RUBY_REVISION_STR ""
-#endif
 
 # define RUBY_DESCRIPTION	    \
     "ruby "RUBY_VERSION		    \

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