зеркало из https://github.com/github/ruby.git
* configure.in, cygwin/GNUmakefile.in, */Makefile.sub,
djgpp/config.hin.: version dependent directory names now contain teeny. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14578 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu
Родитель
29cbf75cd0
Коммит
1c3c98821b
|
|
@ -1,3 +1,9 @@
|
|||
Mon Dec 24 15:42:04 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||
|
||||
* configure.in, cygwin/GNUmakefile.in, */Makefile.sub,
|
||||
djgpp/config.hin.: version dependent directory names now contain
|
||||
teeny.
|
||||
|
||||
Mon Dec 24 15:29:13 2007 Tanaka Akira <akr@fsij.org>
|
||||
|
||||
* tool/serb.rb: removed.
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ RUBYW_INSTALL_NAME = $(RUBY_INSTALL_NAME:ruby=rubyw)
|
|||
RUBYW_INSTALL_NAME = $(RUBY_INSTALL_NAME)w
|
||||
!endif
|
||||
!ifndef RUBY_SO_NAME
|
||||
RUBY_SO_NAME = $(RT)-$(RUBY_INSTALL_NAME)$(MAJOR)$(MINOR)
|
||||
RUBY_SO_NAME = $(RT)-$(RUBY_INSTALL_NAME)$(MAJOR)$(MINOR)$(TEENY)
|
||||
!endif
|
||||
!ifndef icondirs
|
||||
!ifdef ICONDIRS
|
||||
|
|
@ -324,15 +324,15 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/bcc32/Makefile.sub
|
|||
\#define STACK_GROW_DIRECTION -1
|
||||
\#define DEFAULT_KCODE KCODE_NONE
|
||||
\#define DLEXT ".so"
|
||||
\#define RUBY_LIB "/lib/ruby/$(MAJOR).$(MINOR)"
|
||||
\#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)"
|
||||
\#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)"
|
||||
\#define RUBY_VENDOR_LIB2 "/lib/ruby/vendor_ruby/$(MAJOR).$(MINOR).$(TEENY)"
|
||||
\#define RUBY_PLATFORM "$(ARCH)-$(OS)"
|
||||
\#define RUBY_ARCHLIB "/lib/ruby/$(MAJOR).$(MINOR)/$(ARCH)-$(OS)"
|
||||
\#define RUBY_SITE_ARCHLIB "/lib/ruby/site_ruby/$(MAJOR).$(MINOR)/$(ARCH)-$(OS)"
|
||||
\#define RUBY_VENDOR_ARCHLIB "/lib/ruby/vendor_ruby/$(MAJOR).$(MINOR)/$(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 > $(@:/=\)
|
||||
|
||||
|
|
@ -451,7 +451,7 @@ s,@arch@,$(ARCH)-$(OS),;t t
|
|||
s,@sitearch@,$(ARCH)-$(OS),;t t
|
||||
s,@sitedir@,$${prefix}/lib/ruby/site_ruby,;t t
|
||||
s,@vendordir@,$${prefix}/lib/ruby/vendor_ruby,;t t
|
||||
s,@rubyhdrdir@,$$(includedir)/ruby-$$(MAJOR).$$(MINOR),;t t
|
||||
s,@rubyhdrdir@,$$(includedir)/ruby-$$(MAJOR).$$(MINOR).$$(TEENY),;t t
|
||||
s,@sitehdrdir@,$$(rubyhdrdir)/site_ruby,;t t
|
||||
s,@vendorhdrdir@,$$(rubyhdrdir)/vendor_ruby,;t t
|
||||
s,@configure_args@,--enable-shared $(configure_args),;t t
|
||||
|
|
|
|||
12
configure.in
12
configure.in
|
|
@ -1553,12 +1553,12 @@ case "$target_os" in
|
|||
case "$target_os" in
|
||||
cygwin*)
|
||||
if test x"$enable_shared" = xyes; then
|
||||
LIBRUBY_SO='cyg$(RUBY_SO_NAME)'${MAJOR}${MINOR}.dll
|
||||
LIBRUBY_SO='cyg$(RUBY_SO_NAME)'${MAJOR}${MINOR}${TEENY}.dll
|
||||
fi
|
||||
AC_LIBOBJ([strftime])
|
||||
;;
|
||||
mingw*)
|
||||
RUBY_SO_NAME=${rb_cv_msvcrt}-'$(RUBY_INSTALL_NAME)'${MAJOR}${MINOR}
|
||||
RUBY_SO_NAME=${rb_cv_msvcrt}-'$(RUBY_INSTALL_NAME)'${MAJOR}${MINOR}${TEENY}
|
||||
if test x"$enable_shared" = xyes; then
|
||||
LIBRUBY_SO='$(RUBY_SO_NAME)'.dll
|
||||
LIBRUBY_DLDFLAGS="${LIBRUBY_DLDFLAGS}"' $(RUBYDEF)'
|
||||
|
|
@ -1660,7 +1660,7 @@ case "$target_os" in
|
|||
RUBY_LIB_PREFIX="${prefix}/lib/ruby"
|
||||
;;
|
||||
esac
|
||||
RUBY_LIB_PATH="${RUBY_LIB_PREFIX}/${MAJOR}.${MINOR}"
|
||||
RUBY_LIB_PATH="${RUBY_LIB_PREFIX}/${MAJOR}.${MINOR}.${TEENY}"
|
||||
|
||||
AC_ARG_WITH(sitedir,
|
||||
[ --with-sitedir=DIR site libraries in DIR [PREFIX/lib/ruby/site_ruby]],
|
||||
|
|
@ -1674,7 +1674,7 @@ case "$target_os" in
|
|||
*)
|
||||
RUBY_SITE_LIB_PATH="$SITE_DIR";;
|
||||
esac
|
||||
RUBY_SITE_LIB_PATH2="${RUBY_SITE_LIB_PATH}/${MAJOR}.${MINOR}"
|
||||
RUBY_SITE_LIB_PATH2="${RUBY_SITE_LIB_PATH}/${MAJOR}.${MINOR}.${TEENY}"
|
||||
|
||||
AC_DEFINE_UNQUOTED(RUBY_LIB, "${RUBY_LIB_PATH}")
|
||||
AC_DEFINE_UNQUOTED(RUBY_SITE_LIB, "${RUBY_SITE_LIB_PATH}")
|
||||
|
|
@ -1692,7 +1692,7 @@ case "$target_os" in
|
|||
*)
|
||||
RUBY_VENDOR_LIB_PATH="$VENDOR_DIR";;
|
||||
esac
|
||||
RUBY_VENDOR_LIB_PATH2="${RUBY_VENDOR_LIB_PATH}/${MAJOR}.${MINOR}"
|
||||
RUBY_VENDOR_LIB_PATH2="${RUBY_VENDOR_LIB_PATH}/${MAJOR}.${MINOR}.${TEENY}"
|
||||
|
||||
AC_DEFINE_UNQUOTED(RUBY_VENDOR_LIB, "${RUBY_VENDOR_LIB_PATH}")
|
||||
AC_DEFINE_UNQUOTED(RUBY_VENDOR_LIB2, "${RUBY_VENDOR_LIB_PATH2}")
|
||||
|
|
@ -1740,7 +1740,7 @@ fi
|
|||
AC_ARG_WITH(rubyhdrdir,
|
||||
[ --with-ruby-hdrdir=DIR core headers in DIR [INCLUDEDIR]],
|
||||
[rubyhdrdir=$withval],
|
||||
[rubyhdrdir='${includedir}/ruby-${MAJOR}.${MINOR}'])
|
||||
[rubyhdrdir='${includedir}/ruby-${MAJOR}.${MINOR}.${TEENY}'])
|
||||
|
||||
AC_ARG_WITH(sitehdrdir,
|
||||
[ --with-site-hdrdir=DIR core headers in DIR [INCLUDEDIR]],
|
||||
|
|
|
|||
|
|
@ -70,9 +70,9 @@ $(RUBYDEF): $(LIBRUBY_A) $(PREP) $(RBCONFIG)
|
|||
endif
|
||||
|
||||
ifeq (@target_os@,cygwin)
|
||||
cygwin-$(RUBY_INSTALL_NAME)$(MAJOR)$(MINOR).dll: $(LIBRUBY_A)
|
||||
cygwin-$(RUBY_INSTALL_NAME)$(MAJOR)$(MINOR)$(TEENY).dll: $(LIBRUBY_A)
|
||||
@NM@ --extern --defined $(LIBRUBY_A) | \
|
||||
$(MINIRUBY) -ne 'BEGIN{puts "EXPORTS"}; puts $$1+"=cyg$(RUBY_INSTALL_NAME)$(MAJOR)$(MINOR)."+$$1 if / [CDT] _(.*)$$/' >rubydll.def
|
||||
$(MINIRUBY) -ne 'BEGIN{puts "EXPORTS"}; puts $$1+"=$(@F)."+$$1 if / [CDT] _(.*)$$/' >rubydll.def
|
||||
@DLLWRAP@ -s --def=rubydll.def -o $@
|
||||
@rm -f rubydll.def
|
||||
endif
|
||||
|
|
|
|||
|
|
@ -106,9 +106,9 @@
|
|||
#define NEED_IO_FLUSH_BETWEEN_RW 1
|
||||
#define DEFAULT_KCODE KCODE_NONE
|
||||
#define DLEXT ".so"
|
||||
#define RUBY_LIB "/lib/ruby/@MAJOR@.@MINOR@"
|
||||
#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@"
|
||||
#define RUBY_SITE_LIB2 "/lib/ruby/site_ruby/@MAJOR@.@MINOR@.@TEENY@"
|
||||
#define RUBY_PLATFORM "i386-msdosdjgpp"
|
||||
#define RUBY_ARCHLIB "/lib/ruby/@MAJOR@.@MINOR@/i386-msdosdjgpp"
|
||||
#define RUBY_SITE_ARCHLIB "/lib/ruby/site_ruby/@MAJOR@.@MINOR@/i386-msdosdjgpp"
|
||||
#define RUBY_ARCHLIB "/lib/ruby/@MAJOR@.@MINOR@.@TEENY@/i386-msdosdjgpp"
|
||||
#define RUBY_SITE_ARCHLIB "/lib/ruby/site_ruby/@MAJOR@.@MINOR@.@TEENY@/i386-msdosdjgpp"
|
||||
|
|
|
|||
|
|
@ -100,7 +100,7 @@ OS = mswin32
|
|||
arch = $(ARCH)-$(OS)
|
||||
|
||||
!ifndef RUBY_SO_NAME
|
||||
RUBY_SO_NAME = $(RT)-$(RUBY_INSTALL_NAME)$(MAJOR)$(MINOR)
|
||||
RUBY_SO_NAME = $(RT)-$(RUBY_INSTALL_NAME)$(MAJOR)$(MINOR)$(TEENY)
|
||||
!endif
|
||||
|
||||
!if !defined(prefix)
|
||||
|
|
@ -351,15 +351,15 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/win32/Makefile.sub
|
|||
#define STACK_GROW_DIRECTION -1
|
||||
#define DEFAULT_KCODE KCODE_NONE
|
||||
#define DLEXT ".so"
|
||||
#define RUBY_LIB "/lib/ruby/$(MAJOR).$(MINOR)"
|
||||
#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)"
|
||||
#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)"
|
||||
#define RUBY_VENDOR_LIB2 "/lib/ruby/vendor_ruby/$(MAJOR).$(MINOR).$(TEENY)"
|
||||
#define RUBY_PLATFORM "$(arch)"
|
||||
#define RUBY_ARCHLIB "/lib/ruby/$(MAJOR).$(MINOR)/$(ARCH)-$(OS)"
|
||||
#define RUBY_SITE_ARCHLIB "/lib/ruby/site_ruby/$(MAJOR).$(MINOR)/$(ARCH)-$(RT)"
|
||||
#define RUBY_VENDOR_ARCHLIB "/lib/ruby/vendor_ruby/$(MAJOR).$(MINOR)/$(ARCH)-$(RT)"
|
||||
#define RUBY_ARCHLIB "/lib/ruby/$(MAJOR).$(MINOR).$(TEENY)/$(ARCH)-$(OS)"
|
||||
#define RUBY_SITE_ARCHLIB "/lib/ruby/site_ruby/$(MAJOR).$(MINOR).$(TEENY)/$(ARCH)-$(RT)"
|
||||
#define RUBY_VENDOR_ARCHLIB "/lib/ruby/vendor_ruby/$(MAJOR).$(MINOR).$(TEENY)/$(ARCH)-$(RT)"
|
||||
<<
|
||||
@exit > $(@:/=\)
|
||||
|
||||
|
|
@ -497,7 +497,7 @@ s,@arch@,$(ARCH)-$(OS),;t t
|
|||
s,@sitearch@,$(ARCH)-$(RT),;t t
|
||||
s,@sitedir@,$${prefix}/lib/ruby/site_ruby,;t t
|
||||
s,@vendordir@,$${prefix}/lib/ruby/vendor_ruby,;t t
|
||||
s,@rubyhdrdir@,$$(includedir)/ruby-$$(MAJOR).$$(MINOR),;t t
|
||||
s,@rubyhdrdir@,$$(includedir)/ruby-$$(MAJOR).$$(MINOR).$$(TEENY),;t t
|
||||
s,@sitehdrdir@,$$(rubyhdrdir)/site_ruby,;t t
|
||||
s,@vendorhdrdir@,$$(rubyhdrdir)/vendor_ruby,;t t
|
||||
s,@configure_args@,--with-make-prog=nmake --enable-shared $(configure_args),;t t
|
||||
|
|
|
|||
|
|
@ -83,11 +83,13 @@ OS = mswince
|
|||
RT = $(OS)
|
||||
!endif
|
||||
|
||||
arch = $(ARCH)-$(OS)
|
||||
|
||||
!ifndef RUBY_SO_NAME
|
||||
RUBY_SO_NAME = $(RT)-$(RUBY_INSTALL_NAME)$(MAJOR)$(MINOR)
|
||||
RUBY_SO_NAME = $(RT)-$(RUBY_INSTALL_NAME)$(MAJOR)$(MINOR)$(TEENY)
|
||||
!endif
|
||||
!ifndef RUBY_PLATFORM
|
||||
RUBY_PLATFORM = $(ARCH)-$(OS)
|
||||
RUBY_PLATFORM = $(arch)
|
||||
!endif
|
||||
|
||||
!if !defined(prefix)
|
||||
|
|
@ -292,15 +294,15 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/wince/Makefile.sub
|
|||
#define NEED_IO_SEEK_BETWEEN_RW 1
|
||||
#define DEFAULT_KCODE KCODE_NONE
|
||||
#define DLEXT ".so"
|
||||
#define RUBY_LIB "/lib/ruby/$(MAJOR).$(MINOR)"
|
||||
#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)"
|
||||
#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)"
|
||||
#define RUBY_PLATFORM "$(ARCH)-$(OS)"
|
||||
#define RUBY_ARCHLIB "/lib/ruby/$(MAJOR).$(MINOR)/$(ARCH)-$(OS)"
|
||||
#define RUBY_SITE_ARCHLIB "/lib/ruby/site_ruby/$(MAJOR).$(MINOR)/$(ARCH)-$(RT)"
|
||||
#define RUBY_VENDOR_ARCHLIB "/lib/ruby/vendor_ruby/$(MAJOR).$(MINOR)/$(ARCH)-$(RT)"
|
||||
#define RUBY_VENDOR_LIB2 "/lib/ruby/vendor_ruby/$(MAJOR).$(MINOR).$(TEENY)"
|
||||
#define RUBY_PLATFORM "$(arch)"
|
||||
#define RUBY_ARCHLIB "/lib/ruby/$(MAJOR).$(MINOR).$(TEENY)/$(ARCH)-$(OS)"
|
||||
#define RUBY_SITE_ARCHLIB "/lib/ruby/site_ruby/$(MAJOR).$(MINOR).$(TEENY)/$(ARCH)-$(RT)"
|
||||
#define RUBY_VENDOR_ARCHLIB "/lib/ruby/vendor_ruby/$(MAJOR).$(MINOR).$(TEENY)/$(ARCH)-$(RT)"
|
||||
#define LIBRUBY_SO "$(LIBRUBY_SO)"
|
||||
#if 0
|
||||
$(BANG)if "$(RUBY_SO_NAME)"!="$$(RUBY_SO_NAME)" || "$(ARCH)-$(OS)"!="$$(ARCH)-$$(OS)"
|
||||
|
|
@ -446,7 +448,7 @@ s,@arch@,$(ARCH)-$(OS),;t t
|
|||
s,@sitearch@,$(ARCH)-$(RT),;t t
|
||||
s,@sitedir@,$${prefix}/lib/ruby/site_ruby,;t t
|
||||
s,@vendordir@,$${prefix}/lib/ruby/vendor_ruby,;t t
|
||||
s,@rubyhdrdir@,$$(includedir)/ruby-$$(MAJOR).$$(MINOR),;t t
|
||||
s,@rubyhdrdir@,$$(includedir)/ruby-$$(MAJOR).$$(MINOR).$$(TEENY),;t t
|
||||
s,@sitehdrdir@,$$(rubyhdrdir)/site_ruby,;t t
|
||||
s,@vendorhdrdir@,$$(rubyhdrdir)/vendor_ruby,;t t
|
||||
s,@configure_args@,--with-make-prog=nmake --enable-shared $(configure_args),;t t
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче