diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-01-25 08:36:14 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-01-25 08:36:14 +0000 |
| commit | ccf67667b8e07471a3463394574944f78c1adf7b () | |
| tree | 9f9573fa27c2af1967f8b3aad5bd3320dcf3f997 | |
| parent | 695c32a028a58222e1d6c726334e1b6c7c911c47 (diff) | |
* version.c (RUBY_LIB, RUBY_*_LIB): moved from configures.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26401 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | bcc32/Makefile.sub | 13 | ||||
| -rw-r--r-- | configure.in | 6 | ||||
| -rw-r--r-- | include/ruby/ruby.h | 2 | ||||
| -rw-r--r-- | include/ruby/st.h | 2 | ||||
| -rw-r--r-- | symbian/setup | 7 | ||||
| -rw-r--r-- | version.c | 24 | ||||
| -rw-r--r-- | win32/Makefile.sub | 8 |
8 files changed, 36 insertions, 30 deletions
@@ -1,3 +1,7 @@ Mon Jan 25 12:11:45 2010 Nobuyoshi Nakada <[email protected]> * signal.c (USE_SIGALTSTACK): only when SA_SIGINFO also is @@ -196,6 +196,10 @@ ASMEXT = asm INSTALLED_LIST= .installed.list WINMAINOBJ = winmain.$(OBJEXT) ARCHMINIOBJS = dmydln.$(OBJEXT) @@ -353,15 +357,8 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/bcc32/Makefile.sub \#define DEFAULT_KCODE KCODE_NONE \#define LOAD_RELATIVE 1 \#define DLEXT ".so" -\#define RUBY_LIB "/lib/ruby/$(MAJOR).$(MINOR).$(TEENY)" -\#define RUBY_SITE_LIB "/lib/ruby/site_ruby" -\#define RUBY_SITE_LIB2 "/lib/ruby/site_ruby/$(MAJOR).$(MINOR).$(TEENY)" -\#define RUBY_VENDOR_LIB "/lib/ruby/vendor_ruby" -\#define RUBY_VENDOR_LIB2 "/lib/ruby/vendor_ruby/$(MAJOR).$(MINOR).$(TEENY)" \#define RUBY_PLATFORM "$(ARCH)-$(OS)" -\#define RUBY_ARCHLIB "/lib/ruby/$(MAJOR).$(MINOR).$(TEENY)/$(ARCH)-$(OS)" -\#define RUBY_SITE_ARCHLIB "/lib/ruby/site_ruby/$(MAJOR).$(MINOR).$(TEENY)/$(ARCH)-$(OS)" -\#define RUBY_VENDOR_ARCHLIB "/lib/ruby/vendor_ruby/$(MAJOR).$(MINOR).$(TEENY)/$(ARCH)-$(OS)" | @exit > $(@:/=\) @@ -2389,7 +2389,6 @@ else fi pat=`echo "$RUBY_LIB_PREFIX/" | tr -c '\012' .`'\(.*\)' -RUBY_LIB_PATH='RUBY_LIB_PREFIX"/"RUBY_LIB_VERSION' AS_CASE(["$RUBY_SITE_LIB_PATH"], ["$RUBY_LIB_PREFIX/"*], [ RUBY_SITE_LIB_PATH='RUBY_LIB_PREFIX"/'"`expr \"$RUBY_SITE_LIB_PATH\" : \"$pat\"`"'"' @@ -2397,7 +2396,6 @@ AS_CASE(["$RUBY_SITE_LIB_PATH"], [ RUBY_SITE_LIB_PATH="\"${RUBY_SITE_LIB_PATH}\"" ]) -RUBY_SITE_LIB_PATH2='RUBY_SITE_LIB"/"RUBY_LIB_VERSION' AS_CASE(["$RUBY_VENDOR_LIB_PATH"], ["$RUBY_LIB_PREFIX/"*], [ RUBY_VENDOR_LIB_PATH='RUBY_LIB_PREFIX"/'"`expr \"$RUBY_VENDOR_LIB_PATH\" : \"$pat\"`"'"' @@ -2405,7 +2403,6 @@ AS_CASE(["$RUBY_VENDOR_LIB_PATH"], [ RUBY_VENDOR_LIB_PATH="\"${RUBY_VENDOR_LIB_PATH}\"" ]) -RUBY_VENDOR_LIB_PATH2='RUBY_VENDOR_LIB"/"RUBY_LIB_VERSION' if test ${RUBY_LIB_VERSION_STYLE+set}; then AC_DEFINE_UNQUOTED(RUBY_LIB_VERSION_STYLE, $RUBY_LIB_VERSION_STYLE) @@ -2413,11 +2410,8 @@ else AC_DEFINE_UNQUOTED(RUBY_LIB_VERSION, [$RUBY_LIB_VERSION]) fi AC_DEFINE_UNQUOTED(RUBY_LIB_PREFIX, "${RUBY_LIB_PREFIX}") -AC_DEFINE_UNQUOTED(RUBY_LIB, ${RUBY_LIB_PATH}) AC_DEFINE_UNQUOTED(RUBY_SITE_LIB, ${RUBY_SITE_LIB_PATH}) -AC_DEFINE_UNQUOTED(RUBY_SITE_LIB2, ${RUBY_SITE_LIB_PATH2}) AC_DEFINE_UNQUOTED(RUBY_VENDOR_LIB, ${RUBY_VENDOR_LIB_PATH}) -AC_DEFINE_UNQUOTED(RUBY_VENDOR_LIB2, ${RUBY_VENDOR_LIB_PATH2}) AC_SUBST(arch)dnl AC_SUBST(sitearch)dnl @@ -21,7 +21,7 @@ extern "C" { #endif #endif -#ifndef RUBY_LIB #include "ruby/config.h" #ifdef RUBY_EXTCONF_H #include RUBY_EXTCONF_H @@ -12,7 +12,7 @@ extern "C" { #endif #endif -#ifndef RUBY_LIB #include "ruby/config.h" #include "ruby/defines.h" #ifdef RUBY_EXTCONF_H @@ -170,15 +170,10 @@ define config_h @echo>>$(1) #define DLEXT ".dll" @echo>>$(1) #define EXECUTABLE_EXTS ".exe",".com",".cmd",".bat" @echo>>$(1) #define DLN_NEEDS_ALT_SEPARATOR 1 -@echo>>$(1) #define RUBY_LIB "C:/Data/Ruby/lib/$(MAJOR).$(MINOR).$(TEENY)" @echo>>$(1) #define RUBY_SITE_LIB "E:/Data/Ruby/lib" -@echo>>$(1) #define RUBY_SITE_LIB2 "E:/Data/Ruby/lib/$(MAJOR).$(MINOR).$(TEENY)" @echo>>$(1) #define RUBY_VENDOR_LIB "C:/Data/Ruby/lib" -@echo>>$(1) #define RUBY_VENDOR_LIB2 "C:/Data/Ruby/lib/$(MAJOR).$(MINOR).$(TEENY)" @echo>>$(1) #define RUBY_PLATFORM "$(arch)" -@echo>>$(1) #define RUBY_ARCHLIB "C:/Data/Ruby/$(MAJOR).$(MINOR).$(TEENY)/$(arch)" -@echo>>$(1) #define RUBY_SITE_ARCHLIB "E:/Data/Ruby/lib/$(MAJOR).$(MINOR).$(TEENY)/$(arch)" -@echo>>$(1) #define RUBY_VENDOR_ARCHLIB "C:/Data/Ruby/lib/$(MAJOR).$(MINOR).$(TEENY)/$(arch)" endef define pre_build_mk @@ -22,6 +22,30 @@ #ifndef RUBY_SITEARCH #define RUBY_SITEARCH RUBY_ARCH #endif const char ruby_version[] = RUBY_VERSION; const char ruby_release_date[] = RUBY_RELEASE_DATE; @@ -567,17 +567,9 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub #define EXECUTABLE_EXTS $(EXECUTABLE_EXTS) #define RUBY_LIB_VERSION_STYLE 3 /* full */ #define RUBY_LIB_PREFIX "/lib/$(RUBY_BASE_NAME)" -#define RUBY_LIB RUBY_LIB_PREFIX"/"RUBY_LIB_VERSION -#define RUBY_SITE_LIB RUBY_LIB_PREFIX"/site_ruby" -#define RUBY_SITE_LIB2 RUBY_SITE_LIB"/"RUBY_LIB_VERSION -#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 -#define RUBY_VENDOR_ARCHLIB RUBY_VENDOR_LIB2"/"RUBY_SITEARCH #define LIBRUBY_SO "$(LIBRUBY_SO)" #if 0 $(BANG)if "$(RUBY_SO_NAME)"!="$$(RUBY_SO_NAME)" || "$(ARCH)-$(PLATFORM)"!="$$(ARCH)-$$(PLATFORM)" |