Commit graph

409 commits

Author SHA1 Message Date
nagachika
f4d766499f merge revision(s) 43609,43617: [Backport #8878] [Backport #9085]
vcs.rb: split

	* tool/vcs.rb: split from file2lastrev.rb.
	* tool/rbinstall.rb (Gem::Specification.load): obtain spec date from
	  VCS for the case using git, RUBY_RELEASE_DATE is the last resort.
	  probably fixes [Bug #9085].


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@43655 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-11-12 14:35:13 +00:00
nagachika
210efb5c3e merge revision(s) 42459: [Backport #8963]
* tool/make-snapshot: Fix order of priority for option parameter.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@43100 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-09-30 15:28:55 +00:00
nagachika
9aab347c15 merge revision(s) 42890: [Backport #8878]
* tool/rbinstall.rb (Gem::Specification#initialize): default date to
	  RUBY_RELEASE_DATE.  [ruby-core:57072] [Bug #8878]

	* tool/rbinstall.rb (Gem::Specification#to_ruby): add date.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@42946 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-09-15 13:59:44 +00:00
nagachika
d393aa0893 merge revision(s) 39718: [Backport #8001] [Backport #8023]
* Merge Onigmo d4bad41e16e3eccd97ccce6f1f96712e557c4518.
	  fix lookbehind assertion fails with /m mode enabled. [Bug #8023]
	  fix \Z matches where it shouldn't. [Bug #8001]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40088 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-04-03 17:25:09 +00:00
nagachika
0ce7a947d5 merge revision(s) 39547: [Backport #7972] [Backport #7974]
* Merge Onigmo 0fe387da2fee089254f6b04990541c731a26757f
	  v5.13.3 [Bug#7972] [Bug#7974]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39953 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-03-26 17:59:06 +00:00
nagachika
876fb07fde merge revision(s) 39507,39508: [Backport #7963]
* 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.
	  command line to Windows batch file is split not only by spaces
	  and equal signs but also by commas and semicolons.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39909 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-03-24 15:42:06 +00:00
nagachika
b9c27b5f33 merge revision(s) 39425:
merger.rb: runnable

	* tool/merger.rb: make runnable.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39668 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-03-09 13:55:21 +00:00
nagachika
d64bddf285 merge revision(s) 39424:
merger.rb: suppress warnings

	* tool/merger.rb (version_up, tag, default_merge_branch): suppress
  syntax warnings.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39667 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-03-09 13:54:25 +00:00
nagachika
22e2bfc646 merge revision(s) 39297: [Backport #8032]
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/branches/ruby_2_0_0@39616 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-03-06 13:14:46 +00:00
nagachika
3c8784c201 merge revision(s) 39358:
* tool/merger.rb: add interaction when only ChangeLog is modified.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39589 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-03-04 16:22:15 +00:00
nagachika
b501eda42f merge revision(s) 39284: [Backport #7860]
* 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/branches/ruby_2_0_0@39581 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-03-04 14:37:48 +00:00
nobu
16f6500cb2 make-snapshot: fix typo
* tool/make-snapshot (package): fix typo, liburyb, in fake
  config.status.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39152 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-08 02:09:32 +00:00
nobu
cc9a5a4089 make-snapshot: File.join
* tool/make-snapshot (package): use File.join to get rid of continuous
  slashes.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39151 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-08 02:09:30 +00:00
nobu
b3cd19971b make-snapshot: rubyarchdir
* tool/make-snapshot (package): fake rubyarchdir too.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39150 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-08 02:09:27 +00:00
nobu
ba7a0b4643 vpath.rb: no rbconfig.rb
* tool/vpath.rb (VPath#list): no rbconfig.rb, to get rid of cyclic
  dependency.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39134 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-07 12:20:56 +00:00
nobu
67e0767204 rbinstall.rb: CONFIG['arch'] not $arch
* tool/rbinstall.rb: use CONFIG['arch'] instead of $arch which was not
  added finally.  fix r39108.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39131 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-07 08:02:31 +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
67db06ba97 configure.in: arch dependent header directory options
* configure.in (rubyarchhdrdir, sitearchhdrdir, vendorarchhdrdir): add
  options to customize architecture dependent header directories.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39108 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-06 08:32:58 +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
c669931941 vpath.rb: hack for msys make
* tool/vpath.rb (VPath#def_options): hack for msys make, which
  converts a command line argument to non-msys command seems like a
  path list automagically.  [Bug #7710] [ruby-core:51489]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38886 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-01-20 13:24:31 +00:00
nobu
7a9bbf31fd rbinstall.rb: gem subdirectories
* tool/rbinstall.rb (gem): prepare implies makedirs.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38871 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-01-18 05:02:07 +00:00
nobu
3b5ba5df17 rbinstall.rb: gem subdirectories
* tool/rbinstall.rb (gem): Gem.ensure_gem_subdirectories makes
  subdirectories group-writable, so make them with $dir_mode.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38870 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-01-18 03:54:24 +00:00
nobu
eaab306b59 vpath.rb: separator for make
* tool/vpath.rb (VPath#list): default separator to PATH_SEPARATOR from
  configure.in for make, not same name constant of File for use in ruby.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38839 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-01-15 14:12:36 +00:00
nobu
86bd692035 tool/mkrunnable.rb: support mswin build on remote file system
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38777 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-01-11 07:59:07 +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
shugo
2cdd17b458 * tool/gen_dummy_probes.rb: remove comments in probes.d to fix the
compilation error introduced by r38755.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38757 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-01-10 06:39:55 +00:00
ko1
270fbd9c05 * vm_core.h, eval_intern.h (CHECK_STACK_OVERFLOW): move
CHECK_STACK_OVERFLOW() to vm_core.h and rename to
  CHECK_VM_STACK_OVERFLOW().
  This change is only move and rename.
* tool/instruction.rb: catch up above changes.
* vm.c, vm_insnhelper.c: ditto.
* vm_insnhelper.c (vm_stackoverflow): add a function to unify
  raising vm stackoverflow exception.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38594 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-12-25 09:57:07 +00:00
nobu
8dafe8c88d test.rb: show messages in one line
* sample/test.rb (Progress#initialize): add --verbose option and show
  messages in one line unless --verbose is given.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38330 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-12-11 18:09:10 +00:00
naruse
9f69bef99b * tool/make-snapshot: add --disable-rubygem to both MINIRUBY and RUBY.
On making miniprelude.c, it seems use MINIRUBY. this fixes #7541
  but rubygems also needs to be fixed for older rubies.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38327 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-12-11 16:18:01 +00:00
naruse
10c014b06d * tool/make-snapshot (BASERUBY): add --disable-gem to avoid load gems.
[Bug #7541] [ruby-core:50736]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38309 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-12-11 06:13:43 +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
17b19ca0f8 * tool/gen_dummy_probes.rb: add mode name.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38129 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-12-01 15:25:31 +00:00
nobu
82b1bfe417 make-snapshot: PATH_SEPARATOR
* tool/make-snapshot (package): now PATH_SEPARATOR is needed for
  id2token.rb.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38127 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-12-01 14:22:11 +00:00
kou
bfd5921e5d * re-added r38053 that is reverted by r38061. Problems by r38053
are resolved by r38096. r38096 removed GEM_SKIP configuration.

  The below is ChangeLog of r38053:

* defs/default_gems: Add base directory column.

* tool/rbinstall.rb:
  - Install .gemspecs of default gem to
    #{GEM_HOME}/specifications/default/.
  - Update files parameter of .gemspecs by relative path from
    library directory.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38101 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-12-01 03:35:36 +00:00
usa
5d33dad16c * revert r38053 because it causes too many test failures.
if you've already installed r38053 or later, remove the installed
  lib/ruby/gems/2.0.0 directory and reinstall this revision or later.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38061 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-11-30 13:00:23 +00:00
kou
f807e1b80d * defs/default_gems: Add base directory column.
* tool/rbinstall.rb:
  - Install .gemspecs of default gem to
    #{GEM_HOME}/specifications/default/.
  - Update files parameter of .gemspecs by relative path from
    library directory.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38053 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-11-30 10:45:58 +00:00
nobu
d22ac50ad4 tool/vpath.rb
* tool/generic_erb.rb, tool/id2token.rb: add --path-separator option
  for mingw where make and built ruby live in different world.
* tool/vpath.rb: extract from tool/instruction.rb.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37985 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-11-29 08:12:29 +00:00
drbrain
9694bb8cac * lib/rubygems*: Updated to RubyGems 2.0
* test/rubygems*:  ditto.

* common.mk (prelude):  Updated for RubyGems 2.0 source rearrangement.

* tool/change_maker.rb:  Allow invalid UTF-8 characters in source
  files.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37976 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-11-29 06:52:18 +00:00
nobu
400d2d9d03 mkrunnable.rb: static-linked-ext
* tool/mkrunnable.rb: make archdir for static-linked-ext.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37819 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-11-23 13:49:14 +00:00
kosaki
86541e02c1 * tool/gen_dummy_probes.rb: don't change #include, #if and #endif
lines. [Bug #7370]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37799 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-11-22 08:41:19 +00:00
knu
d5d2440e0f Drop executable bits of files that are not executable.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37795 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-11-22 05:54:13 +00:00
nobu
7bd638b7a4 object.c: suppress warning
* object.c (rb_obj_alloc): suppress unused variable warning.

* tool/gen_dummy_probes.rb: define dtrace disabling macro.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37691 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-11-16 17:02:39 +00:00
naruse
f82d652f35 Fix dtrace commit r37631, it is [Feature #2565]
* configure.in: disable dtrace because it doesn't work on FreeBSD.

* common.mk (clean-local): rm probes.h.

* common.mk (parse.o): depend $(PROBES_H_INCLUDES).

* common.mk (.d.h): moved from Makefile.in and use BASERUBY.

* tool/gen_dummy_probes.rb: reimplemented with ruby because sed is not
  available on Windows Microsoft VC++ environment.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37636 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-11-13 06:13:39 +00:00
tenderlove
4c740bae97 * probes.d: add DTrace probe declarations. [ruby-core:27448]
* array.c (empty_ary_alloc, ary_new): added array create DTrace probe.

* compile.c (rb_insns_name): allowing DTrace probes to access
  instruction sequence name.

* Makefile.in: translate probes.d file to appropriate header file.

* common.mk: declare dependencies on the DTrace header.

* configure.in: add a test for existence of DTrace.

* eval.c (setup_exception): add a probe for when an exception is
  raised.

* gc.c: Add DTrace probes for mark begin and end, and sweep begin and
  end.

* hash.c (empty_hash_alloc): Add a probe for hash allocation.

* insns.def: Add probes for function entry and return.

* internal.h: function declaration for compile.c change.

* load.c (rb_f_load): add probes for `load` entry and exit, require
  entry and exit, and wrapping search_required for load path search.

* object.c (rb_obj_alloc): added a probe for general object creation.

* parse.y (yycompile0): added a probe around parse and compile phase.

* string.c (empty_str_alloc, str_new): DTrace probes for string
  allocation.

* test/dtrace/*: tests for DTrace probes.

* vm.c (vm_invoke_proc): add probes for function return on exception
  raise, hash create, and instruction sequence execution.

* vm_core.h: add probe declarations for function entry and exit.

* vm_dump.c: add probes header file.

* vm_eval.c (vm_call0_cfunc, vm_call0_cfunc_with_frame): add probe on
  function entry and return.

* vm_exec.c: expose instruction number to instruction name function.

* vm_insnshelper.c: add function entry and exit probes for cfunc
  methods.

* vm_insnhelper.h: vm usage information is always collected, so
  uncomment the functions.

12 19:14:50 2012  Akinori MUSHA  <knu@iDaemons.org>

* configure.in (isinf, isnan): isinf() and isnan() are macros on
  DragonFly which cannot be found by AC_REPLACE_FUNCS().  This
  workaround enforces the fact that they exist on DragonFly.

12 15:59:38 2012  Shugo Maeda  <shugo@ruby-lang.org>

* vm_core.h (rb_call_info_t::refinements), compile.c (new_callinfo),
  vm_insnhelper.c (vm_search_method): revert r37616 because it's too
  slow.  [ruby-dev:46477]

* test/ruby/test_refinement.rb (test_inline_method_cache): skip
  the test until the bug is fixed efficiently.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37631 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-11-12 21:52:12 +00:00
kou
e91c04e2e9 * tool/rbinstall.rb: Don't install *.gemspec under lib/.
[ruby-core:48966] [Bug #7289]
  Reported by Vit Ondruch. Thanks!!!


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37608 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-11-10 03:15:55 +00:00
usa
e4d1a8a157 * tool/merger.rb: typo.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37602 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-11-09 15:42:55 +00:00
naruse
082e1344cc * tool/merger.rb: add feature to tag preview/rc.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37412 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-11-01 19:24:21 +00:00
naruse
b2bbfb3e18 * tool/make-snapshot: fix wrong regexp for releasing preview.
patched by mame.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37409 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-11-01 18:22:31 +00:00