[前][次][番号順一覧][スレッド一覧]

ruby-changes:34622

From: nobu <ko1@a...>
Date: Sat, 5 Jul 2014 16:02:55 +0900 (JST)
Subject: [ruby-changes:34622] nobu:r46705 (trunk): common.mk: empty by distclean

nobu	2014-07-05 16:02:39 +0900 (Sat, 05 Jul 2014)

  New Revision: 46705

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=46705

  Log:
    common.mk: empty by distclean
    
    * common.mk (clean-runnable): remove files made by mkrunnable.
    
    * common.mk (clean-extout): remove archir too.
    
    * common.mk (clean-ext): remove timestamp directory

  Modified files:
    trunk/Makefile.in
    trunk/common.mk
    trunk/win32/Makefile.sub
Index: common.mk
===================================================================
--- common.mk	(revision 46704)
+++ common.mk	(revision 46705)
@@ -451,10 +451,15 @@ clear-installed-list: PHONY https://github.com/ruby/ruby/blob/trunk/common.mk#L451
 	@> $(INSTALLED_LIST) set MAKE="$(MAKE)"
 
 clean: clean-ext clean-local clean-enc clean-golf clean-rdoc clean-capi clean-extout clean-platform
-clean-local:: PHONY
+clean-local:: clean-runnable
 	$(Q)$(RM) $(OBJS) $(MINIOBJS) $(MAINOBJ) $(LIBRUBY_A) $(LIBRUBY_SO) $(LIBRUBY) $(LIBRUBY_ALIASES)
 	$(Q)$(RM) $(PROGRAM) $(WPROGRAM) miniruby$(EXEEXT) dmyext.$(OBJEXT) $(ARCHFILE) .*.time
 	$(Q)$(RM) y.tab.c y.output encdb.h transdb.h prelude.c config.log rbconfig.rb $(ruby_pc) probes.h probes.$(OBJEXT) probes.stamp ruby-glommed.$(OBJEXT)
+	$(Q)$(RM) GNUmakefile.old Makefile.old $(arch)-fake.rb
+clean-runnable:: PHONY
+	$(Q)$(CHDIR) bin && $(exec) $(RM) $(PROGRAM) $(WPROGRAM) $(GORUBY)$(EXEEXT) bin/*.$(DLEXT)
+	$(Q)$(CHDIR) lib && $(exec) $(RM) $(LIBRUBY_A) $(LIBRUBY) $(LIBRUBY_ALIASES) $(RUBY_BASE_NAME)/$(RUBY_PROGRAM_VERSION) $(RUBY_BASE_NAME)/vendor_ruby
+	$(Q)$(RMDIR) lib/$(RUBY_BASE_NAME) lib bin
 clean-ext:: PHONY
 clean-golf: PHONY
 	$(Q)$(RM) $(GORUBY)$(EXEEXT) $(GOLFOBJS)
@@ -462,6 +467,7 @@ clean-rdoc: PHONY https://github.com/ruby/ruby/blob/trunk/common.mk#L467
 clean-capi: PHONY
 clean-platform: PHONY
 clean-extout: PHONY
+	-$(Q)$(RMDIR) $(EXTOUT)/$(arch) $(EXTOUT) 2> $(NULL) || exit 0
 clean-docs: clean-rdoc clean-capi
 
 distclean: distclean-ext distclean-local distclean-enc distclean-golf distclean-extout distclean-platform
@@ -488,6 +494,7 @@ realclean-extout: distclean-extout https://github.com/ruby/ruby/blob/trunk/common.mk#L494
 clean-ext distclean-ext realclean-ext::
 	$(Q)$(RM) $(EXTS_MK)
 	$(Q)$(RM) $(EXTOUT)/.timestamp/.*.time
+	$(Q)$(RMDIR) $(EXTOUT)/.timestamp
 
 clean-enc distclean-enc realclean-enc: PHONY
 
Index: win32/Makefile.sub
===================================================================
--- win32/Makefile.sub	(revision 46704)
+++ win32/Makefile.sub	(revision 46705)
@@ -1029,9 +1029,6 @@ distclean-ext realclean-ext:: https://github.com/ruby/ruby/blob/trunk/win32/Makefile.sub#L1029
 		-$(Q)rmdir ext
 
 clean-extout:
-!if exist($(EXTOUT)/.)
-	-$(Q)$(RMDIRS) $(EXTOUT)
-!endif
 
 clean-enc distclean-enc realclean-enc:
 !if exist($(ENC_MK))
Index: Makefile.in
===================================================================
--- Makefile.in	(revision 46704)
+++ Makefile.in	(revision 46705)
@@ -419,7 +419,6 @@ distclean-ext realclean-ext:: https://github.com/ruby/ruby/blob/trunk/Makefile.in#L419
 	-$(Q)$(RMDIR) ext 2> /dev/null || true
 
 clean-extout:
-	-$(Q)$(RMDIRS) $(EXTOUT) 2> /dev/null || true
 
 clean-enc distclean-enc realclean-enc:
 	@test -f "$(ENC_MK)" || exit 0; \

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]