summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-07-07 07:08:06 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-07-07 07:08:06 +0000
commitb1f4bf8aa272ffb291ece376b19fc205b1ec06f2 (patch)
treec881c1d86437542f93adfb236a8bb2ef8329cff4
parent8572ed5c0d98a8edaee7e0e433d632c3ca3f5821 (diff)
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. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46750 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--Makefile.in11
-rw-r--r--common.mk12
-rw-r--r--win32/Makefile.sub13
-rwxr-xr-xwin32/rmall.bat6
4 files changed, 14 insertions, 28 deletions
diff --git a/Makefile.in b/Makefile.in
index fe5b7c1..8aff0b1 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -425,17 +425,6 @@ clean-enc distclean-enc realclean-enc:
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
diff --git a/common.mk b/common.mk
index de694c4..52c2a9f 100644
--- a/common.mk
+++ b/common.mk
@@ -498,6 +498,18 @@ clean-ext distclean-ext realclean-ext::
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
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index 0911fd0..37ae828 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -75,7 +75,7 @@ IFCHANGE = $(COMSPEC) /C $(srcdir:/=\)\win32\ifchange.bat
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 t
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::
-$(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)) \
diff --git a/win32/rmall.bat b/win32/rmall.bat
deleted file mode 100755
index f49a168..0000000
--- a/win32/rmall.bat
+++ /dev/null
@@ -1,6 +0,0 @@
-@echo off
-
-if "%1" == "" goto :end
-if exist "%1" rmdir /s /q "%1"
-
-:end