diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | lib/shellwords.rb | 2 | ||||
| -rw-r--r-- | version.h | 44 |
3 files changed, 48 insertions, 4 deletions
@@ -1,3 +1,9 @@ +Mon Jan 14 16:12:58 2008 Yukihiro Matsumoto <matz@ruby-lang.org> + + * lib/shellwords.rb: scape should be an alias to shellescape. a + patch from Masahiro Kawato <m-kawato AT mwb.biglobe.ne.jp> in + [ruby-dev:33060]. + Mon Jan 14 09:32:40 2008 Tadayoshi Funaba <tadf@dotrb.org> * lib/time.rb: do not reference Time directly from the inside of diff --git a/lib/shellwords.rb b/lib/shellwords.rb index 0879d29000..ab1dc5171d 100644 --- a/lib/shellwords.rb +++ b/lib/shellwords.rb @@ -102,7 +102,7 @@ module Shellwords module_function :shellescape class << self - alias escape shellsplit + alias escape shellescape end # @@ -1,7 +1,7 @@ #define RUBY_VERSION "1.8.6" -#define RUBY_RELEASE_DATE "2008-01-11" +#define RUBY_RELEASE_DATE "2008-01-14" #define RUBY_VERSION_CODE 186 -#define RUBY_RELEASE_CODE 20080111 +#define RUBY_RELEASE_CODE 20080114 #define RUBY_PATCHLEVEL 5000 #define RUBY_VERSION_MAJOR 1 @@ -9,11 +9,49 @@ #define RUBY_VERSION_TEENY 6 #define RUBY_RELEASE_YEAR 2008 #define RUBY_RELEASE_MONTH 1 -#define RUBY_RELEASE_DAY 11 +#define RUBY_RELEASE_DAY 14 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; RUBY_EXTERN const char ruby_release_date[]; RUBY_EXTERN const char ruby_platform[]; RUBY_EXTERN const int ruby_patchlevel; +RUBY_EXTERN const char ruby_description[]; +RUBY_EXTERN const char ruby_copyright[]; #endif + +#define RUBY_AUTHOR "Yukihiro Matsumoto" +#define RUBY_BIRTH_YEAR 1993 +#define RUBY_BIRTH_MONTH 2 +#define RUBY_BIRTH_DAY 24 + +#ifndef RUBY_REVISION +#include "revision.h" +#endif +#ifndef RUBY_REVISION +#define RUBY_REVISION 0 +#endif + +#if RUBY_VERSION_TEENY > 0 && RUBY_PATCHLEVEL < 5000 && !RUBY_REVISION +#define RUBY_RELEASE_STR "patchlevel" +#define RUBY_RELEASE_NUM RUBY_PATCHLEVEL +#else +#ifdef RUBY_BRANCH_NAME +#define RUBY_RELEASE_STR RUBY_BRANCH_NAME +#else +#define RUBY_RELEASE_STR "revision" +#endif +#define RUBY_RELEASE_NUM RUBY_REVISION +#endif + +# define RUBY_DESCRIPTION \ + "ruby "RUBY_VERSION \ + " ("RUBY_RELEASE_DATE" " \ + RUBY_RELEASE_STR" " \ + STRINGIZE(RUBY_RELEASE_NUM)") " \ + "["RUBY_PLATFORM"]" +# define RUBY_COPYRIGHT \ + "ruby - Copyright (C) " \ + STRINGIZE(RUBY_BIRTH_YEAR)"-" \ + STRINGIZE(RUBY_RELEASE_YEAR)" " \ + RUBY_AUTHOR |