Changeset 2479 for trunk/kBuild/header.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/header.kmk (modified) (4 diffs)

trunk/kBuild/header.kmk

@@ -391 +391 @@
 
 # Install directory layout.  Relative to PATH_INS.
+KBUILD_INST_PATHS   := BIN DLL SYS LIB DOC DEBUG SBIN LIBEXEC SHARE
 INST_BIN             = bin/
 if1of ($(KBUILD_TARGET), win)
@@ -419 +420 @@
 STAGE_LIBEXEC        = $(INST_LIBEXEC)
 STAGE_SHARE          = $(INST_SHARE)
+
+# Install and staging directory paths.
+$(foreach path, $(KBUILD_INST_PATHS), \
+        $(eval PATH_STAGE_$(path) = $$(patsubst %/,%,$$(PATH_STAGE)/$$(STAGE_$(path)))) \
+        $(eval PATH_INST_$(path) = $$(patsubst %/,%,$$(PATH_INS)/$$(INST_$(path)))) \
+)
 
 # Output directories.
@@ -689 +696 @@
 # Symlinking is problematic on some platforms...
 LN_SYMLINK  := $(LN) -s
+
+# When copying to the staging area, use hard links to save time and space.
+if1of ($(KMK_FEATURES), install-hard-linking)
+INSTALL_STAGING := $(INSTALL) --hard-link-files-when-possible
+else
+INSTALL_STAGING := $(INSTALL)
+endif
 
 
@@ -1246 +1260 @@
 endif
 $($(y)_$(x) := $(val)
+
+local val := $(strip $(PATH_$(y)_$(x)))
+ifeq ($(val),)
+ $(error kBuild: 'PATH_$(y)_$(x)' is set to an empty value.)
+endif
+PATH_$(y)_$(x) := $(val)
 endef
-$(foreach y, INST STAGE, $(foreach x, BIN DLL SYS LIB DOC SBIN LIBEXEC SHARE DEBUG, $(evalcall def_kbuild_finalize_inst)))
+$(foreach y, INST STAGE, $(foreach x, $(KBUILD_INST_PATHS), $(evalcall def_kbuild_finalize_inst)))