nobu	2014-07-07 16:08:06 +0900 (Mon, 07 Jul 2014)

  New Revision: 46750

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

  Log:
    common.mk: integrate clean targets
    
    * common.mk (clean-rdoc, clean-capi, clean-platform): integrate
      from Makefile.in and win32/Makefile.sub.
    
    * win32/Makefile.sub (RMALL): now use rm.bat instead of rmall.bat
      which does not handle any options and convert slashes.
    
    * win32/rmall.bat: no longer used.  use rm.bat with -r instead.

  Removed files:
    trunk/win32/rmall.bat
  Modified files:
    trunk/Makefile.in
    trunk/common.mk
    trunk/win32/Makefile.sub
Index: common.mk
===================================================================
--- common.mk	(revision 46749)
+++ common.mk	(revision 46750)
@@ -498,6 +498,18 @@ clean-ext distclean-ext realclean-ext:: https://github.com/ruby/ruby/blob/trunk/common.mk#L498
 
 clean-enc distclean-enc realclean-enc: PHONY
 
+clean-rdoc distclean-rdoc realclean-rdoc:
+	@echo $(@:-rdoc=ing) rdoc
+	$(Q)$(RMALL) $(RDOCOUT)
+
+clean-capi distclean-capi realclean-capi:
+	@echo $(@:-capi=ing) capi
+	$(Q)$(RMALL) $(CAPIOUT)
+
+clean-platform:
+	$(Q) $(RM) $(PLATFORM_D)
+	-$(Q) $(RMDIR) $(PLATFORM_DIR) 2> /dev/null || exit 0
+
 check: main test test-all
 	$(ECHO) check succeeded
 check-ruby: test test-ruby
Index: win32/rmall.bat
===================================================================
--- win32/rmall.bat	(revision 46749)
+++ win32/rmall.bat	(revision 46750)
@@ -1,6 +0,0 @@ https://github.com/ruby/ruby/blob/trunk/win32/rmall.bat#L0
-@echo off
-
-if "%1" == "" goto :end
-if exist "%1" rmdir /s /q "%1"
-
-:end
Index: win32/Makefile.sub
===================================================================
--- win32/Makefile.sub	(revision 46749)
+++ win32/Makefile.sub	(revision 46750)
@@ -75,7 +75,7 @@ IFCHANGE = $(COMSPEC) /C $(srcdir:/=\)\w https://github.com/ruby/ruby/blob/trunk/win32/Makefile.sub#L75
 RM = $(COMSPEC) /C $(srcdir:/=\)\win32\rm.bat
 RMDIR = $(COMSPEC) /C $(srcdir:/=\)\win32\rmdirs.bat
 RMDIRS = $(COMSPEC) /C $(srcdir:/=\)\win32\rmdirs.bat
-RMALL = $(COMSPEC) /C $(srcdir:/=\)\win32\rmall.bat
+RMALL = $(COMSPEC) /C $(srcdir:/=\)\win32\rm.bat -r
 MAKEDIRS = $(COMSPEC) /E:ON /C $(srcdir:/=\)\win32\makedirs.bat
 CP = copy > nul
 MV = move > nul
@@ -817,7 +817,7 @@ s,@SET_MAKE@,MFLAGS = -$$(MAKEFLAGS),;t https://github.com/ruby/ruby/blob/trunk/win32/Makefile.sub#L817
 s,@RM@,$$(COMSPEC) /C $$(top_srcdir:/=\)\win32\rm.bat,;t t
 s,@RMDIR@,$$(COMSPEC) /C $$(top_srcdir:/=\)\win32\rmdirs.bat,:t t
 s,@RMDIRS@,$$(COMSPEC) /C $$(top_srcdir:/=\)\win32\rmdirs.bat,;t t
-s,@RMALL@,$$(COMSPEC) /C rmdir /s /q,;t t
+s,@RMALL@,$$(COMSPEC) /C $$(top_srcdir:/=\)\win32\rm.bat -f -r,:t t
 s,@MAKEDIRS@,$$(COMSPEC) /E:ON /C $$(top_srcdir:/=\)\win32\makedirs.bat,;t t
 s,@LIBOBJS@,$(LIBOBJS),;t t
 s,@ALLOCA@,$(ALLOCA),;t t
@@ -1002,15 +1002,6 @@ distclean-local:: https://github.com/ruby/ruby/blob/trunk/win32/Makefile.sub#L1002
 		-$(Q)$(RM) $(INSTALLED_LIST:/=\) $(arch_hdrdir:/=\)\ruby\config.h verconf.h
 		-$(Q)$(RMDIRS) $(arch_hdrdir:/=\)\ruby
 
-clean-rdoc distclean-rdoc realclean-rdoc:
-		-$(Q)$(RMALL) $(RDOCOUT:/=\)
-clean-capi distclean-capi realclean-capi:
-		-$(Q)$(RMALL) $(CAPIOUT:/=\)
-
-clean-platform:
-		$(Q)$(RM) $(PLATFORM_D:/=\)
-		-$(Q)$(RMDIR) $(PLATFORM_DIR:/=\)
-
 clean-ext distclean-ext realclean-ext::
 !if "$(EXTS)" != ""
 		@for %I in ($(EXTS)) \
Index: Makefile.in
===================================================================
--- Makefile.in	(revision 46749)
+++ Makefile.in	(revision 46750)
@@ -425,17 +425,6 @@ clean-enc distclean-enc realclean-enc: https://github.com/ruby/ruby/blob/trunk/Makefile.in#L425
 	echo $(@:-enc=ing) encodings; \
 	exec $(MAKE) -f $(ENC_MK) $(MFLAGS) $(@:-enc=)
 
-clean-rdoc distclean-rdoc realclean-rdoc:
-	@echo $(@:-rdoc=ing) rdoc
-	$(Q)$(RMALL) $(RDOCOUT)
-clean-capi distclean-capi realclean-capi:
-	@echo $(@:-capi=ing) capi
-	$(Q)$(RMALL) $(CAPIOUT)
-
-clean-platform:
-	@$(RM) $(PLATFORM_D)
-	-$(Q) $(RMDIR) $(PLATFORM_DIR) 2> /dev/null || true
-
 ext/extinit.$(OBJEXT): ext/extinit.c $(SETUP)
 	$(ECHO) compiling $@
 	$(Q) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c ext/extinit.c

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