Changeset 2094 in kBuild

Timestamp:

Nov 20, 2008 1:53:09 AM (16 years ago)

Author:

bird

Message:

footer.kmk: Fixed refetch problem on windows. The problem was that the directory cache had an open reference to the INST directory that were being refetched. The solution is to avoid using $(wildcard ) to check if files exist and use 'kmk_test -f file -- kmk_echo exists' instead.

File:

• trunk/kBuild/footer.kmk (modified) (2 diffs)

trunk/kBuild/footer.kmk

@@ -1686 +1686 @@
 $(out) + $($(target)_$(srcname)_UNPACK_OUTPUT_) +| $($(target)_$(srcname)_UNPACK_OUTPUT_MAYBE_) : \
                 $($(target)_$(srcname)_UNPACK_DEPEND_) \
-                | $($(target)_$(srcname)_UNPACK_DEPORD_) $(archive).checked_$(md5)_$(size)
+                | $($(target)_$(srcname)_UNPACK_DEPORD_) \
+                $(archive).checked_$(md5)_$(size) \
+                $(dir $(out))
         %$$(call MSG_FETCH_UP,$(target),$(archive),$(inst))
         $$(QUIET)$$(RM) -f -- $(out)
-        @# if the source archive doesn't exist fetch it (can have been deleted to save space).
+        $$(QUIET)$$(MKDIR) -p -- $(dir $(out))
+        @# if the source archive doesn't exist fetch it (may have been deleted to save space).
         $$(QUIET)test -f $(archive) \
                  || (   $$(RM_EXT) -f $(archive).checked_$(md5)_$(size) \
@@ -1914 +1917 @@
 $(out): $(comp-vars _TARGET_$(target)_DIGEST_PREV,_TARGET_$(target)_DIGEST,FORCE) | $(call DIRDEP,$(inst))
         $$(QUIET)$$(RM) -f -- $$@
-        %$$(if $$(_TARGET_$(target)_DIGEST),$$(if $$(wildcard $(out).lst)\
+        %$$(if $$(_TARGET_$(target)_DIGEST),$$(if $$(shell $$(TEST_EXT) -f $(out).lst -- $$(ECHO_EXT) file-exist)\
                 ,$$(call MSG_REFETCH,$(target)),$$(call MSG_FETCH,$(target))),$$(call MSG_UNFETCH,$(target)))
-        $$(QUIET)$$(if $$(wildcard $(out).lst      ),$$(MAKE) -f $(MAKEFILE) --no-print-directory $(out)_unfetched)
+        $$(QUIET)$(TEST_EXT) -f $(out).lst -- $$(MAKE) -f $(MAKEFILE) --no-print-directory $(out)_unfetched
         $$(QUIET)$$(if  $$(_TARGET_$(target)_DIGEST),$$(MAKE) -f $(MAKEFILE) --no-print-directory $(out).lst,$$(RMDIR) -p --ignore-fail-on-non-empty --ignore-fail-on-not-exist -- $$(dir $$@))
         $$(QUIET2)$$(if $$(_TARGET_$(target)_DIGEST),$$(APPEND) $$@ "_TARGET_$(target)_DIGEST_PREV := $(_TARGET_$(target)_DIGEST)")