Changeset 2479 for trunk/kBuild/footer.kmk

Timestamp:

Jul 20, 2011, 4:16:19 PM (14 years ago)

Author:

bird

Message:

footer.kmk,header.kmk,qt*.kmk: Installalation and staging enhancements.

File:

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

trunk/kBuild/footer.kmk

@@ -130 +130 @@
 _DIRS     := $(PATH_TARGET)/ $(PATH_TARGET) $(BLDDIRS)
 _IMPORT_LIBS :=
+
+# Implicit targets added while processing other targets (usually by units).
+_ALL_INSTALLS_IMPLICIT :=
 
 # misc
@@ -2149 +2152 @@
         $(pre_install_cmds)
 
-        $$(QUIET)$$(INSTALL) $(if $(mode),-m $(mode)) $(if $(uid),-o $(uid)) $(if $(gid),-g $(gid)) -- $(out) $$@
+        $$(QUIET)$$(INSTALL_STAGING) $(if $(mode),-m $(mode)) $(if $(uid),-o $(uid)) $(if $(gid),-g $(gid)) -- $(out) $$@
         $(post_install_cmds)
 
@@ -3023 +3026 @@
 local stagedst := $(call $(instfun),$(srcdst),$(target),$(stage),$(PATH_STAGE))
 
-local inst     := $(firstword $($(srcsrc)_INST) $($(target)_1_INST))
-ifneq ($(substr $(inst),-1),/)
- $(warning kBuild: File $(srcsrc) in install target $(target) has a INST property without a trailing slash.)
- local inst    := $(inst)/
-endif
-local inst     := $(inst)$(dir $(srcdstdir))
-local instdst  := $(call $(instfun),$(srcdst),$(target),$(inst),$(PATH_INS))
+ifeq ($(insttype),both)
+ local inst     := $(firstword $($(srcsrc)_INST) $($(target)_1_INST))
+ ifneq ($(substr $(inst),-1),/)
+  $(warning kBuild: File $(srcsrc) in install target $(target) has a INST property without a trailing slash.)
+  local inst    := $(inst)/
+ endif
+ local inst     := $(inst)$(dir $(srcdstdir))
+ local instdst  := $(call $(instfun),$(srcdst),$(target),$(inst),$(PATH_INS))
+endif
 
 #$(warning instfun=$(instfun) srcdst=$(srcdst) target=$(target) inst=$(inst) => instdst=$(instdst); stage=$(stage) => stagedst=$(stagedst))
@@ -3117 +3122 @@
 endif
 
-# create the commands
+# Generate the staging rule (requires double evaluation).
 ifdef $(srcsrc)_INSTALLER
- local stagecmd := $(call $(srcsrc)_INSTALLER,$(srcsrc),$(stagedst),$(target),$(flags))
- local instcmd  := $(call $(srcsrc)_INSTALLER,$(srcsrc),$(instdst),$(target),$(flags))
+ local stagecmd := $(call $(srcsrc)_INSTALLER,$(srcsrc),$(stagedst),$(target),$(flags),stage)
 else ifdef $(target)_INSTALLER
- local stagecmd := $(call $(target)_INSTALLER,$(srcsrc),$(stagedst),$(target),$(flags))
- local instcmd  := $(call $(target)_INSTALLER,$(srcsrc),$(instdst),$(target),$(flags))
+ local stagecmd := $(call $(target)_INSTALLER,$(srcsrc),$(stagedst),$(target),$(flags),stage)
 else
- local stagecmd := $$(INSTALL)\
+ local stagecmd := $$(INSTALL_STAGING)\
                 $(if $(uid),-o $(uid))\
                 $(if $(gid),-g $(gid))\
@@ -3131 +3134 @@
                 $(flags) -- \
                 $(srcsrc) $(stagedst)
- local instcmd := $$(INSTALL)\
-                $(if $(uid),-o $(uid))\
-                $(if $(gid),-g $(gid))\
-                $(if $(mode),-m $(mode))\
-                $(flags) -- \
-                $(srcsrc) $(instdst)
-endif
-
-# Generate the staging rule (requires double evaluation).
+endif
 $(eval $(def_install_src_rule_staging))
 $(target)_2_STAGE_TARGETS += $(stagedst)
@@ -3145 +3140 @@
 # Generate the install rule
 ifeq ($(insttype),both)
+ ifdef $(srcsrc)_INSTALLER
+  local instcmd  := $(call $(srcsrc)_INSTALLER,$(srcsrc),$(instdst),$(target),$(flags),install)
+ else ifdef $(target)_INSTALLER
+  local instcmd  := $(call $(target)_INSTALLER,$(srcsrc),$(instdst),$(target),$(flags),install)
+ else
+  local instcmd := $$(INSTALL)\
+                $(if $(uid),-o $(uid))\
+                $(if $(gid),-g $(gid))\
+                $(if $(mode),-m $(mode))\
+                $(flags) -- \
+                $(srcsrc) $(instdst)
+ endif
  $(eval $(def_install_src_rule_installing))
  $(target)_2_INST_TARGETS += $(instdst)
@@ -3443 +3450 @@
 $(eval-opt-var def_install)
 
-## process all install targets
+## Do pass 1 on the implicit targets and add them to the list.
+$(foreach target, $(_ALL_INSTALLS_IMPLICIT), \
+        $(evalval def_pass1_install))
+_ALL_INSTALLS += $(_ALL_INSTALLS_IMPLICIT)
+
+## Do pass 2 on all install targets.
 $(foreach target, $(_ALL_INSTALLS), \
         $(evalvalctx def_install))