Changeset 689 in kBuild

Timestamp:

Dec 8, 2006 8:12:03 AM (18 years ago)

Author:

bird

Message:

use a dep like target to avoid really really long filenames.

File:

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

trunk/kBuild/footer.kmk

@@ -635 +635 @@
 #
 #   We make use of the SIZE and MD5 attributes for each of the sources to 
-#   construct a primary goal. Should any sources change only sligtly this
-#   name will change and we'll have to remake it. Upon remaking we will
-#   perform an 'unfetch' to remove old unpacked files.
+#   create a digest that is stored in the primary target file. Subsequent
+#   runswill compare their digest with it to decide if a refetch is required.
+#   When a refetch is found necessary, an 'unfetch' is performed first to 
+#       clean out old files and directores. Note even changes in source order
+#   will cause a refetch due to the way the digest is constructed and 
+#   evaluated.
 #
 #   By not depending directly on the archives (nor on any unpacked files)
@@ -643 +646 @@
 #   the user to delete the archives. Naturally, this means we'll have to
 #   check and fetch missing archives before attempting to unpack them.
+#
+# @remark
+#
+#       This feature will *NOT* work correctly with vanilla GNU make becuase 
+#   it makes use of includedep to avoid too many unnecessary files.
 # 
-# TODOs:
+# @todo
 #       1. Port md5sum or some equivalent tool and include it in kBuild.
 #   2. Download corruption / continuation.
@@ -887 +895 @@
 define def_fetch_rules
 
-$(out): $(_TARGET_$(target)_UNPACKED) | $(call DIRDEP,$(inst))
+$(out).lst: $(_TARGET_$(target)_UNPACKED) | $(call DIRDEP,$(inst))
         @$$(ECHO) Successfully fetched $(target)
         $$(RM) -f $$@ [email protected]
-        @$$(APPEND) [email protected] "$(notdir $(out).$(_TARGET_$(target)_DIGEST))"
+        @$$(APPEND) [email protected] "$(notdir $(out))"
         $(if $(_TARGET_$(target)_UNPACKED),$$(CAT_EXT) $(_TARGET_$(target)_UNPACKED) >> [email protected])
         $$(MV) -f [email protected] $$@
@@ -896 +904 @@
 $(out)_unfetched:
         @$$(ECHO) Unfetching $(target)...
-        $$(RM) -f $$(addprefix $(inst),$$(shell $$(CAT_EXT) $(out) 2> /dev/null | $$(SED) -e '/\/$$$$/d'))
-        $$(RMDIR) -p --ignore-fail-on-non-empty --ignore-fail-on-not-exist $$(dir $(out)) \
-                $$(addprefix $(inst),$$(sort $$(dir $$(shell $$(CAT_EXT) $(out) 2> /dev/null))))
-        $$(RM) -f $(out)
-        $$(RMDIR) -p --ignore-fail-on-non-empty --ignore-fail-on-not-exist $$(dir $(out))
-
-$(out).$(_TARGET_$(target)_DIGEST): | $(call DIRDEP,$(inst))
-        @$$(RM) -f $(out).$(_TARGET_$(target)_DIGEST)
-        @$$(ECHO) $$(if $$(wildcard $(out)),Re-fetching,Fetching) $(target)...
-        $$(if $$(wildcard $(out)),$$(MAKE) -f $(MAKEFILE) $(out)_unfetched)
-        $$(MAKE) -f $(MAKEFILE) $(out)
-        $$(APPEND) $$@ ""
+        $$(RM) -f $$(addprefix $(inst),$$(shell $$(CAT_EXT) $(out).lst 2> /dev/null | $$(SED) -e '/\/$$$$/d'))
+        $$(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))))
+        $$(RM) -f $(out).lst $(out)
+                -/cygwin/bin/sleep 30
+        $$(RMDIR) -p --ignore-fail-on-non-empty --ignore-fail-on-not-exist $$(dir $$@)
+
+$(out): $(comp-vars _TARGET_$(target)_DIGEST_PREV,_TARGET_$(target)_DIGEST,FORCE) | $(call DIRDEP,$(inst))
+        @$$(RM) -f $$@ 
+        @$$(ECHO) $$(if $$(wildcard $(out).lst),Re-fetching,Fetching) $(target)...
+        $$(if $$(wildcard $(out).lst),$$(MAKE) -f $(MAKEFILE) $(out)_unfetched)
+        $$(MAKE) -f $(MAKEFILE) $(out).lst
+        @$$(APPEND) $$@ "_TARGET_$(target)_DIGEST_PREV := $(_TARGET_$(target)_DIGEST)"
         
-$(target):: $(out).$(_TARGET_$(target)_DIGEST)
-
-.NOTPARALLEL: $(out) $(out)_unfetched $(out).$(_TARGET_$(target)_DIGEST)
+$(target):: $(out)
+$(target)_unfetch:: $(out)_unfetched
+
+.NOTPARALLEL: $(out).lst $(out)_unfetched $(out)
 
 endef
@@ -942 +952 @@
 out := $(inst)_kBuild_fetch_$(target)
 
+$(eval includedep $(out))
 $(eval $(def_fetch_rules))
 
-_FETCHES += $(out).$(_TARGET_$(target)_DIGEST)
+_FETCHES += $(out)
 _DOWNLOADS += $(_TARGET_$(target)_FETCHED)
 _UNPACKS += $(_TARGET_$(target)_UNPACKED)