ruby-changes:45670
From: nobu <ko1@a...>
Date: Tue, 28 Feb 2017 17:22:06 +0900 (JST)
Subject: [ruby-changes:45670] nobu:r57743 (trunk): clean gems
nobu 2017-02-28 17:22:00 +0900 (Tue, 28 Feb 2017) New Revision: 57743 https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=57743 Log: clean gems * Makefile.in (clean-ext): clean gem directories too. Modified files: trunk/Makefile.in trunk/ext/extmk.rb Index: Makefile.in =================================================================== --- Makefile.in (revision 57742) +++ Makefile.in (revision 57743) @@ -418,21 +418,25 @@ distclean-local:: https://github.com/ruby/ruby/blob/trunk/Makefile.in#L418 clean-ext distclean-ext realclean-ext:: @[ -f $(EXTS_MK) ] && $(MAKE) -f $(EXTS_MK) $(@:-ext=) - @cd ext 2>/dev/null || exit 0; set dummy `echo "${EXTS}" | tr , ' '`; shift; \ + @set dummy `echo "${EXTS}" | tr , ' '`; shift; \ test "$$#" = 0 && set .; \ set dummy `\ + cd ext 2>/dev/null && \ find "$$@" \( -name Makefile -o -name exts.mk \) -print | \ - sed -n 's:/[^/]*$$::;s:^\./::p' | sort -u; \ + sed -n 's:^\./::;s:^:ext/:;s:/[^/][^/]*$$::p' | sort -u; \ + ` ` \ + cd gems 2>/dev/null && \ + find "$$@" -name exts.mk -print | \ + sed -n 's:^\./::;s:^:gems/:;s:/[^/][^/]*$$::p' | sort -u; \ `; shift; \ - cd ..; \ for dir do \ echo $(@:-ext=)ing "$$dir"; \ - $(RM) "ext/$$dir/exts.mk"; \ - { [ ! -f "ext/$$dir/Makefile" ] || \ - (cd "ext/$$dir" && exec $(MAKE) $(mflags) $(@:-ext=)); } && \ + $(RM) "$$dir/exts.mk"; \ + { [ ! -f "$$dir/Makefile" ] || \ + (cd "$$dir" && exec $(MAKE) $(mflags) $(@:-ext=)); } && \ case "$@" in \ *distclean-ext*|*realclean-ext*) \ - $(RMDIRS) "ext/$$dir" 2> /dev/null || true;; \ + $(RMDIRS) "$$dir" 2> /dev/null || true;; \ esac; \ done -$(Q)$(RM) ext/extinit.$(OBJEXT) Index: ext/extmk.rb =================================================================== --- ext/extmk.rb (revision 57742) +++ ext/extmk.rb (revision 57743) @@ -538,6 +538,8 @@ build_complete: $(build_complete) https://github.com/ruby/ruby/blob/trunk/ext/extmk.rb#L538 $(build_complete): $(TARGET_SO) $(Q) $(TOUCH) $@ +clean-so:: + -$(Q)$(RM) $(build_complete) } conf end -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/