Changeset 2225 in kBuild

Timestamp:

Jan 8, 2009 10:29:21 PM (16 years ago)

Author:

bird

Message:

footer.kmk,header.kmk: Fixed MODE, UID and GID inhertiance and added these to link targets.

Location:

trunk/kBuild

Files:

• footer.kmk (modified) (3 diffs)
• header.kmk (modified) (1 diff)

trunk/kBuild/footer.kmk

@@ -2126 +2126 @@
 $(INSTARGET_$(target)) : $(out) | $(call DIRDEP,$(dir $(INSTARGET_$(target))))
         %$$(call MSG_INST_TRG,$(target),$(out),$$@)
-        $$(QUIET)$$(INSTALL) $$(if $(mode),-m $(mode)) -- $(out) $$@
+        $$(QUIET)$$(INSTALL) $(if $(mode),-m $(mode)) $(if $(uid),-o $(uid)) $(if $(gid),-g $(gid)) -- $(out) $$@
 
 ifdef KBUILD_DO_AUTO_INSTALL
@@ -2251 +2251 @@
  endif
  INSTARGET_$(target) := $(patsubst %/,%/$(notdir $(out)),$(inst))
-
+ local mode := $(firstword \
+        $($(target)_MODE.$(bld_trg).$(bld_trg_arch).$(bld_type)) \
+        $($(target)_MODE.$(bld_trg).$(bld_trg_arch)) \
+        $($(target)_MODE.$(bld_trg).$(bld_type)) \
+        $($(target)_MODE.$(bld_trg_arch)) \
+        $($(target)_MODE.$(bld_trg)) \
+        $($(target)_MODE.$(bld_type)) \
+        $($(target)_MODE) )
+ local uid := $(firstword \
+        $($(target)_UID.$(bld_trg).$(bld_trg_arch).$(bld_type)) \
+        $($(target)_UID.$(bld_trg).$(bld_trg_arch)) \
+        $($(target)_UID.$(bld_trg).$(bld_type)) \
+        $($(target)_UID.$(bld_trg_arch)) \
+        $($(target)_UID.$(bld_trg)) \
+        $($(target)_UID.$(bld_type)) \
+        $($(target)_UID) )
+ local gid := $(firstword \
+        $($(target)_GID.$(bld_trg).$(bld_trg_arch).$(bld_type)) \
+        $($(target)_GID.$(bld_trg).$(bld_trg_arch)) \
+        $($(target)_GID.$(bld_trg).$(bld_type)) \
+        $($(target)_GID.$(bld_trg_arch)) \
+        $($(target)_GID.$(bld_trg)) \
+        $($(target)_GID.$(bld_type)) \
+        $($(target)_GID) )
+
+ # generate the install rule
 $(eval $(def_link_install_rule))
 
@@ -2853 +2878 @@
   $(typevar)  += $(out)
  endif
+ local mode := $(firstword \
+        $($(target)_MODE.$(bld_trg).$(bld_trg_arch).$(bld_type)) \
+        $($(target)_MODE.$(bld_trg).$(bld_trg_arch)) \
+        $($(target)_MODE.$(bld_trg).$(bld_type)) \
+        $($(target)_MODE.$(bld_trg_arch)) \
+        $($(target)_MODE.$(bld_trg)) \
+        $($(target)_MODE.$(bld_type)) \
+        $($(target)_MODE) )
+ local uid := $(firstword \
+        $($(target)_UID.$(bld_trg).$(bld_trg_arch).$(bld_type)) \
+        $($(target)_UID.$(bld_trg).$(bld_trg_arch)) \
+        $($(target)_UID.$(bld_trg).$(bld_type)) \
+        $($(target)_UID.$(bld_trg_arch)) \
+        $($(target)_UID.$(bld_trg)) \
+        $($(target)_UID.$(bld_type)) \
+        $($(target)_UID) )
+ local gid := $(firstword \
+        $($(target)_GID.$(bld_trg).$(bld_trg_arch).$(bld_type)) \
+        $($(target)_GID.$(bld_trg).$(bld_trg_arch)) \
+        $($(target)_GID.$(bld_trg).$(bld_type)) \
+        $($(target)_GID.$(bld_trg_arch)) \
+        $($(target)_GID.$(bld_trg)) \
+        $($(target)_GID.$(bld_type)) \
+        $($(target)_GID) )
+
  # generate the install rule
 $(eval $(def_link_install_rule))

trunk/kBuild/header.kmk

@@ -792 +792 @@
 # will do the necessary inheritance for templates, sdks, tools and targets.
 PROPS_SINGLE := $(PROPS_TOOLS) TEMPLATE INST NOINST BLD_TYPE BLD_TRG BLD_TRG_ARCH BLD_TRG_CPU FETCHDIR \
-        OBJSUFF COBJSUFF CXXOBJSUFF OBJCOBJSUFF ASOBJSUFF RCOBJSUFF SYSSUFF BINSUFF EXESUFF DLLSUFF LIBSUFF ARLIBSUFF
+        OBJSUFF COBJSUFF CXXOBJSUFF OBJCOBJSUFF ASOBJSUFF RCOBJSUFF SYSSUFF BINSUFF EXESUFF DLLSUFF LIBSUFF ARLIBSUFF \
+        MODE UID GID
 ## PROPS_SINGLE_LNK
 # Subset of PROPS_SINGLE which applies to all linkable targets.
 PROPS_SINGLE_LNK := TOOL TEMPLATE CTOOL CXXTOOL OBJCTOOL ASTOOL RCTOOL \
         INST NOINST BLD_TYPE BLD_TRG BLD_TRG_ARCH BLD_TRG_CPU \
-        OBJSUFF COBJSUFF CXXOBJSUFF OBJCOBJSUFF ASOBJSUFF RCOBJSUFF
+        OBJSUFF COBJSUFF CXXOBJSUFF OBJCOBJSUFF ASOBJSUFF RCOBJSUFF \
+        MODE UID GID
 
 ## PROPS_DEFERRED