summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNobuyoshi Nakada <nobu@ruby-lang.org>2024-12-27 16:27:30 +0900
committerNobuyoshi Nakada <nobu@ruby-lang.org>2024-12-27 16:27:30 +0900
commitadbbc9109ee71848204b5168a7c1bf604849e5fa (patch)
tree2463423c37ead519a0580c2e6d94a18432983644
parente109400748a62f142d0b1ca6957dab69ca411de1 (diff)
Win32: Update clean commands for bundled gems
Notes
Notes: Merged: https://github.com/ruby/ruby/pull/12481
-rw-r--r--win32/Makefile.sub16
1 files changed, 14 insertions, 2 deletions
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index 0d2b80f676..0cd89c0bd9 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -1281,10 +1281,19 @@ distclean-local::
-$(Q)$(RMDIRS) $(arch_hdrdir:/=\)\ruby
-$(Q)$(RMDIR) win32
+.bundle/clean:: .bundle/clean.sub
+.bundle/distclean:: .bundle/distclean.sub
+.bundle/realclean:: .bundle/realclean.sub
+
+.bundle/clean.sub:: ext/clean.mk
+.bundle/distclean.sub:: ext/distclean.mk
+.bundle/realclean.sub:: ext/realclean.mk
+
ext/clean.mk ext/distclean.mk ext/realclean.mk::
$(Q)if exist $(EXTS_MK) $(MAKE) -k -f $(EXTS_MK) top_srcdir=$(srcdir) $(*F)
-ext/clean gems/clean ext/distclean gems/distclean ext/realclean gems/realclean::
+ext/clean.sub ext/distclean.sub ext/realclean.sub \
+.bundle/clean.sub .bundle/distclean.sub .bundle/realclean.sub::
$(Q)cd $(@D) 2>nul && (for /R $(EXTS) %I in (.) \
do $(Q)if exist %I\Makefile ( \
cd %I && ( \
@@ -1297,11 +1306,14 @@ ext/clean gems/clean ext/distclean gems/distclean ext/realclean gems/realclean::
$(RMDIRS) %I \
))) || @
-ext/distclean gems/distclean ext/realclean gems/realclean::
+ext/distclean ext/realclean .bundle/distclean .bundle/realclean::
$(Q)cd $(@D) 2>nul && (for /R $(EXTS) %I in (exts.mk*) \
do $(Q)(del %I & rmdir %~dpI)) || @
-$(Q)rmdir $(@D) 2> nul || @
+.bundle/realclean::
+ @$(RMALL) $(tooldir)/bunlder/*.lock $(srcdir)/.bundle
+
gc/clean gc/distclean gc/realclean::
- for /D %G in (gc\*) do (pushd %G && $(MAKE) TARGET_SO_DIR=./ $(@F) & popd) || $(NULLCMD)
gc/distclean gc/realclean::