diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-04-08 10:45:21 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-04-08 10:45:21 +0000 |
| commit | fa7a5d5477dd8015b9bc0be9dc7ef2bf583e46d8 (patch) | |
| tree | 4133ff567ecee458d18ef66b74c64b7e239b509e /lib | |
| parent | 4732bf25f5a965ebee61971184af3a64c0cf90d3 (diff) | |
* 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
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/mkmf.rb | 12 | ||||
| -rw-r--r-- | lib/test/unit/ui/console/testrunner.rb | 1 |
2 files changed, 8 insertions, 5 deletions
diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 8dbd064930..307c5b314f 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -884,7 +884,7 @@ LIBS = #{$LIBRUBYARG} #{$libs} #{$LIBS} OBJS = #{$objs} TARGET = #{target} DLLIB = #{dllib} -STATIC_LIB = #{staticlib} +STATIC_LIB = #{staticlib unless $static.nil?} } if $extout mfile.print %{ @@ -976,10 +976,12 @@ site-install-rb: install-rb mfile.print "@-$(RM) $@\n\t" mfile.print "@-$(MAKEDIRS) $(@D)\n\t" mfile.print LINK_SO, "\n\n" - mfile.print "$(STATIC_LIB): $(OBJS)\n\t" - mfile.print "$(AR) #{config_string('ARFLAGS') || 'cru '}$@ $(OBJS)" - if ranlib = config_string('RANLIB') - mfile.print "\n\t@-#{ranlib} $(DLLIB) 2> /dev/null || true" + unless $static.nil? + mfile.print "$(STATIC_LIB): $(OBJS)\n\t" + mfile.print "$(AR) #{config_string('ARFLAGS') || 'cru '}$@ $(OBJS)" + config_string('RANLIB') do |ranlib| + mfile.print "\n\t@-#{ranlib} $(DLLIB) 2> /dev/null || true" + end end mfile.print "\n\n" if makedef diff --git a/lib/test/unit/ui/console/testrunner.rb b/lib/test/unit/ui/console/testrunner.rb index f20ae9775b..5f38776403 100644 --- a/lib/test/unit/ui/console/testrunner.rb +++ b/lib/test/unit/ui/console/testrunner.rb @@ -90,6 +90,7 @@ module Test end def test_started(name) + $0 = $0.sub(/(?:\0.*)?\z/) {"\0"+name} output_single(name + ": ", VERBOSE) end |