summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-12-22 13:19:17 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-12-22 13:19:17 +0000
commit8f79efe0becb0ca996bc9affe2476b616f91fcde (patch)
tree9499c7bd120a7d361c9a1c71abeaa88a695afb3d
parentc09e5abeee5e08e6c261e3618afa60020371eb96 (diff)
* 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]'. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@20920 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog9
-rw-r--r--common.mk6
-rw-r--r--version.h19
3 files changed, 19 insertions, 15 deletions
diff --git a/ChangeLog b/ChangeLog
index c0f17b4..da6066a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Mon Dec 22 19:31:19 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
+
+ * 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@yugui.jp>
* Doxyfile.in: new file. Template of a configuration file.
diff --git a/common.mk b/common.mk
index edefbc9..c2ad620 100644
--- a/common.mk
+++ b/common.mk
@@ -684,10 +684,8 @@ prereq: incs srcs preludes
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:
diff --git a/version.h b/version.h
index 056820f..f2468a4 100644
--- a/version.h
+++ b/version.h
@@ -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,19 +31,15 @@ RUBY_EXTERN const char ruby_copyright[];
#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)
-#else
-#define RUBY_REVISION_STR " revision "STRINGIZE(RUBY_REVISION)
-#endif
+# 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 ""
+# define RUBY_REVISION_STR ""
#endif
# define RUBY_DESCRIPTION \