Changeset 3608

Timestamp:

Sep 9, 2024, 4:53:00 PM (2 months ago)

Author:

bird

Message:

footer-pass2-fetches.kmk,header.kmk: Added a NAME property to the fetch targets to facilitate cleanup (nsis mess); fixed cleanup (unfetch) issues when files or directories contains spaces.

Location:

trunk/kBuild

Files:

• footer-pass2-fetches.kmk (modified) (6 diffs)
• header.kmk (modified) (1 diff)

trunk/kBuild/footer-pass2-fetches.kmk

@@ -36 +36 @@
 #
 # The targets listed in the the FETCHES target list have the following attributes:
+#       NAME
 #       SOURCES
 #       INST
@@ -270 +271 @@
 # The unpacking / installing.
 #
-local out := $(inst)_kBuild_$(target)_$(srcname)_unpacked.lst
+local out := $(inst)_kBuild_$(name)_$(srcname)_unpacked.lst
 local dirdep := $(call DIRDEP,$(inst))
 local tool := $(firstword \
@@ -351 +352 @@
 $(out)_unfetched:
         %$$(call MSG_UNFETCH,$(target))
-        $$(QUIET)$$(RM) -f -- $$(addprefix $(inst),$$(shell $$(CAT_EXT) $(out).lst 2> /dev/null | $$(SED) -e '/\/$$$$/d'))
+        $$(QUIET)$$(RM) -f -- $$(qaddprefix sh,$(inst),$$(shell $$(CAT_EXT) $(out).lst 2> /dev/null | $$(SED) -e '/\/$$$$/d' -e 's/ /\\ /g'))
         $$(QUIET)$$(RMDIR) -p --ignore-fail-on-non-empty --ignore-fail-on-not-exist -- $$(dir $$@) \
-                $$(addprefix $(inst),$$(sort $$(dir $$(shell $$(CAT_EXT) $(out).lst 2> /dev/null))))
+                $$(qaddprefix sh,$(inst),$$(qsortfiles ,$$(qdir ,$$(shell $$(CAT_EXT) $(out).lst 2> /dev/null | $$(SED) -e '/\/$$$$/d' -e 's/ /\\ /g'))))
         $$(QUIET)$$(RM) -f -- $(out).lst $(out)
         $$(QUIET)$$(RMDIR) -p --ignore-fail-on-non-empty --ignore-fail-on-not-exist -- $$(dir $$@)
@@ -380 +381 @@
 define def_fetch
 # common
+local name := $(firstword $($(target)_NAME) $(target))
 ## @todo Install-revamp: FIXME
 INSTARGET_$(target) := $($(target)_INST)
@@ -392 +394 @@
 
 # The 'sources'.
-#$ (warning dbg fetch: target=$(target) sources=$($(target)_SOURCES) $($(target)_SOURCES.$(KBUILD_TYPE)) $($(target)_SOURCES.$(KBUILD_TARGET)) $($(target)_SOURCES.$(bld_trg_arch)) $($(target)_SOURCES.$(KBUILD_TARGET).$(bld_trg_arch)))
+#$ (warning dbg fetch: target=$(target) name=$(name) sources=$($(target)_SOURCES) $($(target)_SOURCES.$(KBUILD_TYPE)) $($(target)_SOURCES.$(KBUILD_TARGET)) $($(target)_SOURCES.$(bld_trg_arch)) $($(target)_SOURCES.$(KBUILD_TARGET).$(bld_trg_arch)))
 $(foreach source,$($(target)_SOURCES) $($(target)_SOURCES.$(KBUILD_TYPE)) $($(target)_SOURCES.$(bld_trg)) $($(target)_SOURCES.$(bld_trg_arch)) $($(target)_SOURCES.$(bld_trg).$(bld_trg_arch)),\
         $(evalval def_fetch_src))
@@ -398 +400 @@
 # The target.
 local inst := $(INSTARGET_$(target))
-local out := $(inst)_kBuild_fetch_$(target)
+local out := $(inst)_kBuild_fetch_$(name)
 
 $(eval includedep $(out))

trunk/kBuild/header.kmk

@@ -1246 +1246 @@
 ## @{
 PROPS_FETCHES_SINGLE         := TOOL TEMPLATE FETCHTOOL UNPACKTOOL PATCHTOOL INST FETCHDIR
-PROPS_FETCHES_DEFERRED       :=
+PROPS_FETCHES_DEFERRED       := NAME
 PROPS_FETCHES_ACCUMULATE_R   := FETCHFLAGS UNPACKFLAGS PATCHFLAGS
 PROPS_FETCHES_ACCUMULATE_L   := SOURCES CLEAN