Changeset 2537 for trunk/kBuild/footer-pass2-installs.kmk

Timestamp:

Aug 2, 2011, 9:44:43 PM (14 years ago)

Author:

bird

Message:

Quick implementation of PRE_[FILE|SYMLINK|DIRECTORY_CMDS on installs. Fixes #104.

File:

• trunk/kBuild/footer-pass2-installs.kmk (modified) (8 diffs)

trunk/kBuild/footer-pass2-installs.kmk

@@ -45 +45 @@
 $(stagedst) : $(srcsrc) | $(dir $(stagedst))
         %$$(call MSG_INST_FILE,$(srcsrc),$(stagedst))
+        $(top_pre_file_cmds)
         $$(QUIET)$(stagecmd)
+        $(top_post_file_cmds)
 endef
 $(eval-opt-var def_install_src_rule_staging)
@@ -54 +56 @@
 $(instdst) : $(srcsrc) | $(dir $(instdst))
         %$$(call MSG_INST_FILE,$(srcsrc),$(instdst))
+        $(top_pre_file_cmds)
         $$(QUIET)$(instcmd)
+        $(top_post_file_cmds)
 endef
 $(eval-opt-var def_install_src_rule_installing)
@@ -245 +249 @@
         %$$(call MSG_INST_SYM,$(stagedst),$(symdst))
         $$(QUIET)$$(RM) -f -- $$@
+        $(top_pre_sym_cmds)
         $$(QUIET)$$(LN_SYMLINK) $(symdst) $(stagedst)
+        $(top_post_sym_cmds)
 endef
 $(eval-opt-var def_install_symlink_rule_staging)
@@ -254 +260 @@
         %$$(call MSG_INST_SYM,$(instdst),$(symdst))
         $$(QUIET)$$(RM) -f -- $$@
+        $(top_pre_sym_cmds)
         $$(QUIET)$$(LN_SYMLINK) $(symdst) $(instdst)
+        $(top_post_sym_cmds)
 endef
 $(eval-opt-var def_install_symlink_rule_installing)
@@ -331 +339 @@
 $(insdst):
         %$$(call MSG_INST_DIR,$(insdst))
+        $(top_pre_dir_cmds)
         $$(QUIET)$$(INSTALL) -d \
                 $(if $(uid),-o $(uid))\
@@ -337 +346 @@
                 $(flags) -- \
                 $(insdst)
+        $(top_post_dir_cmds)
 
 .NOTPARALLEL: $(insdst)
@@ -452 +462 @@
 
 ifneq ($(insttype),none)
- # cache top level target properties.
+ # Cache top level target properties.
  local top_mode := $(firstword \
         $($(target)_MODE.$(bld_trg).$(bld_trg_arch)) \
@@ -482 +492 @@
    local top_instfun := _INSTALL_FILE
  endif
+ # The user have to use double expansion and can only use the above locals. Not 100% optimal...
+ local top_pre_file_cmds  := $(evalcall def_fn_prop_get_first_defined,PRE_XFILE_CMDS)
+ local top_post_file_cmds := $(evalcall def_fn_prop_get_first_defined,POST_XFILE_CMDS)
+ local top_pre_sym_cmds   := $(evalcall def_fn_prop_get_first_defined,PRE_SYMLINK_CMDS)
+ local top_post_sym_cmds  := $(evalcall def_fn_prop_get_first_defined,POST_SYMLINK_CMDS)
+ local top_pre_dir_cmds   := $(evalcall def_fn_prop_get_first_defined,PRE_DIRECTORY_CMDS)
+ local top_post_dir_cmds  := $(evalcall def_fn_prop_get_first_defined,POST_DIRECTORY_CMDS)
 
  $(foreach directory, \