Changeset 1255 for trunk/kBuild

Timestamp:

Oct 25, 2007, 3:58:30 AM (18 years ago)

Author:

bird

Message:

Use the kBuild md5sum.

File:

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

trunk/kBuild/footer.kmk

@@ -985 +985 @@
 #
 # @todo
-#       1. Port md5sum or some equivalent tool and include it in kBuild.
-#   2. Download corruption / continuation.
-#   3. It's quite possible that there is one too many indirect dependency now...
-#
-
-## @todo move this!
-MD5SUM := md5sum
+#   1. Download corruption / continuation.
+#   2. It's quite possible that there is one too many indirect dependency now...
+#
 
 ## generates the fetch rule
@@ -1001 +997 @@
         $$(call MSG_FETCH_DL,$(target),$(source),$(out))
         @## @todo do fancy stuff like download continuation.
-        $$(QUIET)$$(RM) -f $(out) $(out).md5
+        $$(QUIET)$$(RM) -f $(out)
         $($(target)_$(srcname)_FETCH_CMDS_)
-        $$(QUIET2)$(if $(md5),$$(APPEND) $(out).md5 "$(md5) *$(out)")
-        $$(QUIET)$(if $(md5),$$(MD5SUM) -c $(out).md5)
+        $$(QUIET)$(if $(md5),$$(MD5SUM_EXT) -b -C $(md5) $(out))
 
 
@@ -1011 +1006 @@
 $(out).checked_$(md5)_$(size): $($(target)_$(srcname)_FETCH_DEPEND_) | $($(target)_$(srcname)_FETCH_DEPORD_)
         $$(call MSG_FETCH_CHK,$(target),$(source),$(out))
-        $$(QUIET)$$(RM) -f $$@ $(out).md5
-        @# creates the .md5 we pass to md5sum.
-        $$(QUIET2)$(if $(md5),$$(APPEND) $(out).md5 "$(md5) *$(out)")
+        $$(QUIET)$$(RM) -f $$@
         @# (re)fetch the file if it doesn't exist or if it doesn't matches the md5.
         @## @todo do fancy stuff like download continuation.
-        $$(QUIET)( test -f $(out) && $(if $(md5),$$(MD5SUM) -c $(out).md5, true) ) \
+        $$(QUIET)( test -f $(out) && $(if $(md5),$$(MD5SUM_EXT) -b -C $(md5) $(out), true) ) \
                   || (   $$(RM_EXT) -f $(out) \
                       && $$(MAKE)      $(out) -f $(MAKEFILE) --no-print-directory )