1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

Pulled the date.rb change; it should not have been applied.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@24374 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
wyhaines 2009-08-03 16:09:33 +00:00
parent d0551d4339
commit 7031f4dec8
4 changed files with 20 additions and 8 deletions

View file

@ -1,3 +1,11 @@
Mon Aug 3 10:06:00 2009 Kirk Haines <khaines@ruby-lang.org>
* lib/date.rb: Added private on to_date and to_datetime back; this should not have been backported to 1.8.6 from 1.9 yet, since it hasn't gone into 1.8.8/1.8.7.
Wed Jul 29 17:04:00 2009 Kirk Haines <khaines@ruby-lang.org>
* ext/tk/extconf.rb: Added some additional paths where TCL files are common found; fixes problems with building on some distributions.
Tue Jul 14 13:14:00 2009 Kirk Haines <khaines@ruby-lang.org>
* lib/complex.rb: Adjust #angle/#arg NaN return as per issue #1715 and recent rubyspec changes. Adjust angle/arg handling of (-0.0).angle as per r23960 & recent rubyspec changes.

View file

@ -50,7 +50,7 @@ stubs = enable_config("tcltk_stubs") || with_config("tcltk_stubs")
use_X = with_config("X11", (! is_win32))
def find_tcl(tcllib, stubs)
paths = ["/usr/local/lib", "/usr/pkg/lib", "/usr/lib"]
paths = ["/usr/local/lib64", "/usr/local/lib", "/usr/pkg/lib64", "/usr/pkg/lib", "/usr/lib64", "/usr/lib"]
if stubs
func = "Tcl_InitStubs"
lib = "tclstub"
@ -276,8 +276,10 @@ end
if tcltk_framework ||
(have_header("tcl.h") && have_header("tk.h") &&
( !use_X || find_library("X11", "XOpenDisplay",
"/usr/X11/lib", "/usr/lib/X11",
"/usr/X11R6/lib", "/usr/openwin/lib")) &&
"/usr/X11/lib64", "/usr/X11/lib",
"/usr/lib64/X11", "/usr/lib/X11",
"/usr/X11R6/lib64", "/usr/X11R6/lib",
"/usr/openwin/lib64", "/usr/openwin/lib")) &&
find_tcl(tcllib, stubs) &&
find_tk(tklib, stubs))
$CPPFLAGS += ' -DUSE_TCL_STUBS -DUSE_TK_STUBS' if stubs

View file

@ -1604,6 +1604,8 @@ class Time
DateTime.new!(DateTime.jd_to_ajd(jd, fr, of), of, DateTime::ITALY)
end
private :to_date, :to_datetime
end
class Date

View file

@ -1,15 +1,15 @@
#define RUBY_VERSION "1.8.6"
#define RUBY_RELEASE_DATE "2009-07-20"
#define RUBY_RELEASE_DATE "2009-08-03"
#define RUBY_VERSION_CODE 186
#define RUBY_RELEASE_CODE 20090720
#define RUBY_PATCHLEVEL 381
#define RUBY_RELEASE_CODE 20090803
#define RUBY_PATCHLEVEL 383
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8
#define RUBY_VERSION_TEENY 6
#define RUBY_RELEASE_YEAR 2009
#define RUBY_RELEASE_MONTH 7
#define RUBY_RELEASE_DAY 20
#define RUBY_RELEASE_MONTH 8
#define RUBY_RELEASE_DAY 3
#ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[];