ruby-changes:11825
From: nobu <ko1@a...>
Date: Sun, 17 May 2009 23:27:37 +0900 (JST)
Subject: [ruby-changes:11825] Ruby:r23480 (ruby_1_8): * Makefile.in (distclean-ext): removes extension directories.
nobu 2009-05-17 23:27:25 +0900 (Sun, 17 May 2009) New Revision: 23480 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=23480 Log: * Makefile.in (distclean-ext): removes extension directories. * lib/mkmf.rb (try_do): removes conftest.dSYM Modified files: branches/ruby_1_8/ChangeLog branches/ruby_1_8/Makefile.in branches/ruby_1_8/lib/mkmf.rb Index: ruby_1_8/Makefile.in =================================================================== --- ruby_1_8/Makefile.in (revision 23479) +++ ruby_1_8/Makefile.in (revision 23480) @@ -179,7 +179,8 @@ @find ext -name Makefile | sort | while read mk; do \ dir=`dirname "$$mk"`; \ echo $(@:-ext=)ing `expr "$$dir" : 'ext/\(.*\)'`; \ - (cd "$$dir"; $(MAKE) $(MFLAGS) $(@:-ext=)); \ + (cd "$$dir"; $(MAKE) $(MFLAGS) $(@:-ext=)) && \ + test $@ != clean-ext && rmdir -p "$$dir" 2> /dev/null; \ done ext/extinit.$(OBJEXT): ext/extinit.c $(SETUP) Index: ruby_1_8/ChangeLog =================================================================== --- ruby_1_8/ChangeLog (revision 23479) +++ ruby_1_8/ChangeLog (revision 23480) @@ -1,3 +1,9 @@ +Sun May 17 23:27:24 2009 Nobuyoshi Nakada <nobu@r...> + + * Makefile.in (distclean-ext): removes extension directories. + + * lib/mkmf.rb (try_do): removes conftest.dSYM + Sun May 17 23:23:14 2009 Nobuyoshi Nakada <nobu@r...> * lib/mkmf.rb (SRC_EXT): should be flat. Index: ruby_1_8/lib/mkmf.rb =================================================================== --- ruby_1_8/lib/mkmf.rb (revision 23479) +++ ruby_1_8/lib/mkmf.rb (revision 23480) @@ -168,6 +168,10 @@ FileUtils.rm_f(Dir[files.join("\0")]) end +def rm_rf(*files) + FileUtils.rm_rf(Dir[*files]) +end + # Returns time stamp of the +target+ file if it exists and is newer # than or equal to all of +times+. def modified?(target, times) @@ -324,6 +328,7 @@ xsystem(command) ensure log_src(src) + rm_rf 'conftest.dSYM' end def link_command(ldflags, opt="", libpath=$DEFLIBPATH|$LIBPATH) -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/