Changeset 2234 in kBuild
- Timestamp:
- Jan 9, 2009 2:49:56 AM (16 years ago)
- File:
-
- 1 edited
-
trunk/kBuild/footer.kmk (modified) (13 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/kBuild/footer.kmk
r2227 r2234 1645 1645 # Indirect goal for downloading something. 1646 1646 .PRECIOUS: $(out) 1647 $(out) + $($(target)_$(srcname)_FETCH_ OUTPUT_) +| $($(target)_$(srcname)_FETCH_OUTPUT_MAYBE_) : \1648 | $($(target)_$(srcname)_FETCH_ DEPORD_)1647 $(out) + $($(target)_$(srcname)_FETCH_2_OUTPUT) +| $($(target)_$(srcname)_FETCH_2_OUTPUT_MAYBE) : \ 1648 | $($(target)_$(srcname)_FETCH_2_DEPORD) 1649 1649 %$$(call MSG_FETCH_DL,$(target),$(source),$(out)) 1650 1650 @## @todo do fancy stuff like download continuation. 1651 1651 $$(QUIET)$$(RM) -f -- $(out) 1652 $( $(target)_$(srcname)_FETCH_CMDS_)1652 $(cmds) 1653 1653 $$(QUIET)$(if $(md5),$$(MD5SUM_EXT) -b -C $(md5) $(out)) 1654 1654 … … 1656 1656 1657 1657 # Intermediate goal for making sure the md5 and size matches. it will (re) fetch the archive if necessary. 1658 $(out).checked_$(md5)_$(size): $($(target)_$(srcname)_FETCH_ DEPEND_) | $($(target)_$(srcname)_FETCH_DEPORD_)1658 $(out).checked_$(md5)_$(size): $($(target)_$(srcname)_FETCH_2_DEPEND) | $($(target)_$(srcname)_FETCH_2_DEPORD) 1659 1659 %$$(call MSG_FETCH_CHK,$(target),$(source),$(out)) 1660 1660 $$(QUIET)$$(RM) -f -- $$@ … … 1677 1677 define def_fetch_src_unpack_rule 1678 1678 # This is the unpack rule. it has an order-only dependency on the download check. 1679 $(out) + $($(target)_$(srcname)_UNPACK_ OUTPUT_) +| $($(target)_$(srcname)_UNPACK_OUTPUT_MAYBE_) : \1680 $($(target)_$(srcname)_UNPACK_ DEPEND_) \1681 | $($(target)_$(srcname)_UNPACK_ DEPORD_) \1679 $(out) + $($(target)_$(srcname)_UNPACK_2_OUTPUT) +| $($(target)_$(srcname)_UNPACK_2_OUTPUT_MAYBE) : \ 1680 $($(target)_$(srcname)_UNPACK_2_DEPEND) \ 1681 | $($(target)_$(srcname)_UNPACK_2_DEPORD) \ 1682 1682 $(archive).checked_$(md5)_$(size) \ 1683 1683 $(dir $(out)) … … 1689 1689 || ( $$(RM_EXT) -f $(archive).checked_$(md5)_$(size) \ 1690 1690 && $$(MAKE) $(archive).checked_$(md5)_$(size) -f $(MAKEFILE) --no-print-directory ) 1691 $( $(target)_$(srcname)_UNPACK_CMDS_)1691 $(cmds) 1692 1692 $$(QUIET2)$$(APPEND) $(out) $(notdir $(archive).checked_$(md5)_$(size)) 1693 1693 $$(QUIET2)$$(APPEND) $(out) $(notdir $(out)) … … 1808 1808 1809 1809 # call the tool 1810 $(target)_$(srcname)_FETCH_CMDS_:= $(TOOL_$(tool)_FETCH_CMDS)1811 $(target)_$(srcname)_FETCH_ OUTPUT_:= $(TOOL_$(tool)_FETCH_OUTPUT)1812 $(target)_$(srcname)_FETCH_ OUTPUT_MAYBE_:= $(TOOL_$(tool)_FETCH_OUTPUT_MAYBE)1813 $(target)_$(srcname)_FETCH_ DEPEND_:= $(TOOL_$(tool)_FETCH_DEPEND) $(deps)1814 $(target)_$(srcname)_FETCH_ DEPORD_:= $(TOOL_$(tool)_FETCH_DEPORD) $(dirdep) $(orderdeps)1810 local cmds := $(TOOL_$(tool)_FETCH_CMDS) 1811 $(target)_$(srcname)_FETCH_2_OUTPUT := $(TOOL_$(tool)_FETCH_OUTPUT) 1812 $(target)_$(srcname)_FETCH_2_OUTPUT_MAYBE := $(TOOL_$(tool)_FETCH_OUTPUT_MAYBE) 1813 $(target)_$(srcname)_FETCH_2_DEPEND := $(TOOL_$(tool)_FETCH_DEPEND) $(deps) 1814 $(target)_$(srcname)_FETCH_2_DEPORD := $(TOOL_$(tool)_FETCH_DEPORD) $(dirdep) $(orderdeps) 1815 1815 1816 1816 # generate the fetch rule. … … 1867 1867 1868 1868 # call the tool 1869 $(target)_$(srcname)_UNPACK_CMDS_:= $(TOOL_$(tool)_UNPACK_CMDS)1870 $(target)_$(srcname)_UNPACK_ OUTPUT_:= $(TOOL_$(tool)_UNPACK_OUTPUT)1871 $(target)_$(srcname)_UNPACK_ OUTPUT_MAYBE_:= $(TOOL_$(tool)_UNPACK_OUTPUT_MAYBE)1872 $(target)_$(srcname)_UNPACK_ DEPEND_:= $(TOOL_$(tool)_UNPACK_DEPEND) $(deps)1873 $(target)_$(srcname)_UNPACK_ DEPORD_:= $(TOOL_$(tool)_UNPACK_DEPORD) $(dirdep) $(orderdeps)1869 local cmds := $(TOOL_$(tool)_UNPACK_CMDS) 1870 $(target)_$(srcname)_UNPACK_2_OUTPUT := $(TOOL_$(tool)_UNPACK_OUTPUT) 1871 $(target)_$(srcname)_UNPACK_2_OUTPUT_MAYBE := $(TOOL_$(tool)_UNPACK_OUTPUT_MAYBE) 1872 $(target)_$(srcname)_UNPACK_2_DEPEND := $(TOOL_$(tool)_UNPACK_DEPEND) $(deps) 1873 $(target)_$(srcname)_UNPACK_2_DEPORD := $(TOOL_$(tool)_UNPACK_DEPORD) $(dirdep) $(orderdeps) 1874 1874 1875 1875 # generate the fetch rule. … … 2064 2064 $(basename $(notdir $(obj))).obj: $(obj) 2065 2065 2066 ## @todo make this 'local cmds ' in 0.2.x or when a new kb-src-one is added.2066 ## @todo make this 'local cmds,output,output_maybe,depend and depord' in 0.2.x or when a new kb-src-one is added. 2067 2067 $(target)_$(source)_CMDS_ := 2068 $(target)_$(source)_OUTPUT_ := 2069 $(target)_$(source)_OUTPUT_MAYBE_ := 2070 $(target)_$(source)_DEPEND_ := 2071 $(target)_$(source)_DEPORD_ := 2068 2072 endef # def_target_source_rule 2069 2073 $(eval-opt-var def_target_source_rule) … … 2086 2090 # @param $(dep) The name of the dependency file. 2087 2091 # @param $(out) 2088 # @param $($(target)_ OUTPUT_)Output files from the link.2089 # @param $($(target)_ OUTPUT_MAYBE_) Output files that the link may perhaps create.2090 # @param $($(target)_ DEPEND_)Dependencies.2091 # @param $($(target)_ DEPORD_)Dependencies which should only affect build order.2092 # @param $($(target)_2_OUTPUT) Output files from the link. 2093 # @param $($(target)_2_OUTPUT_MAYBE) Output files that the link may perhaps create. 2094 # @param $($(target)_2_DEPEND) Dependencies. 2095 # @param $($(target)_2_DEPORD) Dependencies which should only affect build order. 2092 2096 # @param $(cmds) The link commands. 2093 2097 # @param $($(target)_CMDS_PREV_) The link commands from the previous run. … … 2096 2100 $(out): .MUST_MAKE = $$(comp-cmds-ex $$($(target)_CMDS_PREV_),$$(commands $$@),FORCE) 2097 2101 endif 2098 $(out) + $($(target)_ OUTPUT_) +| $($(target)_OUTPUT_MAYBE_) : \2099 $$$$($(target)_ DEPEND_) \2102 $(out) + $($(target)_2_OUTPUT) +| $($(target)_2_OUTPUT_MAYBE) : \ 2103 $$$$($(target)_2_DEPEND) \ 2100 2104 $(value _DEP_LINK_CMDS) \ 2101 2105 | \ 2102 $$$$($(target)_ DEPORD_)2106 $$$$($(target)_2_DEPORD) 2103 2107 %$$(call MSG_LINK,$(target),$$@,$(tool_do)) 2104 $$(QUIET)$$(RM) -f -- $(dep) $(out) $($(target)_ OUTPUT_) $($(target)_OUTPUT_MAYBE_)2108 $$(QUIET)$$(RM) -f -- $(dep) $(out) $($(target)_2_OUTPUT) $($(target)_2_OUTPUT_MAYBE) 2105 2109 2106 2110 $(cmds) … … 2290 2294 endif 2291 2295 2292 _OUT_FILES += $($(target)_ OUTPUT_) $($(target)_OUTPUT_MAYBE_) $(out)2296 _OUT_FILES += $($(target)_2_OUTPUT) $($(target)_2_OUTPUT_MAYBE) $(out) 2293 2297 _CLEAN_FILES += $($(target)_CLEAN) $($(target)_CLEAN.$(bld_trg)) $($(target)_CLEAN.$(bld_trg).$(bld_trg_arch)) $($(target)_CLEAN.$(bld_trg_arch)) $($(target)_CLEAN.$(bld_trg_cpu)) $($(target)_CLEAN.$(bld_type)) 2294 2298 _DIRS += $($(target)_BLDDIRS) $($(target)_BLDDIRS.$(bld_trg)) $($(target)_BLDDIRS.$(bld_trg).$(bld_trg_arch)) $($(target)_BLDDIRS.$(bld_trg_arch)) $($(target)_BLDDIRS.$(bld_trg_cpu)) $($(target)_BLDDIRS.$(bld_type)) … … 2525 2529 local cmds := $(cmds)$(NL)$(TAB)$(post_cmds) 2526 2530 endif 2527 $(target)_ OUTPUT_:= $(TOOL_$(tool)_LINK_LIBRARY_OUTPUT)2528 $(target)_ OUTPUT_MAYBE_:= $(TOOL_$(tool)_LINK_LIBRARY_OUTPUT_MAYBE)2529 $(target)_ DEPEND_:= $(TOOL_$(tool)_LINK_LIBRARY_DEPEND) $(deps) $($(target)_OBJS_)2530 $(target)_ DEPORD_:= $(TOOL_$(tool)_LINK_LIBRARY_DEPORD) $(dirdep) $(orderdeps)2531 $(target)_2_OUTPUT := $(TOOL_$(tool)_LINK_LIBRARY_OUTPUT) 2532 $(target)_2_OUTPUT_MAYBE := $(TOOL_$(tool)_LINK_LIBRARY_OUTPUT_MAYBE) 2533 $(target)_2_DEPEND := $(TOOL_$(tool)_LINK_LIBRARY_DEPEND) $(deps) $($(target)_OBJS_) 2534 $(target)_2_DEPORD := $(TOOL_$(tool)_LINK_LIBRARY_DEPORD) $(dirdep) $(orderdeps) 2531 2535 2532 2536 # generate the link rule. … … 2948 2952 local cmds := $(cmds)$(NL)$(TAB)$(post_cmds) 2949 2953 endif 2950 $(target)_ OUTPUT_:= $(TOOL_$(tool)_$(tool_do)_OUTPUT)2951 $(target)_ OUTPUT_MAYBE_:= $(TOOL_$(tool)_$(tool_do)_OUTPUT_MAYBE)2952 $(target)_ DEPEND_:= $(TOOL_$(tool)_$(tool_do)_DEPEND) $(deps) $($(target)_OBJS_)2953 $(target)_ DEPORD_:= $(TOOL_$(tool)_$(tool_do)_DEPORD) $(dirdep) $(orderdeps)2954 $(target)_2_OUTPUT := $(TOOL_$(tool)_$(tool_do)_OUTPUT) 2955 $(target)_2_OUTPUT_MAYBE := $(TOOL_$(tool)_$(tool_do)_OUTPUT_MAYBE) 2956 $(target)_2_DEPEND := $(TOOL_$(tool)_$(tool_do)_DEPEND) $(deps) $($(target)_OBJS_) 2957 $(target)_2_DEPORD := $(TOOL_$(tool)_$(tool_do)_DEPORD) $(dirdep) $(orderdeps) 2954 2958 2955 2959 # generate the link rule. … … 2959 2963 # Update globals. 2960 2964 _OBJS += $($(target)_OBJS_) 2961 _OUT_FILES += $($(target)_ OUTPUT_) $($(target)_OUTPUT_MAYBE_) $(out)2965 _OUT_FILES += $($(target)_2_OUTPUT) $($(target)_2_OUTPUT_MAYBE) $(out) 2962 2966 _CLEAN_FILES += $($(target)_CLEAN) $($(target)_CLEAN.$(bld_trg)) $($(target)_CLEAN.$(bld_trg).$(bld_trg_arch)) $($(target)_CLEAN.$(bld_trg_arch)) $($(target)_CLEAN.$(bld_trg_cpu)) $($(target)_CLEAN.$(bld_type)) 2963 2967 _DIRS += $($(target)_BLDDIRS) $($(target)_BLDDIRS.$(bld_trg)) $($(target)_BLDDIRS.$(bld_trg).$(bld_trg_arch)) $($(target)_BLDDIRS.$(bld_trg_arch)) $($(target)_BLDDIRS.$(bld_trg_cpu)) $($(target)_BLDDIRS.$(bld_type))
Note:
See TracChangeset
for help on using the changeset viewer.
