archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-17 09:33:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

* configure.in (--with-ruby-version): Add a new option to specify

Browse source 
the ruby version string for version specific directories.
  [ruby-dev:35490]

* mkconfig.rb: Definition of ruby_version is now determined by the
  configure script.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@18074 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
knu 2008-07-15 12:43:03 +00:00
parent 40bbf21432
commit 80382b0e07
4 changed files with 35 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
Tue Jul 15 21:34:13 2008 Akinori MUSHA <knu@iDaemons.org>
* configure.in (--with-ruby-version): Add a new option to specify
the ruby version string for version specific directories.
[ruby-dev:35490]
* mkconfig.rb: Definition of ruby_version is now determined by the
configure script.
Mon Jul 14 06:02:26 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> Mon Jul 14 06:02:26 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/optparse.rb (OptionParser#environment): requires shellwords. * lib/optparse.rb (OptionParser#environment): requires shellwords.

9
NEWS
View file

@ -9,6 +9,15 @@ with all sufficient information, see the ChangeLog file.
== Changes since the 1.8.7 release == Changes since the 1.8.7 release
=== Configuration changes
* version specific directories
A new configure option --with-ruby-version is added, which allows
user to specify the version string (defaulted to "1.8") for version
specific directories such as library directories, ri directories and
gem directories.
=== Library updates (outstanding ones only) === Library updates (outstanding ones only)
* set * set

20
configure.in
View file

@ -1751,6 +1751,19 @@ case "$target_os" in
esac esac
RUBY_LIB_PREFIX=`eval echo \\"${libdir}/ruby\\"` RUBY_LIB_PREFIX=`eval echo \\"${libdir}/ruby\\"`
AC_ARG_WITH(ruby-version,
[ --with-ruby-version=STR ruby version string for version specific directories [[minor]] (full|minor|STR)],
[ruby_version=$withval],
[ruby_version=minor])
case "$ruby_version" in
full)
ruby_version="${MAJOR}.${MINOR}.${TEENY}"
;;
minor)
ruby_version="${MAJOR}.${MINOR}"
;;
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],
@ -1767,8 +1780,8 @@ case "$target_os" in
RUBY_SITE_LIB_PATH="`eval echo \\"$SITE_DIR\\" | sed 's|^NONE/|'"$prefix"'/|'`" RUBY_SITE_LIB_PATH="`eval echo \\"$SITE_DIR\\" | sed 's|^NONE/|'"$prefix"'/|'`"
;; ;;
esac esac
RUBY_LIB_PATH="${RUBY_LIB_PREFIX}/${MAJOR}.${MINOR}" RUBY_LIB_PATH="${RUBY_LIB_PREFIX}/${ruby_version}"
RUBY_SITE_LIB_PATH2="${RUBY_SITE_LIB_PATH}/${MAJOR}.${MINOR}" RUBY_SITE_LIB_PATH2="${RUBY_SITE_LIB_PATH}/${ruby_version}"
AC_DEFINE_UNQUOTED(RUBY_LIB, "${RUBY_LIB_PATH}") AC_DEFINE_UNQUOTED(RUBY_LIB, "${RUBY_LIB_PATH}")
AC_DEFINE_UNQUOTED(RUBY_SITE_LIB, "${RUBY_SITE_LIB_PATH}") AC_DEFINE_UNQUOTED(RUBY_SITE_LIB, "${RUBY_SITE_LIB_PATH}")
@ -1787,13 +1800,14 @@ case "$target_os" in
RUBY_VENDOR_LIB_PATH="`eval echo \\"$VENDOR_DIR\\" | sed 's|^NONE/|'"$prefix"'/|'`" RUBY_VENDOR_LIB_PATH="`eval echo \\"$VENDOR_DIR\\" | sed 's|^NONE/|'"$prefix"'/|'`"
;; ;;
esac esac
RUBY_VENDOR_LIB_PATH2="${RUBY_VENDOR_LIB_PATH}/${MAJOR}.${MINOR}" RUBY_VENDOR_LIB_PATH2="${RUBY_VENDOR_LIB_PATH}/${ruby_version}"
AC_DEFINE_UNQUOTED(RUBY_VENDOR_LIB, "${RUBY_VENDOR_LIB_PATH}") AC_DEFINE_UNQUOTED(RUBY_VENDOR_LIB, "${RUBY_VENDOR_LIB_PATH}")
AC_DEFINE_UNQUOTED(RUBY_VENDOR_LIB2, "${RUBY_VENDOR_LIB_PATH2}") AC_DEFINE_UNQUOTED(RUBY_VENDOR_LIB2, "${RUBY_VENDOR_LIB_PATH2}")
AC_SUBST(arch)dnl AC_SUBST(arch)dnl
AC_SUBST(sitearch)dnl AC_SUBST(sitearch)dnl
AC_SUBST(ruby_version)dnl
AC_SUBST(sitedir)dnl AC_SUBST(sitedir)dnl
AC_SUBST(vendordir)dnl AC_SUBST(vendordir)dnl

1
mkconfig.rb
View file

@ -140,7 +140,6 @@ end
print(*v_fast) print(*v_fast)
print(*v_others) print(*v_others)
print <<EOS print <<EOS
CONFIG["ruby_version"] = "$(MAJOR).$(MINOR)"
CONFIG["rubylibdir"] = "$(libdir)/ruby/$(ruby_version)" CONFIG["rubylibdir"] = "$(libdir)/ruby/$(ruby_version)"
CONFIG["archdir"] = "$(rubylibdir)/$(arch)" CONFIG["archdir"] = "$(rubylibdir)/$(arch)"
CONFIG["sitelibdir"] = "$(sitedir)/$(ruby_version)" CONFIG["sitelibdir"] = "$(sitedir)/$(ruby_version)"