Changeset 126 for trunk/kBuild

Timestamp:

Jun 26, 2004, 12:13:54 AM (21 years ago)

Author:

bird

Message:

implemented publish for libraries.

Location:

trunk/kBuild

Files:

• footer.kmk (modified) (4 diffs)
• tools/GCC3.kmk (modified) (1 diff)
• tools/MINGW32.kmk (modified) (1 diff)
• tools/VCC70.kmk (modified) (1 diff)

trunk/kBuild/footer.kmk

@@ -630 +630 @@
 $(eval outbase     := $(call _TARGET_BASE,$(target),$(target)))
 $(eval PATH_$(target) := $(patsubst %/,%,$(dir $(outbase))))
+$(eval libsuff     := $(firstword\
+        $($(target)_LIBSUFF.$(BUILD_TARGET))\
+        $($(target)_LIBSUFF)\
+        $(TOOL_$(tool)_ARLIBSUFF.$(BUILD_TARGET))\
+        $(TOOL_$(tool)_ARLIBSUFF)\
+        $(SUFF_LIB)\
+))
 $(eval lib         := $(outbase)$(libsuff))
 $(eval flags       :=\
@@ -639 +646 @@
         $($(target)_ARFLAGS.$(BUILD_TYPE))\
         )
-$(eval libsuff     := $(firstword\
-        $($(target)_LIBSUFF.$(BUILD_TARGET))\
-        $($(target)_LIBSUFF)\
-        $(TOOL_$(tool)_ARLIBSUFF.$(BUILD_TARGET))\
-        $(TOOL_$(tool)_ARLIBSUFF)\
-        $(SUFF_LIB)\
-))
 $(eval objs         = $(_OBJS_$(target)))
 $(eval othersrc    := $(filter-out %.c %.cpp %.cxx %.cc %.s %.S %.asm,$($(target)_SOURCES) $($(target)_SOURCES.$(BUILD_TARGET)) $($(target)_SOURCES.$(BUILD_MODE))))
@@ -654 +654 @@
 $(eval $(TOOL_$(tool)_LINK_LIBRARY))
 
-_OBJS += $(_OBJS_$(target))
+# publish rule (still need work)
+ifndef $(target)_noinst
+$(eval publib := $(PATH_LIB)/$(notdir $(lib)))
+$(publib) : $(lib) $(dir $(publib)).dir_created
+        $(CP) $(lib) $(publib) 
+        
+_LIBS += $(publib)
+_OUT_FILES += $(lib) $(publib)
+else
 _LIBS += $(lib)
 _OUT_FILES += $(lib)
+endif
+_OBJS += $(_OBJS_$(target))
 endef
 
@@ -993 +1003 @@
 # Directories.
 #
-_OUTPUT_FILES := $(_OBJS) $(_LIBS) $(_EXES) $(_DLLS) $(_SYSMODS)
-_DIRFILES := $(sort $(addsuffix /.dir_created,$(_DIRS)) $(addsuffix .dir_created,$(dir $(_OUTPUT_FILES))))
+$(warning _OUT_FILES=$(_OUT_FILES))
+_DIRFILES := $(sort $(addsuffix /.dir_created,$(_DIRS)) $(addsuffix .dir_created,$(dir $(_OUT_FILES) $(_OBJS))))
+$(warning _DIRFILES=$(_DIRFILES))
 
 define def_createdir

trunk/kBuild/tools/GCC3.kmk

@@ -124 +124 @@
         $(RM) -f $$@
         $(TOOL_GCC3_AR) $(flags) $$@ $(objs)
-        $(MKDIR) -p $(PATH_LIB)
-        $(CP) $$@ $(PATH_LIB)/
         
 endef

trunk/kBuild/tools/MINGW32.kmk

@@ -148 +148 @@
         $(RM) -f $$@
         $(TOOL_MINGW32_AR) $(flags) $$@ $(objs)
-        $(MKDIR) -p $(PATH_LIB)
-        $(CP) $$@ $(PATH_LIB)/
         
 endef

trunk/kBuild/tools/VCC70.kmk

@@ -130 +130 @@
         $(TOOL_VCC70_AR) $(flags) /OUT:$(call CYGPATHMIXED,$(lib)) $(subst /,\\,$(call CYGPATHMIXED,$(objs))) \
                 $(foreach def,$(filter %.def,$(othersrc)), /DEF:$(call CYGPATHMIXED,$(def)))
-        $(MKDIR) -p $(PATH_LIB)
-        $(CP) $$@ $(PATH_LIB)/
         
 endef