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

77 Коммитов

Автор SHA1 Сообщение Дата
nobu 3403d175d9 * ext/extmk.rb (relative_from): treat mere drive letter as an absolute
path.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8342 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-04-17 14:58:16 +00:00
nobu b567351aff * ext/extmk.rb (extmake, parse_args): do not expand destdir.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8340 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-04-17 13:57:52 +00:00
nobu 06c1a64ebb * ext/extmk.rb (extmake): hdrdir needs to be defined also in
Config::CONFIG.

* lib/mkmf.rb (configuration, create_makefile): get rid of recursive
  macro reference.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8278 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-04-08 11:18:17 +00:00
nobu 69af75c28f * ext/extmk.rb (extmake): top_srcdir is based from ext directory.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8267 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-04-07 15:21:04 +00:00
nobu 9ea857d7ee * ext/extmk.rb (extmake): keep directory names in Makefile as macros.
* lib/mkmf.rb (configuration, create_makefile): ditto.

* lib/mkmf.rb (CXX_EXT): separate C++ extensions.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8266 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-04-07 14:59:24 +00:00
nobu 5c47cc1f0a * ext/extmk.rb (extract_makefile): nothing to be removed when no file
was deleted.

* ext/extmk.rb (extmake): restore srcdir.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8205 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-03-28 11:53:52 +00:00
nobu b930458666 * ext/extmk.rb (parse_args): return false if nothing matched.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8054 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-03-02 10:53:53 +00:00
nobu 9648e68d88 * ext/extmk.rb (extract_makefile): remove no longer existing installed
files.

* lib/mkmf.rb (install_dirs): return installation directory list.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7997 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-02-19 01:43:58 +00:00
nobu 0bb45af103 * ext/extmk.rb (extract_makefile): default to true if not compiled
previously.

* ext/extmk.rb (extmake): create dummy makefile if extconf failed.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7939 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-02-10 03:09:27 +00:00
nobu 7a07ffe479 * ext/extmk.rb (extract_makefile): extract previously collected
informations from existing Makefile.

* ext/socket/extconf.rb: check if getaddrinfo() works fine only when
  wide-getaddrinfo option is not given.  fixed: [ruby-dev:25422]

* ext/tk/extconf.rb: separate tkutil configuration.

* lib/mkmf.rb ($extmk): check if under ext directory.

* lib/mkmf.rb (Logging.postpone): allow recursive operation.

* lib/mkmf.rb (try_constant): make sure if really a constant, reduce
  the number of times of compile.

* lib/mkmf.rb (have_macro, have_var, byte_order): new functions.

* lib/mkmf.rb (find_library): allow directory list with separators.

* lib/mkmf.rb (arg_config): manage provided configuration options.

* lib/mkmf.rb (dir_config): accept arrays of directory names as
  default values.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7901 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-02-06 14:51:44 +00:00
nobu 420a708098 * Makefile.in, configure.in: made EXTOUT configurable.
* ext/extmk.rb (extmake), lib/mkmf.rb: keep topdir as relative style.

* lib/mkmf.rb: make extensions in depth order.  [ruby-dev:25522]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7856 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-01-31 15:19:27 +00:00
eban a39967d062 * ext/extmk.rb (MANIFEST): do not use anymore, use extconf.rb instead.
* ext/enumerator/extconf.rb, ext/fcntl/extconf.rb,
  ext/stringio/extconf.rb: added.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7167 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2004-11-01 05:04:04 +00:00
nobu a7ec244cc7 * ext/extmk.rb (extmake): extact target prefix from Makefiles.
* ext/extmk.rb: already built-in libraries satisfy dependencies.
  [ruby-dev:24028]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@6849 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2004-09-02 16:54:35 +00:00
nobu b21aa86d5c * ext/extmk.rb: get rid of side effect of Config.expand, patched by
<tttt01@infoseek.jp>  (ruby-bugs:PR#597)


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@6250 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2004-05-06 04:32:49 +00:00
nobu 7b9431d98d * common.mk, ext/extmk.rb: make ext and .ext get removed by distclean.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@6199 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2004-04-22 09:25:16 +00:00
nobu 6bfa557f8e * ext/extmk.rb: skip linking when libraries to be preloaded not
compiled.  [ruby-list:39561]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@6171 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2004-04-15 23:27:12 +00:00
nobu fa7a5d5477 * ext/extmk.rb (extmake): skip uncompiled extensions.
* lib/mkmf.rb (create_makefile): emit no rules for static library if
  $static is nil, e.g., outside of ext/.

* lib/test/unit/ui/console/testrunner.rb (test_started): show test
  name via $0.

* runruby.rb: set environments to use the compiled binary.

* test/runner.rb: do nothing while cross-compiling.

* test/drb/drbtest.rb, test/soap/calc/test_calc_cgi.rb: use envutil to
  know ruby binary.

* test/ruby/envutil.rb: give priority to RUBY environment variable to
  use just compiled binary and libraries.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@6125 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2004-04-08 10:45:21 +00:00
nobu 5c51ccc35c * ext/extmk.rb (extmake): extract necessary variables for static link
from Makefile.

* lib/mkmf.rb (create_makefile): save preload and libpath for next
  compile.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@6077 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2004-04-02 09:00:12 +00:00
nobu 52a67fe60d * Makefile.in, */Makefile.sub, common.mk (clean-local, distclean-local):
separate files under directories due to directory separator.

* */Makefile.sub (MKFILES): common.mk and */Makefile.sub should not be
  removed.

* win32/Makefile.sub, wince/Makefile.sub: $* cannot appear in explicit
  rules.

* cygwin/GNUmakefile.in: some mingw stuffs were missed.

* lib/mkmf.rb (create_makefile): Borland make wrongly removes braces
  from command lines.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@6001 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2004-03-23 05:32:01 +00:00
eban 38fc76574a * ext/extmk.rb: rm -rf $extout, not extout.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5986 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2004-03-20 12:22:48 +00:00
nobu 311fdfdfea * mkconfig.rb: no longer embed srcdir and compile_dir into
rbconfig.rb.

* ext/extmk.rb, lib/mkmf.rb: obtain top_srcdir and topdir from library
  paths.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5971 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2004-03-18 09:50:14 +00:00
nobu 0990e0e8fc * ext/extmk.rb: $extstatic is Array or nil now. [ruby-talk:93383]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5805 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2004-02-22 05:33:36 +00:00
nobu 883857d842 * ext/extmk.rb: use optparse instead of getopts.
* Makefile.in, bcc32/Makefile.sub, win32/Makefile.sub: ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5803 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2004-02-22 03:58:44 +00:00
nobu cf8cd080e4 * ext/extmk.rb: prefer relative path. [ruby-talk:93037]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5797 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2004-02-21 05:33:24 +00:00
nobu bab1372a33 * ext/extmk.rb (extmake): $extout_prefix doesn't vary for libraries.
* ext/extmk.rb (extmake): remove compile directory if empty.

* ext/extmk.rb (parse_args) lib/mkmf.rb (create_makefile): move
  initialization of $extout_prefix from lib/mkmf.rb.  [ruby-dev:22928]

* ext/extmk.rb: clear ext and extout directory when cleaning.

* lib/mkmf.rb (CLEANLIBS): should be under $(arch) directory.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5751 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2004-02-17 10:34:31 +00:00
nobu 33f78212ce * ext/extmk.rb (parse_args): delay expanding $(extout) until invoking
make.

* lib/mkmf.rb (CLEANLIBS): should remove files have specific
  extensions.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5749 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2004-02-17 03:12:53 +00:00
nobu 3d4b83aaba * ext/extmk.rb, lib/mkmf.rb: rename $outdir to $extout.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5661 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2004-02-09 09:20:52 +00:00
nobu ff9c34b3f4 * Makefile.in, bcc32/Makefile.sub, win32/Makefile.sub, configure.in,
runruby.rb: run rdoc, test and so on with compiled extension
  libraries.  [ruby-dev:22688]

* ext/extmk.rb, lib/mkmf.rb: make extension libraries in separated
  directory, similar to the actual directory structure.

* lib/fileutils.rb (FileUtils.copy_file): use the mode of the original
  file to create new file.

* lib/rdoc/ri/ri_paths.rb (RI::Paths::SYSDIR): get rid of unexpected
  influence by envirionment variable.

* bcc32/configure.bat, win32/configure.bat: add install-doc options.

* win32/win32.c, win32/win32.h (rb_w32_fstat): fix Borland C runtime
  bug which returns wrong mode.  [ruby-dev:22846]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5659 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2004-02-09 08:48:55 +00:00
nobu 6e0b3ca606 * ext/extmk.rb: Makefiles should depend on also rbconfig.rb.
(ruby-bugs:PR#1256)

* ext/win32ole/win32ole.c (set_argv): set real arguments to
  WIN32OLE::ARGV.  [ruby-list:39073]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5553 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2004-01-26 02:35:30 +00:00
usa fe5b6676b1 * ext/extmk.rb, win32/Makefile.sub, win32/configure.bat,
win32/setup.mak: --with-static-linked-ext support on mswin32.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5496 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2004-01-19 04:10:53 +00:00
nobu bafe6d8504 * ext/extmk.rb (extmake): should not reduce necessary libraries.
[ruby-dev:22440]

* lib/mkmf.rb (merge_libs): merge libraries according to
  dependency.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5421 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2004-01-09 02:20:28 +00:00
nobu 44e22e8d78 * ext/extmk.rb: preserve order in Setup. [ruby-dev:22503]
* ext/extmk.rb: move dependent libraries just after depended
  libraries.

* ext/digest/*/extconf.rb: depend on digest.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5409 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2004-01-07 22:06:38 +00:00
usa 923b55d35b * instruby.rb: fix install directory if destdir and compile_dir are
not in the same drive.

* ext/extmk.rb: ditto.

* win32/Makefile.sub, win32/README.win32, win32/configure.bat,
  win32/setup.mak: new configure scheme. use ``configure --prefix=dir''
  instead of ``nmake DESTDIR=dir install''.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5336 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2003-12-28 17:25:31 +00:00
nobu b1fd732b4f * ext/extmk.rb (MTIMES): let makefiles depend to mkmf.rb.
* lib/mkmf.rb (configuration): DLDFLAGS was duplicated.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5087 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2003-12-03 02:36:48 +00:00
nobu 7d7f1ef157 * ext/extmk.rb (extmake): should not force to remake Makefile when
installation and so on.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4398 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2003-08-17 02:32:07 +00:00
nobu 8695612caf * marshal.c (w_symbol, w_object): get rid of warnings.
* re.c (rb_memsearch): ditto.

* time.c (time_dump): ditto.

* ext/extmk.rb (extmake): not continue making when extconf.rb
  failed.

* ext/openssl/extconf.rb: check __VA_ARGS__ macro more precisely.

* ext/openssl/ossl.h: remove version.h dependency.

* ext/openssl/ruby_missing.h: ditto.

* lib/mkmf.rb (pkg_config): use --libs output except with
  only-L for other options.  [ruby-list:38099]

* lib/mkmf.rb (create_makefile): separate rule for static
  library from shared object.

* win32/Makefile.sub, bcc32/Makefile.sub, wince/Makefile.sub:
  define exec_prefix and libdir.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4396 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2003-08-16 14:58:34 +00:00
nobu 1efae2f585 commit miss
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4375 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2003-08-12 08:06:22 +00:00
nobu cc4f2f8fcb * ext/extmk.rb (extmake): compact $extlibs.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4374 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2003-08-12 07:55:14 +00:00
nobu fd36ed94f3 * Makefile.in: static link libraries to LIBRUBY_SO with static linked
ext.  [ruby-dev:21157]

* ext/extmk.rb (extmake): sort extension library initialization order.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4372 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2003-08-12 02:12:48 +00:00
nobu 94d17c1f1f * ext/extmk.rb (extmake): pass LIBPATH to make ruby. [ruby-dev:21137]
* ext/extmk.rb (extmake): set library name as source file name in
  Init_ext().  [ruby-dev:21137]

* lib/mkmf.rb (Logging::postpone): postpone logging messages after
  heading message as the result of the block.

* lib/mkmf.rb (macro_defined?): append newline to src unless ended
  with it.

* lib/mkmf.rb (have_library): allow nil function name to just
  append a library.  (ruby-bugs:PR#1083)

* lib/mkmf.rb (pkg_config): should append additional libraries to
  $libs but not $LIBS.  [ruby-dev:21137]

* ext/io/wait/extconf.rb: check DOSISH macro instead of platform.

* ext/digest/sha1/extconf.rb: have_library already appends library
  name.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4337 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2003-08-06 03:11:14 +00:00
eban 1038c25a09 * ext/extmk.rb (--no-undefined): annoying option removed.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4285 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2003-08-02 06:14:53 +00:00
eban 1a291e4544 * ext/extmk.rb (INSTALL_PROG, INSTALL_DATA): modify verbose messages.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4212 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2003-07-29 10:38:30 +00:00
nobu c1c86a37df * lib/mkmf.rb (rm_f): use FileUtils.
* lib/mkmf.rb (modified?): return mtime of the target if
  it exists and newer than times.

* lib/mkmf.rb (install_files): add a current directory
  file even if it does not exist yet.

* lib/mkmf.rb (configuration): do not add $LDFLAGS to
  DLDFLAGS.

* ext/extmk.rb (extmake): check whether Makefile is newer
  than depend and MANIFEST.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4089 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2003-07-18 08:34:45 +00:00
eban ab6e5c655c * ext/extmk.rb: add -Wl,--no-undefined to LDSHARED only
if GNU ld is 2.11 or later.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3719 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2003-04-24 10:49:57 +00:00
akr 0977fe1705 * instruby.rb, ext/extmk.rb, lib/benchmark.rb, lib/cgi.rb,
lib/debug.rb, lib/getoptlong.rb, lib/optparse.rb, lib/time.rb,
  lib/date/format.rb, lib/irb/ruby-lex.rb lib/uri/common.rb: revert
  escape for `-' in character class.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3634 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2003-03-29 06:39:50 +00:00
akr 58ef7c2088 * regex.c (re_compile_pattern): fix previous change.
* instruby.rb, ext/extmk.rb, ext/tk/lib/tk.rb, lib/benchmark.rb,
  lib/cgi.rb, lib/debug.rb, lib/getoptlong.rb, lib/jcode.rb,
  lib/optparse.rb, lib/time.rb, lib/date/format.rb,
  lib/irb/ruby-lex.rb: escape `[', `]', `-' in chracter class in
  regexp to avoid warning.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3595 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2003-03-21 15:13:23 +00:00
eban 986bfd904c * ext/extmk.rb (parse_args): add '-n' to $mflags BEFORE "--".
do not add DESTDIR if already included in $fmlags.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3475 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2003-02-10 11:59:26 +00:00
knu 79862de363 * instruby.rb (parse_args), ext/extmk.rb (parse_args): Prepend a
hyphen to the first argument of MAKEFLAGS only if appropriate.
  Remove wrong comments.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3419 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2003-01-27 19:48:02 +00:00
usa 18caa8f178 * instruby.rb ($mflags.set?): Check $make instead of $nmake, sinse
there is no such a variable.

* instruby.rb ($mflags.set?), ext/extmk.rb ($mflags.set?): Return
  false if unmatched.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3414 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2003-01-26 10:29:05 +00:00
knu 91758efa95 * instruby.rb (parse_args), ext/extmk.rb (parse_args): Detect -n
and emulate a dry run.  Use 'make' in case no --make argument is
  given.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3412 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2003-01-26 08:56:01 +00:00