Commit graph

71 commits

Author SHA1 Message Date
nobu
f7213e5648 * ext/extmk.rb (extmake): remove extinit files if no statically linked
extensions.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@10196 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2006-05-27 02:30:10 +00:00
nobu
65937b5eb9 * ruby.h, lib/mkmf.rb (create_header): clear command line options for
macros moved to extconf.h.

* ext/extmk.rb (extract_makefile, extmk): made RUBY_EXTCONF_H and
  EXTSTATIC permanent.

* ext/{dbm,digest/*,socket,zlib}/extconf.rb: used $defs and $INCFLAGS.

* {bcc32,win32,wince}/Makefile.sub (COMPILE_C, COMPILE_CXX): added
  $(INCFLAGS).


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@10193 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2006-05-25 23:44:08 +00:00
nobu
0de571b695 * ext/extmk.rb: deal with $static set in extconf.rb.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@10188 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2006-05-24 16:43:45 +00:00
nobu
44bdf111ca * ext/extmk.rb, lib/mkmf.rb: use BUILD_FILE_SEPARATOR in Makefiles.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@10163 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2006-05-17 15:42:21 +00:00
nobu
5a483d1943 * common.mk (static-ruby): overridable.
* ext/extmk.rb (parse_args): force to link extensions statically only
  if static is given for extstatic.

* ext/extmk.rb (RUBY, RUBYW): overridable.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@9550 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-11-16 14:25:53 +00:00
nobu
17f022491a * configure.in (RUBY_EXTERN): macro to export symbols in shared
library.  [ruby-core:05528]

* defines.h, {bcc32,win32,wince}/Makefile.sub (RUBY_EXTERN): moved to
  configuration pass.

* ext/extmk.rb (extmake): RUBY_EXTERN for static linked extensions.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@9466 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-10-25 17:00:03 +00:00
nobu
2e4c479a6b * ext/extmk.rb, lib/mkmf.rb (with_config): support --with-extension
options.  [ruby-dev:27449]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@9446 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-10-22 14:55:07 +00:00
nobu
8ea5c33bd6 * ext/extmk.rb: omit non-existing directories.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@9400 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-10-16 13:17:43 +00:00
nobu
aa735c9125 * extmk.rb (extmake): needs to be wrapped in an Array.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@8917 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-08-04 15:20:10 +00:00
nobu
d042ab1adc * ext/extmk.rb (extmake): should not modify $mflags for each
extentions.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@8903 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-08-03 23:04:16 +00:00
nobu
96afcf2b07 * ext/extmk.rb: keep srcdir unexpanded.
* lib/mkmf.rb (create_makefile): quote topdir and hdrdir if necessary.
  fixed: [ruby-core:04932]

* lib/mkmf.rb (configuration), {bcc32,win32,wince}/Makefile.sub: make
  also INSTALL_PROG and INSTALL_DATA system dependent.
  fixed: [ruby-core:04931]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@8451 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-05-13 14:44:59 +00:00
nobu
60892d7b20 * ext/extmk.rb: expand path for ext/**/extconf.rb.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@8351 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-04-18 15:06:33 +00:00
nobu
0972be78a5 * ext/extmk.rb (relative_from): treat mere drive letter as an absolute
path.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@8342 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-04-17 14:58:16 +00:00
nobu
351a5a5b8c * ext/extmk.rb (extmake, parse_args): do not expand destdir.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@8340 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-04-17 13:57:52 +00:00
nobu
a02c93b399 * 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/branches/ruby_1_8@8278 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-04-08 11:18:17 +00:00
nobu
0ec9d6c17b * ext/extmk.rb (extmake): top_srcdir is based from ext directory.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@8267 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-04-07 15:21:04 +00:00
nobu
d882436a8b * 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/branches/ruby_1_8@8266 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-04-07 14:59:24 +00:00
nobu
162b040611 * Makefile.in, */Makefile.sub, */configure.bat, cygwin/GNUmakefile.in,
common.mk, configure.in, ext/extmk.rb, lib/mkmf.rb, instruby.rb,
  runruby.rb: backport extout.  [ruby-dev:25963]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@8217 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-03-30 14:45:05 +00:00
nobu
88c4d7df3a * ext/extmk.rb (parse_args): add DESTDIR only when not directed
already.  fixed: [ruby-dev:25781]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@8053 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-03-02 10:53:20 +00:00
nobu
bf224978a1 * mkconfig.rb: no longer embed srcdir and compile_dir into
rbconfig.rb.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@7902 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-02-06 15:13:50 +00:00
usa
b95e5aefda * ext/extmk.rb (extmake): shoudn't set $extflags on mswin32.
* win32/Makefile.sub (LIBRUBY_SO): should use $DLDOBJS instead of
  $EXTOBJS.
  fixed: [ruby-core:04290] (backported from CVS HEAD)


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@7792 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-01-20 10:07:02 +00:00
eban
6433a1b9e4 * 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/branches/ruby_1_8@7169 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2004-11-01 08:21:06 +00:00
nobu
1f11d86110 * ext/extmk.rb: prefer relative path. [ruby-talk:93037]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@7125 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2004-10-28 14:19:40 +00:00
nobu
798287493e * ext/extmk.rb: already built-in libraries satisfy dependencies.
[ruby-dev:24028]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@6850 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2004-09-02 16:54:53 +00:00
nobu
7d193ca314 * 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/branches/ruby_1_8@6171 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2004-04-15 23:27:12 +00:00
nobu
6341bbe46c * 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/branches/ruby_1_8@5553 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2004-01-26 02:35:30 +00:00
nobu
6132ed31fb *** empty log message ***
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@5444 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2004-01-12 03:19:57 +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
knu
78f457a5d5 * instruby.rb, ext/extmk.rb, Makefile.in, win32/Makefile.sub,
bcc32/Makefile.sub: Replace the complicated MFLAGS/MAKEFLAGS
  parser with something plain and comprehensible.  This fixes a
  bug where make flags were wrongly reordered and the resulted
  command line often did not make sense especially when BSD make
  is used with extra arguments given.  Tested with FreeBSD and
  Linux by me and mswin32, bccwin32 and mingw by usa.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3408 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2003-01-25 18:59:34 +00:00
nobu
a01112eafe *** empty log message ***
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3296 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2003-01-05 20:11:20 +00:00
nobu
1fbea3bef7 * ext/extmk.rb (extmake): set $0 temporarily while loading
extconf.rb.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3293 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2003-01-05 08:50:21 +00:00
eban
15774ab1fb * instruby.rb: need paren in regexp(make -n install).
* ext/extmk.rb (sysquote): do not need to quote on mswin/bccwin/mingw.

* ext/extm.rb ($mflags): uniq items and remove '-' and '--'.
  move options to the lead.

* lib/fileutils.rb (install): model on the real install
  command(message).


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3292 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2003-01-05 07:04:10 +00:00
eban
5ec897d306 * wrong regexp.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3260 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2002-12-31 13:22:46 +00:00
eban
86c90aea36 * Makefile.in, {win32,bcc32}/Makefile.sub: add new target:
what-where, no-install.

* mkconfig.rb: add const: CROSS_COMPILING.

* ext/extmk.rb: no-install support.  add MAKEDIRS macro.

* lib/mkmf.rb: add !ifdef .. !endif for Borland make.

* process.c: improve DJGPP support.  system "ls", "-l".


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3259 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2002-12-31 12:31:12 +00:00