Changeset 272 in kBuild for trunk

Timestamp:

May 6, 2005 4:05:32 AM (20 years ago)

Author:

bird

Message:

installing stuff.

File:

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

trunk/kBuild/footer.kmk

@@ -259 +259 @@
 # @param    $(target)    Target name.
 define def_inherit_template
-$$(foreach prop, TOOL ARTOOL CTOOL CXXTOOL ASTOOL LDTOOL\
+$$(foreach prop, TOOL ARTOOL CTOOL CXXTOOL ASTOOL LDTOOL INST NOINST\
         ,$$(eval $$(def_inherit_template_one)))
 $$(foreach prop,SDKS DEFS INCS COPTS CFLAGS CDEFS CINCS CXXOPTS CXXFLAGS CXXDEFS CXXINCS ASOPTS ASFLAGS ASDEFS ASINCS LDFLAGS LIBS LIBPATH \
@@ -813 +813 @@
 
 $(eval $(TOOL_$(tool)_LINK_PROGRAM))
-# publish rule (still need work)
+
+# installing
 ifdef $(target)_INST
+ifndef KBUILD_NEW_STUFF
 $(eval pubexe := $(PATH_BIN)/$(notdir $(exe)))
 $(pubexe) : $(exe) $(dir $(pubexe)).dir_created
         $(RM) -f $(pubexe)
         $(CP) $(exe) $(pubexe)
+else
+$(eval pubexe := $(patsubst %/,%/$(notdir $(exe)), \
+        $(if $($(target)_INST), $(addprefix $(PATH_INS)/,$($(target)_INST)), $(PATH_BIN)/)))
+$(pubexe) : $(exe) $(addsuffix .dir_created, $(dir $(pubexe)))
+        $(RM) -f $$@
+        $(CP) $(exe) $$@
+endif   
 
 _BLDPROGS  += $(pubexe)
@@ -886 +895 @@
 $(eval $(TOOL_$(tool)_LINK_LIBRARY))
 
-# publish rule (still need work)
+# installing
 ifndef $(target)_NOINST
+ifndef KBUILD_NEW_STUFF
 $(eval publib := $(PATH_LIB)/$(notdir $(lib)))
 $(publib) : $(lib) $(dir $(publib)).dir_created
         $(RM) -f $(publib)
         $(CP) $(lib) $(publib)
+else
+$(eval publib := $(patsubst %/,%/$(notdir $(lib)), \
+        $(if $($(target)_INST), $(addprefix $(PATH_INS)/,$($(target)_INST)), $(PATH_LIB)/)))
+$(publib) : $(lib) $(addsuffix .dir_created, $(dir $(publib)))
+        $(RM) -f $$@
+        $(CP) $(lib) $$@
+endif   
         
 _LIBS      += $(publib)
@@ -1060 +1077 @@
 
 
-# publish rule (still need work)
+# installing
 ifndef $(target)_NOINST
+ifndef KBUILD_NEW_STUFF
 $(eval pubdll := $(PATH_BIN)/$(notdir $(dll)))
 $(pubdll) : $(dll) $(dir $(pubdll)).dir_created
         $(RM) -f $(pubdll)
         $(CP) $(dll) $(pubdll)
+else
+$(eval pubdll := $(patsubst %/,%/$(notdir $(dll)), \
+        $(if $($(target)_INST), $(addprefix $(PATH_INS)/,$($(target)_INST)), $(PATH_DLL)/)))
+$(pubdll) : $(dll) $(addsuffix .dir_created, $(dir $(publib)))
+        $(RM) -f $$@
+        $(CP) $(dll) $$@
+endif   
 
 $(eval TARGET_PUB_$(target) := $(pubdll))
@@ -1095 +1120 @@
 $(foreach target, $(IMPORT_LIBS) $(IMPORT_LIBS.$(BUILD_TARGET)), $(eval _IMPORT_LIBS += $(firstword $(TARGET_PUB_$(target)) $(TARGET_$(target)))))
 
-    
+
 
 #
@@ -1234 +1259 @@
 
 $(eval $(TOOL_$(tool)_LINK_PROGRAM))
-# publish rule (still need work)
+
+# installing
 ifndef $(target)_NOINST
+ifndef KBUILD_NEW_STUFF
 $(eval pubexe := $(PATH_BIN)/$(notdir $(exe)))
 $(pubexe) : $(exe) $(dir $(pubexe)).dir_created
         $(RM) -f $(pubexe)
         $(CP) $(exe) $(pubexe)
+else
+$(eval pubexe := $(patsubst %/,%/$(notdir $(exe)), \
+        $(if $($(target)_INST), $(addprefix $(PATH_INS)/,$($(target)_INST)), $(PATH_BIN)/)))
+$(pubexe) : $(exe) $(addsuffix .dir_created, $(dir $(pubexe)))
+        $(RM) -f $$@
+        $(CP) $(exe) $$@
+endif   
 
 _PROGRAMS  += $(pubexe)
@@ -1407 +1441 @@
 $(eval $(TOOL_$(tool)_LINK_SYSMOD))
 
-# publish rule (still need work)
+# installing
 ifndef $(target)_NOINST
+ifndef KBUILD_NEW_STUFF
 $(eval pubsys := $(PATH_BIN)/$(notdir $(sys)))
 $(pubsys): $(sys) $(dir $(pubsys)).dir_created
         $(RM) -f $(pubsys)
         $(CP) $(sys) $(pubsys)
+else
+$(eval pubsys := $(patsubst %/,%/$(notdir $(sys)), \
+        $(if $($(target)_INST), $(addprefix $(PATH_INS)/,$($(target)_INST)), $(PATH_SYS)/)))
+$(pubsys) : $(sys) $(addsuffix .dir_created, $(dir $(pubsys)))
+        $(RM) -f $$@
+        $(CP) $(sys) $$@
+endif   
 
 $(eval _SYSMODS += $(pubsys))
@@ -1518 +1560 @@
 .NOTPARALLEL: pass_$(pass)_before pass_$(pass)_after
 .PHONY: pass_$(pass) pass_$(pass)_before pass_$(pass)_doit pass_$(pass)_after
-pass_$(pass)_this:      pass_$(pass)_before 
+pass_$(pass)_this:      pass_$(pass)_before
         + $(QUIET)$$(MAKE) -f $$(MAKEFILE) pass_$(pass)_doit
 pass_$(pass)_after::    pass_$(pass)_this
@@ -1617 +1659 @@
 $(foreach pass,$(PASSES),$(eval $(def_pass_order)))
 
-     
+
 #
 # THE MAIN RULES