Граф коммитов

44 Коммитов

Автор SHA1 Сообщение Дата
nobu 51bcbca236 rbconfig.rb: use program version
* common.mk, tool/mkconfig.rb: check the running ruby version in
  rbconfig.rb with the program version, as RUBY_VERSION has never
  been affected by --with-ruby-version option.
  [ruby-core:68639] [Bug #11002]
* configure.in (LIBRUBY_DLDFLAGS): compatibility_version must be
  valid version numbers, not an arbitrary string.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50152 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-04-02 07:27:12 +00:00
nobu 733a03c285 mkconfig.rb: embed version substring
* tool/mkconfig.rb (RbConfig): embed substring of the version, not
  at the runtime, and fall back to the version itself for the case
  it does not include the teeny version.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50094 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-03-26 00:30:07 +00:00
nobu 6268830ba8 mkconfig.rb: without fake.rb
* tool/mkconfig.rb: use arguments instead of built-in constants
  to work without fake.rb.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49882 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-03-07 02:06:11 +00:00
nobu e9f3a59e85 configure.in: BOOTSTRAPRUBY
* configure.in (BOOTSTRAPRUBY): baseruby if cross compiling or
  miniruby, anyway runnable ruby command.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49881 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-03-07 02:06:06 +00:00
nobu cb0cfbb4c3 mkconfig.rb: no build-time variables
* tool/mkconfig.rb: exclude unnecessary build-time only variables,
  various ruby commands, installation targets, and dtrace stuffs.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49791 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-03-01 02:17:13 +00:00
nobu 25edb07cb3 mkconfig.rb: delete DESTDIR
* tool/mkconfig.rb (RbConfig): delete default DESTDIR set by
  --with-destdir.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49748 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-02-25 09:17:33 +00:00
naruse 7d24866746 * tool/merger.rb: support 2.1+ versioning scheme.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49740 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-02-25 06:35:47 +00:00
nobu e98f7ea423 mkconfig.rb: SDKROOT
* tool/mkconfig.rb (RbConfig): allow prefix includedir by SDKROOT
  environment variable on OSX.  cf.
  http://www.opensource.apple.com/source/ruby/ruby-106/patches/tool_mkconfig.rb.diff

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49556 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-02-10 08:30:16 +00:00
naruse 011b74b748 * tool/mkconfig.rb: remove not to require rbconfig/obsolete.rb.
* lib/rbconfig/obsolete.rb: removed.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46730 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-07-07 02:07:01 +00:00
nobu 76bb597728 mkconfig.rb: fix empty prefix
* tool/mkconfig.rb: vars["prefix"] may not set.  [fix GH-643]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46591 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-06-27 22:52:46 +00:00
nobu bffd6395d6 mkconfig.rb: fix empty prefix
* tool/mkconfig.rb: fix empty RbConfig::CONFIG["prefix"] when
  configured --with-rubyarchprefix, remove prefix from rubyarchdir
  after expansion for the case it does not start with '$(prefix)'.
  [fix GH-643]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46586 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-06-27 15:35:15 +00:00
nobu f0c310c609 mkconfig.rb: pass version numbers
* tool/mkconfig.rb (RbConfig): version numbers are also needed by
  RUBY_SO_NAME.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44468 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-12-31 06:34:35 +00:00
nobu 07dcd43a0a mkconfig.rb: prefer unexpanded values
* tool/mkconfig.rb: prefer configured values than overriding
  values for RUBY_INSTALL_NAME and RUBY_SO_NAME when expanded
  results are same.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44447 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-12-27 05:46:06 +00:00
nobu 8825a084eb win32/configure.bat: option arguments
* win32/configure.bat: try to fix option arguments split by commas and
  equals here.  this batch file no longer run with old command.com.
* tool/mkconfig.rb: no hacks for cmd.exe.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40019 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-03-31 06:40:37 +00:00
naruse e8f9b6647a Remove unused variable
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39886 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-03-23 16:05:47 +00:00
nobu b3d2b56d2b mkconfig.rb: reconstruct comma separated list values
* tool/mkconfig.rb: reconstruct comma separated list values.  a
  command line to Windows batch file is splitted not only by spaces
  and equals sign but also by commas and semicolons.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39507 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-26 06:12:17 +00:00
nobu 1955ac9e82 * tool/mkconfig.rb: exclude variables to just build libruby.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39315 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-19 03:49:37 +00:00
nobu 3f1a334504 mkconfig.rb: clear exec_prefix
* tool/mkconfig.rb: clear exec_prefix which may differ from prefix,
  before expanding rubyarchdir to remove prefix.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39297 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-18 01:49:11 +00:00
naruse 16d775d94e * tool/mkconfig.rb: remove prefix from rubyarchdir.
r39267 expands variables, it changes expansion timing,
  breaks RbConfig::CONFIG["includedir"] and building
  extension libraries with installed ruby.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39284 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-16 16:10:55 +00:00
nobu 26aae7740f mkconfig.rb: fix concatenated lines
* tool/mkconfig.rb: see if a variable is set before setting it to fix
  concatenated lines.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39129 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-07 07:21:30 +00:00
nobu 29c214e4a0 configure.in: arch dependent library directory options
* configure.in (rubyarchprefix, sitearchdir, vendorarchdir): add
  options to customize architecture dependent library directories.
* template/ruby.pc.in, tool/mkconfig.rb, tool/rbinstall.rb: use
  configured values.
* tool/mkconfig.rb: expand rubyarchdir to extract prefix.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39107 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-06 08:32:53 +00:00
nobu b99c3e74a1 mkconfig.rb: fix anchor
* tool/mkconfig.rb: should match whole word.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39100 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-06 07:47:45 +00:00
nobu 385ef8e5c2 mkconfig.rb: no BASERUBY
* tool/mkconfig.rb: BASERUBY is transient at core build.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38892 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-01-21 06:41:38 +00:00
nobu fc81730154 mkconfig.rb: use configured libdir value
* tool/mkconfig.rb: use configured libdir value to fix
  --enable-load-relative on systems where libdir is not default value,
  overridden in config.site files.  [ruby-core:47267] [Bug #6903]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38776 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-01-11 07:56:32 +00:00
nobu 08b98cc317 mkconfig.rb: newlines
* tool/mkconfig.rb: restore embedded newlines.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38288 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-12-10 04:18:11 +00:00
nobu bd89d0cba5 rbconfig/obsolete.rb: Config
* lib/rbconfig/obsolete.rb (Config): re-introduce warnings for a
  lame-duck.  [ruby-core:46836] [Bug #6809]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37386 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-10-29 18:08:56 +00:00
usa 8ca58751c1 * tool/mkconfig.rb: remove string literal concatenation.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37319 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-10-25 04:36:15 +00:00
nobu 1474cfa846 obsolete Config
* lib/rbconfig/obsolete.rb (Config): remove obsolete Config.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36330 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-07-06 03:27:10 +00:00
nobu 31e1fce2a3 * tool/mkconfig.rb: do not make the entries related to sitedir and
verdordir if disabled by --without options.  [ruby-core:38922]
  [Bug #5187]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32970 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-08-13 13:17:30 +00:00
nobu 96064d1889 * tool/mkconfig.rb (RbConfig): get rid of unused variable.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30238 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-12-17 09:35:42 +00:00
nobu f18d040061 * tool/mkconfig.rb (RbConfig): honor ARCHFLAGS and RC_ARCHS to
override embedded ARCH_FLAG value on universal-darwin.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30226 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-12-16 12:46:44 +00:00
usa e7381db962 * tool/mkconfig.rb: fixed build problem on mswin64 introduced in r29278.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29309 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-09-21 13:20:07 +00:00
knu a88191b1ca * tool/mkconfig.rb: Fix build with m4 1.4.15 generating duplicate
lines in config.status.  According to nobu, the mswin32 port may
  depend on the piece of code in question, so the behavior is left
  unchanged on mswin32.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29278 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-09-16 17:28:42 +00:00
nobu 89339af9c1 * include/ruby/version.h (RUBY_API_VERSION_*): renamed and moved
from version.h.  [ruby-dev:42103]



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29082 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-08-23 21:08:19 +00:00
nobu df96e41845 * mkconfig.rb, lib/rbconfig/obsolete.rb: warn obsolete and
deprecated Config.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28900 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-08-07 08:40:32 +00:00
muraken a8fcae0858 * confiure.in: new --with-ext and --with-out-ext options for extmk.
* tool/mkconfig.rb: normalizing --with-out-ext to --without-ext.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26706 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-02-18 13:33:25 +00:00
akr c0b4e90f08 * tool/mkconfig.rb: generate RbConfig.ruby in rbconfig.rb.
* lib/webrick/httpservlet/cgihandler.rb: use RbConfig.ruby.

* test/ruby/envutil.rb: ditto.

* benchmark/report.rb: ditto.

* benchmark/runc.rb: ditto.

* tool/eval.rb: ditto.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26216 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-12-31 15:00:04 +00:00
nobu 609030816b * mkconfig.rb: reverted r25443 because build_os is used in mkmf.rb
on some platforms.  [ruby-core:26332]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25503 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-10-26 23:56:13 +00:00
nobu 32df7768b8 * configure.in (target, target_alias): replace with real cpu.
* mkconfig.rb: build* are not needed in rbconfig.rb.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25443 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-10-23 05:25:56 +00:00
naruse 232978b031 * tool/mkconfig.rb (program_transform_name): fix for multiple trans
rules for autoconf 2.61 or earlier.

* tool/rbinstall.rb (program_transform_name): ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24671 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-08-26 10:56:55 +00:00
nobu c6defbf310 * tool/mkconfig.rb (program_transform_name): fix for autoconf 2.61
or earlier.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24665 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-08-26 08:00:37 +00:00
nobu 9ae3b070c1 * tool/mkconfig.rb (RbConfig.expand): get rid of exceptions on
frozen strings unless really changed.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@23913 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-06-30 07:55:36 +00:00
nobu e11a1fc9b7 * tool/mkconfig.rb, tool/instruby.rb: removed redundant code.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@23566 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-05-25 02:47:07 +00:00
yugui a654e0b57b * instruby.rb: moved into tool/.
* mkconfig.rb: ditto.

* rubytest.rb: ditto.

* runruby.rb: ditto.

* common.mk: follows the moves.

* configure.in: ditto.

* win32/Makefile.sub: ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@23542 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-05-22 11:48:42 +00:00