748 Commits
Author SHA1 Message Date
usa fc5238a491 merge revision(s) 55434: [Backport #12401]
* common.mk (build-ext), ext/extmk.rb: use variable EXTENCS
	  different than ENCOBJS, to get rid of circular dependency.
	  build libencs when linking encodings statically.
	  [ruby-core:75618] [Bug #12401]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@55931 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-08-16 06:03:51 +00:00
usa f54265a8eb merge revision(s) 49758,50356,50359: [Backport #12563]
fake.rb: rubyarchhdrdir for rubyspec

	* common.mk (test-rubyspec): use fake script to set header
  directories.

	* template/fake.rb.in (RUBYOPT): set -r option to propagate to
  forked processes.

	* tool/fake.rb (prehook): set rubyarchhdrdir too.
	* too/fake.rb: don't fake libdir.  use libdirname instead.

	* tool/fake.rb: don't fake libdir.  use libdirname instead.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@55637 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-07-11 15:17:58 +00:00
nagachika 3f7ce08537 merge revision(s) 49176,49334,49802,49814,49815,49816,50036,51453,51705,51706,51708,51805,51807,53298,53517,53519,53521,53522,53523,53526,53527,54017,54034:
* .travis.yml: Remove redundant configuration option.
	  [fix GH-809] Patch by @gxworld

	* .travis.yml: removed Ruby 1.9.3 build on Travis CI

	* .travis.yml: update libssl before running tests. 
	  Thanks to Chris Sinjakli <chris@sinjakli.co.uk> for figuring out the
	  travis settings!

	* .travis.yml: removed osx code. follow up with r53517

	* .travis.yml: removed commented-out code.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@54429 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-03-29 21:07:26 +00:00
nagachika 319a3fa7d1 merge revision(s) 51808: [Backport #11794]
* common.mk (update-gems): use BASERUBY instead of RUNRUBY.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@53006 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-12-09 15:21:04 +00:00
nagachika 343b2aa615 merge revision(s) 51410: [Backport #11396]
* symbol.h (struct RSymbol): add hashval field

	* symbol.c (dsymbol_alloc): setup hashval field once

	* hash.c (rb_any_hash): return RSymbol->hashval directly

	* common.mk: hash.o depends on symbol.h
	  Thanks to Bruno Escherl <bruno@escherl.net> for the bug report
	  [ruby-core:70129] [Bug #11396]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@51589 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-08-15 18:10:16 +00:00
nagachika 3153900973 merge revision(s) 50887,50896,50902: [Backport #11060]
* file.c (rb_file_load_ok): try opening file without gvl not to
	  lock entire process.  [Bug #11060]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@51143 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-07-04 14:24:21 +00:00
naruse b8f4796ac5 merge revision(s) 49689,49752,49753: [Backport #10953]
* common.mk: use ruby organization for rubyspec.

	* spec/default.mspec: remove specific version number.
	  https://github.com/ruby/rubyspec/commit/7a909e925c1baa9c700bd44af9241aef6e596714

	* spec/default.mspec: use default configuration file name.
	  https://github.com/ruby/rubyspec/commit/cc69f337b06362e5607ffa3e3ad40ef7494960cf


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@50053 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-03-22 03:39:38 +00:00
naruse 23cf2750d1 merge revision(s) 49411,49419,49451,49485,49489:
configure.in: check dtace -G

	* configure.in (RUBY_DTRACE_POSTPROCESS): check if the object file
  is really modified by `dtrace -G`, this command is very system
  dependent.
	* common.mk (ruby-glommed.o): dependency on $(OBJ) should be written
	  in common.mk (in which OBJ is defined) because of Makefile include
	  and parse order. This partly reverts r49419.
	  [ruby-dev:48849] [Bug #10808]

	* Makefile.in (ruby-glommed.o): ditto.

	* Makefile.in (ruby-glommed.o): remove excess $(DTRACE_OBJ) because
	  it is included in $(OBJS) since r49451.

	* Makefile.in (probes.o): should depend on $(DTRACE_DEPENDENT_OBJS)

	* Makefile.in (probes.stamp): rebuild dtrace dependent objects
	  only when `dtrace -G` modifies its input files.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@49686 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-02-22 08:12:34 +00:00
usa 3fa6e72642 * common.mk (up): propagate verbose option.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48959 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-12-24 02:56:32 +00:00
usa c5712c91b9 * Makefile.in, common.mk: move common-srcs to Makefile.in because
it breaks build on mswin.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48943 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-12-23 15:22:58 +00:00
nobu 51f945670f common.mk: run after-update
* common.mk (up): run after-update on every platforms.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48938 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-12-23 14:30:32 +00:00
nobu 38938ccaad extlibs.rb: external libraries
* tool/extlibs.rb: download, extract, and patch external libraries.

* ext/fiddle/extlibs: libffi-3.2.1 and patch for mswin.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48935 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-12-23 13:24:33 +00:00
akr ecedd3b224 Update dependencies.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48898 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-12-19 13:34:54 +00:00
akr fe98c98549 update dependencies.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48895 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-12-19 13:11:34 +00:00
nobu 238d8586df make-snapshot: use srcdir
* tool/make-snapshot: use srcdir as checked out working directory.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48841 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-12-15 01:28:58 +00:00
nobu 56891028bd common.mk: html
* common.mk (html): target to generate HTML form documentation.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48684 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-12-02 07:06:45 +00:00
nobu 062f0eddc7 common.mk: clean more files
* common.mk (distclean-local): clean fake file.

* common.mk (realclean-local): clean generated files under srcdir.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48681 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-12-02 06:29:52 +00:00
nobu 15cfc9553a common.mk: rebuild verconf.h for each configure
* win32/Makefile.sub (verconf.h): so depends on verconf.mk, which
  is rebuilt by setup.mak.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48664 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-12-01 08:20:45 +00:00
nobu 6b6ba319ea common.mk: ext/json/parser/parser.c
* common.mk (ext/json/parser/parser.c): sometimes need for local
  development.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48663 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-12-01 06:38:08 +00:00
akr 693f56bb01 Update dependency.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48627 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-11-27 22:47:57 +00:00
nobu e5df8e7bb3 common.mk: INITOBJS
* common.mk (INITOBJS): rename DMYEXT.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48624 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-11-27 20:04:48 +00:00
nobu 28ad79fac3 dmyenc.c: separate
* dmyenc.c (Init_enc): separate from dmyext.c for statically
  linked extension excluding encoding libraries.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48623 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-11-27 20:02:32 +00:00
akr 1c6f4943b9 * common.mk (miniprelude.c): It is not depend on prelude.rb now.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48615 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-11-27 12:59:18 +00:00
akr 698f329b55 Update dependencies.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48614 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-11-27 12:52:17 +00:00
nobu 955c7f0698 common.mk: prelude.c by BASERUBY
* common.mk (prelude.c): no longer depends on miniruby, since not
  depending on rbconfig.rb.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48607 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-11-27 08:32:01 +00:00
nobu 98d18de479 common.mk: no preludes for miniruby
* common.mk (miniprelude.c): miniruby needs no preludes.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48606 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-11-27 08:12:16 +00:00
akr b1028f7a6c * common.mk: encdb.h and transdb.h depends on $(PREP).
So prebuild files for them in tarball are useless.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48577 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-11-25 21:09:34 +00:00
akr a08d6c5bd8 * common.mk (prereq): Don't depends on prelude.c and golf_prelude.c.
Since they depend on $(PREP) which is miniruby, they are rebuilt
  after miniruby is built, even if tarball contains them.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48568 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-11-25 15:55:34 +00:00
akr 7df1831bae * template/prelude.c.tmpl: Don't expand RbConfig::Config[...].
It is not used now.

* common.mk: prelude.c and golf_prelude.c doesn't depend on rbconfig.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48566 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-11-25 15:22:01 +00:00
nobu 913ed016c1 common.mk: remove old gems
* common.mk (update-gems): remove old version gems after
  successfully downloaded.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48558 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-11-25 04:37:58 +00:00
nobu d551e813ca common.mk: keep verconf.h if unchanged
* common.mk (verconf.h): update only when changed to reduce
  unnecessary recompiling loadpath.c.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48536 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-11-22 07:10:20 +00:00
nobu 4ecdc8f545 common.mk: use PWD with nmake
* common.mk (ext/ripper/ripper.c): move MAKEDIR to Makefile.sub.

* win32/Makefile.sub (PWD): set to $(MAKEDIR), nmake built-in macro.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48531 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-11-21 15:58:35 +00:00
naruse 31f9c8c09e * common.mk (ext/ripper/ripper.c): revert about srcdir and top_srcdir.
* common.mk (ext/ripper/ripper.c): use $(PWD) for Unix,
  $(MAKEDIR) for Windows.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48530 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-11-21 10:34:55 +00:00
akr 6ca202fcee Update dependency.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48526 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-11-21 03:04:44 +00:00
nobu 72de767e9b common.mk: fix dependencies
* common.mk (ext/ripper/ripper.c): fix dependencies for the case
  to make ripper.y and id.h under the build directory.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48523 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-11-21 00:10:25 +00:00
naruse c2bd5491f2 * common.mk (ext/ripper/ripper.c): id.h in VPATH may exist in the build
directory.

* common.mk (ext/ripper/ripper.c): $(RM) was not defined.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48522 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-11-20 23:45:44 +00:00
nobu 3a2d2af0f7 common.mk: fix build error
* common.mk (ext/ripper/ripper.c): VPATH is always ../.. from
  ext/ripper.

* ext/ripper/depend (.y.c): VPATH is not needed for an
  intermediate file.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48499 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-11-19 15:19:33 +00:00
nobu 4daa0fce20 common.mk: ims=nil option
* common.mk (update-gems): use ims=nil option.

* tool/downloader.rb (Downloader.download): show the message if no
  need to download in verbose mode.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48497 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-11-19 15:06:04 +00:00
naruse a77e25ecd8 * common.mk (ext/json/parser/parser.c): don't touch parse.c,
ruby repo is a downstream.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48496 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-11-19 12:12:22 +00:00
naruse 85c464c540 * common.mk (ext/ripper/ripper.c): use $(PWD) to get
<build-directory>/ext/ripper.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48495 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-11-19 11:38:46 +00:00
naruse 926b9e05f1 * common.mk (ext/ripper/ripper.c): pass build directory as VPATH.
* ext/ripper/depend (.y.c): use VPATH for y.tab.c.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48493 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-11-19 09:00:33 +00:00
usa 4a447965b5 * common.mk: revert r48486 because it breaks mswin build. start over.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48487 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-11-18 22:17:53 +00:00
nobu 0f6015c4fb common.mk: remove srcdir prefix
* common.mk (PRELUDE_SCRIPTS): since tool/generic_erb.rb searches
  files in VPATH, srcdir prefix is not needed.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48486 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-11-18 20:28:46 +00:00
akr 20fe728a24 Dependencies updated.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48483 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-11-18 15:28:08 +00:00
akr 30a5ce7345 * common.mk (CCAN_LIST_INCLUDES): Unused variable removed.
(ENCODING_H_INCLUDES): Ditto.
  (PROBES_H_INCLUDES): Ditto.
  (VM_CORE_H_INCLUDES): Ditto.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48456 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-11-16 04:12:38 +00:00
akr f4330f7f6b Revert r48450.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48454 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-11-16 02:06:11 +00:00
akr 2a87fdedb7 * common.mk: Specify dependencies for generated C sources.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48453 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-11-15 15:46:05 +00:00
akr 32dc9e462a * common.mk: parse.o depends on parse.y before parse.h.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48450 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-11-15 15:08:50 +00:00
akr 6afabcb4aa * common.mk: No need to declare dependencies which
will be detected by inference rules.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48449 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-11-15 14:11:49 +00:00
akr 7cd76ab0c5 * internal.h: Include ruby.h and ruby/encoding.h to be
includable without prior inclusion.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48447 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-11-15 11:49:06 +00:00