Changeset 1350 for trunk/kBuild/tools/VCC80.kmk

Timestamp:

Dec 3, 2007, 2:03:09 AM (18 years ago)

Author:

bird

Message:

Use the new $(CP) options and the new $(TEST) builtin.

File:

• trunk/kBuild/tools/VCC80.kmk (modified) (3 diffs)

trunk/kBuild/tools/VCC80.kmk

@@ -264 +264 @@
                 $(subst /,\\,$(objs)) \
                 $(subst /,\\,$(libs))
-ifdef KMK_USE_TEST
         $(QUIET)$(TEST) -f $(out).manifest -- \
                 $(TOOL_VCC80_MT) -manifest $(subst /,\\,$(out)).manifest -outputresource:$(subst /,\\,$(out))
-else
-        $(QUIET)if test -f $(out).manifest; then \
-                $(TOOL_VCC80_MT) -manifest $(subst /,\\,$(out)).manifest -outputresource:$(subst /,\\,$(out)); \
-        fi
-endif
 endef
 
@@ -305 +299 @@
                 $(subst /,\\,$(objs)) \
                 $(subst /,\\,$(libs))
-ifdef KMK_USE_TEST
         $(QUIET)$(TEST) -f $(out).manifest -- \
                 $(TOOL_VCC80_MT) -manifest $(subst /,\\,$(out)).manifest '-outputresource:$(subst /,\\,$(out));#2'
-else
-        $(QUIET)if test -f $(out).manifest; then \
-                $(TOOL_VCC80_MT) -manifest $(subst /,\\,$(out)).manifest "-outputresource:$(subst /,\\,$(out));#2"; \
-        fi
-endif
 ifeq ($(filter %.exp .def,$(othersrc)),)
-ifdef KMK_NEW_CP
         $(QUIET)$(CP) --changed --ignore-non-existing $(outbase).exp $(outbase).lib $(PATH_LIB)/
-else
-        $(QUIET)if test -f $(outbase).exp; then $(CP_EXT) $(outbase).exp $(PATH_LIB)/; fi
-        $(QUIET)if test -f $(outbase).lib; then $(CP_EXT) $(outbase).lib $(PATH_LIB)/; fi
-endif
 endif
 $(eval _DIRS += $(PATH_LIB))
@@ -353 +336 @@
                 $(subst /,\\,$(objs)) \
                 $(subst /,\\,$(libs))
-ifdef KMK_USE_TEST
         $(QUIET)$(TEST) -f $(out).manifest -- \
                 $(TOOL_VCC80_MT) -manifest $(subst /,\\,$(out)).manifest '-outputresource:$(subst /,\\,$(out));#2'
-else
-        $(QUIET)if test -f $(out).manifest; then \
-                $(TOOL_VCC80_MT) -manifest $(subst /,\\,$(out)).manifest "-outputresource:$(subst /,\\,$(out));#2"; \
-        fi
-endif
-endef
-
+endef
+