Changeset 776 for trunk/kBuild/footer.kmk

Timestamp:

Jan 20, 2007, 7:36:40 PM (19 years ago)

Author:

bird

Message:

Macros for all messages. KBUILD_MSG_STYLE. KBUILD_VERBOSE={1,2,*}. PRINTF

File:

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

trunk/kBuild/footer.kmk

@@ -624 +624 @@
 .PRECIOUS: $(out)
 $(out) $($(target)_$(srcname)_FETCH_OUTPUT_): | $($(target)_$(srcname)_FETCH_DEPORD_)
-        $$(call MSG_L1,Downloading $(source)...)
+        $$(call MSG_FETCH_DL,$(target),$(source),$(out))
         @## @todo do fancy stuff like download continuation.
         $$(QUIET)$$(RM) -f $(out) $(out).md5
@@ -635 +635 @@
 # Intermediate goal for making sure the md5 and size matches. it will (re) fetch the archive if necessary.
 $(out).checked_$(md5)_$(size): $($(target)_$(srcname)_FETCH_DEPEND_) | $($(target)_$(srcname)_FETCH_DEPORD_)
-        $$(call MSG_L1,Checking $(out),($(source))...)
+        $$(call MSG_FETCH_CHK,$(target),$(source),$(out))
         $$(QUIET)$$(RM) -f $$@ $(out).md5
         @# creates the .md5 we pass to md5sum.
@@ -658 +658 @@
 $(out) $($(target)_$(srcname)_UNPACK_OUTPUT_): $($(target)_$(srcname)_UNPACK_DEPEND_) \
                 | $($(target)_$(srcname)_UNPACK_DEPORD_) $(archive).checked_$(md5)_$(size)
-        $$(call MSG_L1,Unpacking $(archive),into $(inst)...)
+        $$(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).
@@ -854 +854 @@
 
 $(out).lst: $(_TARGET_$(target)_UNPACKED) | $(call DIRDEP,$(inst))
-        $$(call MSG_L1,Successfully fetched $(target))
+        $$(call MSG_FETCH_OK,$(target))
         $$(QUIET)$$(RM) -f $$@ $$@.tmp
         $$(QUIET2)$$(APPEND) $$@.tmp "$(notdir $(out))"
@@ -861 +861 @@
 
 $(out)_unfetched:
-        $$(call MSG_L1,Unfetching $(target)...)
+        $$(call MSG_UNFETCH,$(target))
         $$(QUIET)$$(RM) -f $$(addprefix $(inst),$$(shell $$(CAT_EXT) $(out).lst 2> /dev/null | $$(SED) -e '/\/$$$$/d'))
         $$(QUIET)$$(RMDIR) -p --ignore-fail-on-non-empty --ignore-fail-on-not-exist $$(dir $$@) \
@@ -870 +870 @@
 $(out): $(comp-vars _TARGET_$(target)_DIGEST_PREV,_TARGET_$(target)_DIGEST,FORCE) | $(call DIRDEP,$(inst))
         $$(QUIET)$$(RM) -f $$@
-        $$(call MSG_L1,$$(if $$(_TARGET_$(target)_DIGEST),$$(if $$(wildcard $(out).lst),Re-fetching,Fetching),Removing) $(target)...)
+        $$(if $$(_TARGET_$(target)_DIGEST),$$(if $$(wildcard $(out).lst)\
+                ,$$(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)$$(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 $$@))
@@ -978 +979 @@
                 | \
                 $($(target)_$(source)_DEPORD_)
-        $$(call MSG_L1,Compiling $(target) - $(source),=> $$@)
+        $$(call MSG_COMPILE,$(target),$(source),$$@,$(type))
         $$(QUIET)$$(RM) -f $(dep) $(obj) $($(target)_$(source)_OUTPUT_)
         $(custom_pre)
@@ -1024 +1025 @@
                 | \
                 $($(target)_DEPORD_)
-        $$(call MSG_L1,Linking $$@)
+        $$(call MSG_LINK,$(target),$$@,$(tool_do))
         $$(QUIET)$$(RM) -f $(dep) $(out) $($(target)_OUTPUT_)
         $(custom_pre)
@@ -1053 +1054 @@
 define def_link_install_rule
 $(INSTARGET_$(target)) : $(out) | $(call DIRDEP,$(dir $(INSTARGET_$(target))))
-        $$(call MSG_L1,Installing $(target) => $$@)
+        $$(call MSG_INST_TRG,$(target),$(out),$$@)
         $$(QUIET)$$(INSTALL) $$(if $(mode),-m $(mode)) $(out) $$@
 
@@ -1263 +1264 @@
 
 # Process libraries
+tool_do := LINK_LIBRARY
 mode := 0644
 $(foreach target, $(LIBRARIES) $(LIBRARIES.$(BUILD_TARGET)) $(LIBRARIES.$(BUILD_TARGET).$(BUILD_TARGET_ARCH)), $(eval $(value def_lib)))
@@ -1630 +1632 @@
 # the install rule
 $(insdst) : $(srcsrc) | $(call DIRDEP,$(dir $(insdst)))
-        $$(call MSG_L1,Installing $(insdst),(<= $(srcsrc)))
+        $$(call MSG_INST_FILE,$(srcsrc),$(insdst))
         $$(QUIET)$$(if $$(filter $(INSTALL),$(inscmd)),,$$(RM) -f $$@)
         $$(QUIET)$(inscmd)
@@ -1752 +1754 @@
 # the install rule
 $(insdst) : | $(call DIRDEP,$(dir $(insdst)))
-        $$(call MSG_L1,Installing symlink $(insdst),pointing to $(symdst))
+        $$(call MSG_INST_SYM,$(insdst),$(symdst))
         $$(QUIET)$$(RM) -f $$@
         $$(QUIET)$$(LN_SYMLINK) $(symdst) $(insdst)
@@ -1802 +1804 @@
 # the install rule
 $(insdst):
-        $$(call MSG_L1,Installing directory $(insdst))
+        $$(call MSG_INST_DIR,$(insdst))
         $$(QUIET)$$(INSTALL) -d \
                 $(if $(uid),-o $(uid))\
@@ -1917 +1919 @@
 define def_mkdir_rule
 $(directory):
-        $$(call MSG_L2,Creating directory $$@)
+        $$(call MSG_MKDIR,$$@)
         $$(QUIET)$$(MKDIR) -p $$@
 endef
@@ -1928 +1930 @@
 #
 do-nothing:
-        $(call MSG_L1,Did nothing in $(CURDIR))
+        $(call MSG_NOTHING)
 
 
@@ -1935 +1937 @@
 #
 do-clean:
-        $(call MSG_L1,Cleaning...)
+        $(call MSG_CLEAN)
         $(QUIET)$(RM) -f $(_OUT_FILES) $(_OBJS) $(_DEPFILES) $(_DEPFILES_INCLUDED) $(_CLEAN_FILES) $(OTHER_CLEAN)
 
@@ -2043 +2045 @@
 .PHONY: pass_$(pass)_order
 pass_$(pass)_order: $(pass_prev)
-        $$(call MSG_L1,Pass - $$(if $$(PASS_$(PASS)),$$(PASS_$(PASS)),$(pass)))
+        $$(call MSG_PASS,$$(if $$(PASS_$(PASS)),$$(PASS_$(PASS)),$(pass)))
         + $$(QUIET)$$(MAKE) -f $$(MAKEFILE) pass_$(pass)
 else
@@ -2049 +2051 @@
 .PHONY:       pass_$(pass)_order pass_$(pass)_banner
 pass_$(pass)_banner:
-        $$(call MSG_L1,Pass - $$(if $$(PASS_$(PASS)),$$(PASS_$(PASS)),$(pass)))
+        $$(call MSG_PASS,$$(if $$(PASS_$(PASS)),$$(PASS_$(PASS)),$(pass)))
 pass_$(pass)_order: \
                 $(pass_prev) \