summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-12-06 09:33:20 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-12-06 09:33:20 +0000
commit82a0e61e6ed4e015cde61848cce4d8d05dac8920 (patch)
tree4cae1fb489fcbffd51fd9425688f7dda629d3f8b
parent4b983b90c4cd84cc1d7de013268f2fbfe96edb57 (diff)
* tool/make-snapshot (package): added RM and CP. [ruby-dev:37288]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@20565 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rwxr-xr-xtool/make-snapshot2
-rw-r--r--version.h2
3 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 131cac680e..7f43a77534 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Dec 6 18:33:16 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * tool/make-snapshot (package): added RM and CP. [ruby-dev:37288]
+
Sat Dec 6 17:51:35 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
* pack.c (pack_pack): 'u0' is not special differently from 'm0'.
diff --git a/tool/make-snapshot b/tool/make-snapshot
index 25d61a7954..7b257f3d1b 100755
--- a/tool/make-snapshot
+++ b/tool/make-snapshot
@@ -151,6 +151,8 @@ def package(rev, destdir)
f.puts "s,@OBJEXT@,|#_!!_#|o,g"
f.puts "s,@LIBRUBY@,|#_!!_#|liburyb.a,g"
f.puts "s,@LIBRUBY_A@,|#_!!_#|liburyb.a,g"
+ f.puts "s,@RM@,|#_!!_#|rm -f,g"
+ f.puts "s,@CP@,|#_!!_#|cp,g"
}
FileUtils.mkpath(hdrdir = "#{extout}/include/ruby")
File.open("#{hdrdir}/config.h", "w") {}
diff --git a/version.h b/version.h
index f00e94ecdb..bbe89aa59a 100644
--- a/version.h
+++ b/version.h
@@ -32,7 +32,7 @@ RUBY_EXTERN const char ruby_copyright[];
#define RUBY_REVISION 0
#endif
-#if RUBY_PATCHLEVEL
+#if RUBY_PATCHLEVEL && RUBY_PATCHLEVEL < 5000
#define RUBY_PATCHLEVEL_STR " patchlevel "STRINGIZE(RUBY_PATCHLEVEL)
#else
#define RUBY_PATCHLEVEL_STR ""