[前][次][番号順一覧][スレッド一覧]

ruby-changes:13703

From: nobu <ko1@a...>
Date: Tue, 27 Oct 2009 03:45:51 +0900 (JST)
Subject: [ruby-changes:13703] Ruby:r25492 (trunk): * win32/Makefile.sub (config.h): added RUBY_SITEARCH to use

nobu	2009-10-27 03:45:34 +0900 (Tue, 27 Oct 2009)

  New Revision: 25492

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=25492

  Log:
    * win32/Makefile.sub (config.h): added RUBY_SITEARCH to use
      different name from RUBY_ARCH.  [ruby-core:26324]

  Modified files:
    trunk/ChangeLog
    trunk/common.mk
    trunk/version.h
    trunk/win32/Makefile.sub

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 25491)
+++ ChangeLog	(revision 25492)
@@ -1,3 +1,8 @@
+Tue Oct 27 03:45:39 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* 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@m...>
 
 	* array.c (rb_ary_cmp): Array#<=> returns nil when comparison fails
Index: common.mk
===================================================================
--- common.mk	(revision 25491)
+++ common.mk	(revision 25492)
@@ -628,7 +628,7 @@
   {$(VPATH)}node.h {$(VPATH)}util.h {$(VPATH)}encoding.h \
   {$(VPATH)}oniguruma.h
 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 \
   $(RUBY_H_INCLUDES) $(VM_CORE_H_INCLUDES) {$(VPATH)}insns.inc \
Index: win32/Makefile.sub
===================================================================
--- win32/Makefile.sub	(revision 25491)
+++ win32/Makefile.sub	(revision 25492)
@@ -118,6 +118,7 @@
 !endif
 
 arch = $(ARCH)-$(PLATFORM)
+sitearch = $(ARCH)-$(RT)
 !if !defined(ruby_version)
 ruby_version = $(MAJOR).$(MINOR).$(TEENY)
 !endif
@@ -567,6 +568,7 @@
 #define RUBY_VENDOR_LIB RUBY_LIB_PREFIX"/vendor_ruby"
 #define RUBY_VENDOR_LIB2 RUBY_VENDOR_LIB"/"RUBY_LIB_VERSION
 #define RUBY_PLATFORM "$(arch)"
+#define RUBY_SITEARCH "$(sitearch)"
 #define RUBY_COREDLL "$(RT)"
 #define RUBY_ARCHLIB RUBY_LIB"/"RUBY_ARCH
 #define RUBY_SITE_ARCHLIB RUBY_SITE_LIB2"/"RUBY_SITEARCH
Index: version.h
===================================================================
--- version.h	(revision 25491)
+++ version.h	(revision 25492)
@@ -1,5 +1,5 @@
 #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_BRANCH_NAME "trunk"
 
@@ -8,7 +8,7 @@
 #define RUBY_VERSION_TEENY 1
 #define RUBY_RELEASE_YEAR 2009
 #define RUBY_RELEASE_MONTH 10
-#define RUBY_RELEASE_DAY 26
+#define RUBY_RELEASE_DAY 27
 
 #include "ruby/version.h"
 

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]