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

* win32/Makefile.sub (config.h): added RUBY_SITEARCH to use

Browse source 
different name from RUBY_ARCH.  [ruby-core:26324]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25492 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2009-10-26 18:45:34 +00:00
parent 8d446fe1eb
commit c21350f902
4 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Tue Oct 27 03:45:39 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* win32/Makefile.sub (config.h): added RUBY_SITEARCH to use
different name from RUBY_ARCH. [ruby-core:26324]
Mon Oct 26 20:04:13 2009 Marc-Andre Lafortune <ruby-core@marc-andre.ca> Mon Oct 26 20:04:13 2009 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
* array.c (rb_ary_cmp): Array#<=> returns nil when comparison fails * array.c (rb_ary_cmp): Array#<=> returns nil when comparison fails

2
common.mk
View file

@ -628,7 +628,7 @@ variable.$(OBJEXT): {$(VPATH)}variable.c $(RUBY_H_INCLUDES) \
{$(VPATH)}node.h {$(VPATH)}util.h {$(VPATH)}encoding.h \ {$(VPATH)}node.h {$(VPATH)}util.h {$(VPATH)}encoding.h \
{$(VPATH)}oniguruma.h {$(VPATH)}oniguruma.h
version.$(OBJEXT): {$(VPATH)}version.c $(RUBY_H_INCLUDES) \ version.$(OBJEXT): {$(VPATH)}version.c $(RUBY_H_INCLUDES) \
{$(VPATH)}version.h $(srcdir)/revision.h {$(VPATH)}version.h $(srcdir)/revision.h {$(VPATH)}config.h
compile.$(OBJEXT): {$(VPATH)}compile.c {$(VPATH)}iseq.h \ compile.$(OBJEXT): {$(VPATH)}compile.c {$(VPATH)}iseq.h \
$(RUBY_H_INCLUDES) $(VM_CORE_H_INCLUDES) {$(VPATH)}insns.inc \ $(RUBY_H_INCLUDES) $(VM_CORE_H_INCLUDES) {$(VPATH)}insns.inc \

4
version.h
View file

@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.2" #define RUBY_VERSION "1.9.2"
#define RUBY_RELEASE_DATE "2009-10-26" #define RUBY_RELEASE_DATE "2009-10-27"
#define RUBY_PATCHLEVEL -1 #define RUBY_PATCHLEVEL -1
#define RUBY_BRANCH_NAME "trunk" #define RUBY_BRANCH_NAME "trunk"
@ -8,7 +8,7 @@
#define RUBY_VERSION_TEENY 1 #define RUBY_VERSION_TEENY 1
#define RUBY_RELEASE_YEAR 2009 #define RUBY_RELEASE_YEAR 2009
#define RUBY_RELEASE_MONTH 10 #define RUBY_RELEASE_MONTH 10
#define RUBY_RELEASE_DAY 26 #define RUBY_RELEASE_DAY 27
#include "ruby/version.h" #include "ruby/version.h"

2
win32/Makefile.sub
View file

@ -118,6 +118,7 @@ PLATFORM = mswin32
!endif !endif
arch = $(ARCH)-$(PLATFORM) arch = $(ARCH)-$(PLATFORM)
sitearch = $(ARCH)-$(RT)
!if !defined(ruby_version) !if !defined(ruby_version)
ruby_version = $(MAJOR).$(MINOR).$(TEENY) ruby_version = $(MAJOR).$(MINOR).$(TEENY)
!endif !endif
@ -567,6 +568,7 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub
#define RUBY_VENDOR_LIB RUBY_LIB_PREFIX"/vendor_ruby" #define RUBY_VENDOR_LIB RUBY_LIB_PREFIX"/vendor_ruby"
#define RUBY_VENDOR_LIB2 RUBY_VENDOR_LIB"/"RUBY_LIB_VERSION #define RUBY_VENDOR_LIB2 RUBY_VENDOR_LIB"/"RUBY_LIB_VERSION
#define RUBY_PLATFORM "$(arch)" #define RUBY_PLATFORM "$(arch)"
#define RUBY_SITEARCH "$(sitearch)"
#define RUBY_COREDLL "$(RT)" #define RUBY_COREDLL "$(RT)"
#define RUBY_ARCHLIB RUBY_LIB"/"RUBY_ARCH #define RUBY_ARCHLIB RUBY_LIB"/"RUBY_ARCH
#define RUBY_SITE_ARCHLIB RUBY_SITE_LIB2"/"RUBY_SITEARCH #define RUBY_SITE_ARCHLIB RUBY_SITE_LIB2"/"RUBY_SITEARCH