зеркало из https://github.com/github/ruby.git
* configure.in (sitedir): considers --program-prefix and
--program-suffix. (vendordir): ditto. (rubyhdrdir): ditto. * mkconfig.rb (CONFIG["rubylibdir"]): ditto. * win32/Makefile.sub: ditto. * instruby.rb (:rdoc): ditto. * lib/rdoc/ri/paths.rb (RDoc::RI::Paths): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19923 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
Родитель
f7d4df50c0
Коммит
5660e09f08
15
ChangeLog
15
ChangeLog
|
@ -1,3 +1,18 @@
|
||||||
|
Fri Oct 24 23:04:42 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
|
||||||
|
|
||||||
|
* configure.in (sitedir): considers --program-prefix and
|
||||||
|
--program-suffix.
|
||||||
|
(vendordir): ditto.
|
||||||
|
(rubyhdrdir): ditto.
|
||||||
|
|
||||||
|
* mkconfig.rb (CONFIG["rubylibdir"]): ditto.
|
||||||
|
|
||||||
|
* win32/Makefile.sub: ditto.
|
||||||
|
|
||||||
|
* instruby.rb (:rdoc): ditto.
|
||||||
|
|
||||||
|
* lib/rdoc/ri/paths.rb (RDoc::RI::Paths): ditto.
|
||||||
|
|
||||||
Fri Oct 24 22:59:27 2008 Yusuke Endoh <mame@tsg.ne.jp>
|
Fri Oct 24 22:59:27 2008 Yusuke Endoh <mame@tsg.ne.jp>
|
||||||
|
|
||||||
* test/ruby/test_array.rb (test_sample): add tests for size of
|
* test/ruby/test_array.rb (test_sample): add tests for size of
|
||||||
|
|
|
@ -1963,7 +1963,7 @@ case "$target_os" in
|
||||||
rubyw_install_name="$RUBYW_INSTALL_NAME"
|
rubyw_install_name="$RUBYW_INSTALL_NAME"
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
RUBY_LIB_PREFIX=`eval echo \\"${libdir}/ruby\\"`
|
RUBY_LIB_PREFIX=`eval echo \\"${libdir}/${RUBY_INSTALL_NAME}\\"`
|
||||||
|
|
||||||
AC_ARG_WITH(ruby-version,
|
AC_ARG_WITH(ruby-version,
|
||||||
[ --with-ruby-version=STR ruby version string for version specific directories [[full]] (full|minor|STR)],
|
[ --with-ruby-version=STR ruby version string for version specific directories [[full]] (full|minor|STR)],
|
||||||
|
@ -1981,13 +1981,13 @@ esac
|
||||||
AC_ARG_WITH(sitedir,
|
AC_ARG_WITH(sitedir,
|
||||||
[ --with-sitedir=DIR site libraries in DIR [[LIBDIR/ruby/site_ruby]]],
|
[ --with-sitedir=DIR site libraries in DIR [[LIBDIR/ruby/site_ruby]]],
|
||||||
[sitedir=$withval],
|
[sitedir=$withval],
|
||||||
[sitedir='${libdir}/ruby/site_ruby'])
|
[sitedir='${libdir}/${RUBY_INSTALL_NAME}/site_ruby'])
|
||||||
SITE_DIR=`eval echo \\"${sitedir}\\"`
|
SITE_DIR=`eval echo \\"${sitedir}\\"`
|
||||||
|
|
||||||
AC_ARG_WITH(vendordir,
|
AC_ARG_WITH(vendordir,
|
||||||
[ --with-vendordir=DIR vendor libraries in DIR [[LIBDIR/ruby/vendor_ruby]]],
|
[ --with-vendordir=DIR vendor libraries in DIR [[LIBDIR/ruby/vendor_ruby]]],
|
||||||
[vendordir=$withval],
|
[vendordir=$withval],
|
||||||
[vendordir='${libdir}/ruby/vendor_ruby'])
|
[vendordir='${libdir}/${RUBY_INSTALL_NAME}/vendor_ruby'])
|
||||||
VENDOR_DIR=`eval echo \\"${vendordir}\\"`
|
VENDOR_DIR=`eval echo \\"${vendordir}\\"`
|
||||||
|
|
||||||
case "$target_os" in
|
case "$target_os" in
|
||||||
|
@ -2056,7 +2056,7 @@ fi
|
||||||
AC_ARG_WITH(rubyhdrdir,
|
AC_ARG_WITH(rubyhdrdir,
|
||||||
[ --with-ruby-hdrdir=DIR core headers in DIR [INCLUDEDIR]],
|
[ --with-ruby-hdrdir=DIR core headers in DIR [INCLUDEDIR]],
|
||||||
[rubyhdrdir=$withval],
|
[rubyhdrdir=$withval],
|
||||||
[rubyhdrdir='${includedir}/ruby-${ruby_version}'])
|
[rubyhdrdir='${includedir}/${RUBY_INSTALL_NAME}-${ruby_version}'])
|
||||||
|
|
||||||
AC_ARG_WITH(sitehdrdir,
|
AC_ARG_WITH(sitehdrdir,
|
||||||
[ --with-site-hdrdir=DIR core headers in DIR [INCLUDEDIR]],
|
[ --with-site-hdrdir=DIR core headers in DIR [INCLUDEDIR]],
|
||||||
|
|
|
@ -2,6 +2,7 @@
|
||||||
|
|
||||||
load "./rbconfig.rb"
|
load "./rbconfig.rb"
|
||||||
include RbConfig
|
include RbConfig
|
||||||
|
$".unshift File.expand_path("./rbconfig.rb")
|
||||||
|
|
||||||
srcdir = File.dirname(__FILE__)
|
srcdir = File.dirname(__FILE__)
|
||||||
$:.unshift File.expand_path("lib", srcdir)
|
$:.unshift File.expand_path("lib", srcdir)
|
||||||
|
@ -10,6 +11,7 @@ require 'shellwords'
|
||||||
require 'optparse'
|
require 'optparse'
|
||||||
require 'optparse/shellwords'
|
require 'optparse/shellwords'
|
||||||
require 'tempfile'
|
require 'tempfile'
|
||||||
|
require 'rdoc/ri/paths'
|
||||||
|
|
||||||
STDOUT.sync = true
|
STDOUT.sync = true
|
||||||
File.umask(0)
|
File.umask(0)
|
||||||
|
@ -280,7 +282,7 @@ install?(:rdoc) do
|
||||||
if $rdocdir
|
if $rdocdir
|
||||||
puts "installing rdoc"
|
puts "installing rdoc"
|
||||||
|
|
||||||
ridatadir = File.join(CONFIG['datadir'], 'ri/$(MAJOR).$(MINOR).$(TEENY)/system')
|
ridatadir = RDoc::RI::Paths::SYSDIR
|
||||||
Config.expand(ridatadir)
|
Config.expand(ridatadir)
|
||||||
makedirs [ridatadir]
|
makedirs [ridatadir]
|
||||||
install_recursive($rdocdir, ridatadir, :mode => $data_mode)
|
install_recursive($rdocdir, ridatadir, :mode => $data_mode)
|
||||||
|
|
|
@ -28,13 +28,15 @@ module RDoc::RI::Paths
|
||||||
|
|
||||||
VERSION = RbConfig::CONFIG['ruby_version']
|
VERSION = RbConfig::CONFIG['ruby_version']
|
||||||
|
|
||||||
base = File.join(RbConfig::CONFIG['datadir'], "ri", VERSION)
|
ri = RbConfig::CONFIG['RUBY_INSTALL_NAME'].sub(/ruby/, 'ri')
|
||||||
|
base = File.join(RbConfig::CONFIG['datadir'], ri, VERSION)
|
||||||
SYSDIR = File.join(base, "system")
|
SYSDIR = File.join(base, "system")
|
||||||
SITEDIR = File.join(base, "site")
|
SITEDIR = File.join(base, "site")
|
||||||
homedir = ENV['HOME'] || ENV['USERPROFILE'] || ENV['HOMEPATH']
|
homedir = ENV['HOME'] || ENV['USERPROFILE'] || ENV['HOMEPATH']
|
||||||
|
|
||||||
if homedir then
|
if homedir then
|
||||||
HOMEDIR = File.join(homedir, ".rdoc")
|
rdoc = RbConfig::CONFIG['RUBY_INSTALL_NAME'].sub(/ruby/, 'rdoc')
|
||||||
|
HOMEDIR = File.join(homedir, ".#{rdoc}")
|
||||||
else
|
else
|
||||||
HOMEDIR = nil
|
HOMEDIR = nil
|
||||||
end
|
end
|
||||||
|
|
|
@ -141,7 +141,7 @@ end
|
||||||
print(*v_fast)
|
print(*v_fast)
|
||||||
print(*v_others)
|
print(*v_others)
|
||||||
print <<EOS
|
print <<EOS
|
||||||
CONFIG["rubylibdir"] = "$(libdir)/ruby/$(ruby_version)"
|
CONFIG["rubylibdir"] = "$(libdir)/$(ruby_install_name)/$(ruby_version)"
|
||||||
CONFIG["archdir"] = "$(rubylibdir)/$(arch)"
|
CONFIG["archdir"] = "$(rubylibdir)/$(arch)"
|
||||||
CONFIG["sitelibdir"] = "$(sitedir)/$(ruby_version)"
|
CONFIG["sitelibdir"] = "$(sitedir)/$(ruby_version)"
|
||||||
CONFIG["sitearchdir"] = "$(sitelibdir)/$(sitearch)"
|
CONFIG["sitearchdir"] = "$(sitelibdir)/$(sitearch)"
|
||||||
|
|
|
@ -463,15 +463,15 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub
|
||||||
!endif
|
!endif
|
||||||
#define DEFAULT_KCODE KCODE_NONE
|
#define DEFAULT_KCODE KCODE_NONE
|
||||||
#define DLEXT ".so"
|
#define DLEXT ".so"
|
||||||
#define RUBY_LIB "/lib/ruby/$(ruby_version)"
|
#define RUBY_LIB "/lib/$(RUBY_INSTALL_NAME)/$(ruby_version)"
|
||||||
#define RUBY_SITE_LIB "/lib/ruby/site_ruby"
|
#define RUBY_SITE_LIB "/lib/$(RUBY_INSTALL_NAME)/site_ruby"
|
||||||
#define RUBY_SITE_LIB2 "/lib/ruby/site_ruby/$(ruby_version)"
|
#define RUBY_SITE_LIB2 "/lib/$(RUBY_INSTALL_NAME)/site_ruby/$(ruby_version)"
|
||||||
#define RUBY_VENDOR_LIB "/lib/ruby/vendor_ruby"
|
#define RUBY_VENDOR_LIB "/lib/$(RUBY_INSTALL_NAME)/vendor_ruby"
|
||||||
#define RUBY_VENDOR_LIB2 "/lib/ruby/vendor_ruby/$(ruby_version)"
|
#define RUBY_VENDOR_LIB2 "/lib/$(RUBY_INSTALL_NAME)/vendor_ruby/$(ruby_version)"
|
||||||
#define RUBY_PLATFORM "$(arch)"
|
#define RUBY_PLATFORM "$(arch)"
|
||||||
#define RUBY_ARCHLIB "/lib/ruby/$(ruby_version)/$(ARCH)-$(PLATFORM)"
|
#define RUBY_ARCHLIB "/lib/$(RUBY_INSTALL_NAME)/$(ruby_version)/$(ARCH)-$(PLATFORM)"
|
||||||
#define RUBY_SITE_ARCHLIB "/lib/ruby/site_ruby/$(ruby_version)/$(ARCH)-$(RT)"
|
#define RUBY_SITE_ARCHLIB "/lib/$(RUBY_INSTALL_NAME)/site_ruby/$(ruby_version)/$(ARCH)-$(RT)"
|
||||||
#define RUBY_VENDOR_ARCHLIB "/lib/ruby/vendor_ruby/$(ruby_version)/$(ARCH)-$(RT)"
|
#define RUBY_VENDOR_ARCHLIB "/lib/$(RUBY_INSTALL_NAME)/vendor_ruby/$(ruby_version)/$(ARCH)-$(RT)"
|
||||||
#define LIBRUBY_SO "$(LIBRUBY_SO)"
|
#define LIBRUBY_SO "$(LIBRUBY_SO)"
|
||||||
#if 0
|
#if 0
|
||||||
$(BANG)if "$(RUBY_SO_NAME)"!="$$(RUBY_SO_NAME)" || "$(ARCH)-$(PLATFORM)"!="$$(ARCH)-$$(PLATFORM)"
|
$(BANG)if "$(RUBY_SO_NAME)"!="$$(RUBY_SO_NAME)" || "$(ARCH)-$(PLATFORM)"!="$$(ARCH)-$$(PLATFORM)"
|
||||||
|
@ -617,9 +617,9 @@ s,@EXPORT_PREFIX@, ,;t t
|
||||||
s,@arch@,$(ARCH)-$(PLATFORM),;t t
|
s,@arch@,$(ARCH)-$(PLATFORM),;t t
|
||||||
s,@sitearch@,$(ARCH)-$(RT),;t t
|
s,@sitearch@,$(ARCH)-$(RT),;t t
|
||||||
s,@ruby_version@,$(ruby_version),;t t
|
s,@ruby_version@,$(ruby_version),;t t
|
||||||
s,@sitedir@,$${prefix}/lib/ruby/site_ruby,;t t
|
s,@sitedir@,$${prefix}/lib/$${RUBY_INSTALL_NAME}/site_ruby,;t t
|
||||||
s,@vendordir@,$${prefix}/lib/ruby/vendor_ruby,;t t
|
s,@vendordir@,$${prefix}/lib/$${RUBY_INSTALL_NAME}/vendor_ruby,;t t
|
||||||
s,@rubyhdrdir@,$$(includedir)/ruby-$$(ruby_version),;t t
|
s,@rubyhdrdir@,$$(includedir)/$${RUBY_INSTALL_NAME}-$$(ruby_version),;t t
|
||||||
s,@sitehdrdir@,$$(rubyhdrdir)/site_ruby,;t t
|
s,@sitehdrdir@,$$(rubyhdrdir)/site_ruby,;t t
|
||||||
s,@vendorhdrdir@,$$(rubyhdrdir)/vendor_ruby,;t t
|
s,@vendorhdrdir@,$$(rubyhdrdir)/vendor_ruby,;t t
|
||||||
s,@configure_args@,--with-make-prog=nmake --enable-shared $(configure_args),;t t
|
s,@configure_args@,--with-make-prog=nmake --enable-shared $(configure_args),;t t
|
||||||
|
|
Загрузка…
Ссылка в новой задаче