Changeset 725 for trunk/kBuild/footer.kmk

Timestamp:

Dec 15, 2006, 6:18:47 AM (19 years ago)

Author:

bird

Message:

Partial implementation of a _PATH target property for resolving relative paths. It's primarily intended for sub-makefile mode where we apply it to all targets automatically. TODOs: INCS, DEPs (source level) and SUBDIRS*.

File:

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

trunk/kBuild/footer.kmk

@@ -185 +185 @@
 no-root-slash=$(patsubst /%,%,$(1))
 
+ifneq ($(filter abspathex,$(KMK_FEATURES)),abspathex) ## @todo Retire this to gnumake-header.kmk when it has been implemented.
+## Converts an relative path to an absolute path using the given CWD.
+# @returns absolute path.
+# @param    $1      The path to fixup.
+# @param    $2      The CWD to use.
+abspathex = $(foreach _fix_path,$1\
+,$(if $(subst :$(call no-root-slash,$(call no-drive,$(_fix_path))):,,:$(_fix_path):),$(_fix_path),$(abspath $2/$(_fix_path))))
+endif
+
 ## Figure out where to put object files.
 # @param    $1      source file
@@ -1127 +1136 @@
 ## Generic macro for processing all target sources.
 # @param    $(target)   Normalized target name.
+# @param    $(defpath)
+# @param    much-more...
 define def_target_sources
+
+# Apply any default path on the sources first.
+ifneq ($(defpath),)
+ ifdef $(target)_SOURCES
+  $(target)_SOURCES := $(call abspathex,$($(target)_SOURCES),$(defpath))
+ endif
+ ifdef $(target)_SOURCES.$(bld_trg)
+  $(target)_SOURCES.$(bld_trg) := $(call abspathex,$($(target)_SOURCES.$(bld_trg)),$(defpath))
+ endif
+ ifdef $(target)_SOURCES.$(bld_trg).$(bld_trg_arch)
+  $(target)_SOURCES.$(bld_trg).$(bld_trg_arch) := $(call abspathex,$($(target)_SOURCES.$(bld_trg).$(bld_trg_arch)),$(defpath))
+ endif
+ ifdef $(target)_SOURCES.$(bld_trg_arch)
+  $(target)_SOURCES.$(bld_trg_arch) := $(call abspathex,$($(target)_SOURCES.$(bld_trg_arch)),$(defpath))
+ endif
+ ifdef $(target)_SOURCES.$(bld_trg_cpu)
+  $(target)_SOURCES.$(bld_trg_cpu) := $(call abspathex,$($(target)_SOURCES.$(bld_trg_cpu)),$(defpath))
+ endif
+ ifdef $(target)_SOURCES.$(bld_type)
+  $(target)_SOURCES.$(bld_type) := $(call abspathex,$($(target)_SOURCES.$(bld_type)),$(defpath))
+ endif
+endif
+
 #$ (warning def_target_sources)
 # C sources
@@ -1217 +1251 @@
 TARGET_$(target) := $(out)
 $(target)_OBJS_ :=
+defpath := $($(target)_PATH)
 
 # source -> object
@@ -1254 +1289 @@
 deps        := $($(target)_DEPS)
 
+# Adjust paths if we got a default path.
+ifneq ($(defpath),)
+ objs := $(call abspathex,$(objs),$(defpath))
+ deps := $(call abspathex,$(deps),$(defpath))
+endif
+
 # dependency file
 dep := $(out)$(SUFF_DEP)
@@ -1328 +1369 @@
 TARGET_$(target) := $(out)
 $(target)_OBJS_  :=
+defpath := $($(target)_PATH)
 
 # source -> object
@@ -1455 +1497 @@
 deps        := $($(target)_DEPS)
 
+# Adjust paths if we got a default path.
+ifneq ($(defpath),)
+ libpath := $(call abspathex,$(libpath)def $(target)_PATH)
+ objs := $(call abspathex,$(objs),$(defpath))
+ deps := $(call abspathex,$(deps),$(defpath))
+ # libs are not subject to this because of the the -l<lib> stuff. Use $(<target>_PATH)/lib if relative to current dir!
+endif
+
 ## @todo this stuff can't be working.
 custom_pre  := $(strip $(firstword \
@@ -1662 +1712 @@
 # _INSTFUN
 ifdef $(srcsrc)_INSTFUN
-instfun := $(srcsrc)_INSTFUN
+ instfun := $(srcsrc)_INSTFUN
 else
-ifdef $(target)_INSTFUN
-instfun := $(target)_INSTFUN
-else
-instfun := _INSTALL_FILE
-endif
+ ifdef $(target)_INSTFUN
+  instfun := $(target)_INSTFUN
+ else
+  instfun := _INSTALL_FILE
+ endif
 endif
 
 # _INST
 ifdef $(srcsrc)_INST
-inst := $(patsubst %/,%,$($(srcsrc)_INST))/$(dir $(srcdstdir))
+ inst := $(patsubst %/,%,$($(srcsrc)_INST))/$(dir $(srcdstdir))
 else
-ifdef $(target)_INST
-inst := $(patsubst %/,%,$($(target)_INST))/$(dir $(srcdstdir))
-else
-inst := $(dir $(srcdstdir))
-endif
+ ifdef $(target)_INST
+  inst := $(patsubst %/,%,$($(target)_INST))/$(dir $(srcdstdir))
+ else
+  inst := $(dir $(srcdstdir))
+ endif
 endif
 
@@ -1736 +1786 @@
         $($(target)_GID))
 
+
+# Adjust the source if we got a default PATH. (This must be done this late!)
+ifdef $(target)_PATH
+ srcsrc := $(call abspathex,$(srcsrc),$($(target)_PATH))
+endif
+
 # create the command
 ifdef $(srcsrc)_INSTALLER
-inscmd := $(call $(srcsrc)_INSTALLER,$(srcsrc),$(insdst),$(target))
+ inscmd := $(call $(srcsrc)_INSTALLER,$(srcsrc),$(insdst),$(target))
 else
-ifdef $(target)_INSTALLER
-inscmd := $(call $(target)_INSTALLER,$(srcsrc),$(insdst),$(target))
-else
-inscmd := $$(INSTALL)\
+ ifdef $(target)_INSTALLER
+  inscmd := $(call $(target)_INSTALLER,$(srcsrc),$(insdst),$(target))
+ else
+  inscmd := $$(INSTALL)\
                 $(if $(uid),-o $(uid))\
                 $(if $(gid),-g $(gid))\
                 $(if $(mode),-m $(mode))\
                 $(srcsrc) $(insdst)
-endif
+ endif
 endif
 
@@ -1788 +1844 @@
 # _INST
 ifdef $(symlnk)_INST
-inst := $(patsubst %/,%,$($(symlnk)_INST))/$(dir $(symlnk))
+ inst := $(patsubst %/,%,$($(symlnk)_INST))/$(dir $(symlnk))
 else
-ifdef $(target)_INST
-inst := $(patsubst %/,%,$($(target)_INST))/$(dir $(symlnk))
-else
-inst := $(dir $(symlnk))
-endif
+ ifdef $(target)_INST
+  inst := $(patsubst %/,%,$($(target)_INST))/$(dir $(symlnk))
+ else
+  inst := $(dir $(symlnk))
+ endif
 endif
 
@@ -1828 +1884 @@
 # _INST
 ifdef $(directory)_INST
-inst := $(PATH_INS)/$(patsubst %/,%,$($(directory)_INST))
+ inst := $(PATH_INS)/$(patsubst %/,%,$($(directory)_INST))
 else
-ifdef $(target)_INST
-inst := $(PATH_INS)/$(patsubst %/,%,$($(target)_INST))
-else
-inst := $(PATH_INS)
-endif
+ ifdef $(target)_INST
+  inst := $(PATH_INS)/$(patsubst %/,%,$($(target)_INST))
+ else
+  inst := $(PATH_INS)
+ endif
 endif
 
@@ -2142 +2198 @@
 endif # __footer_kmk__
 
+