Changeset 1350 for trunk/kBuild


Ignore:
Timestamp:
Dec 3, 2007, 2:03:09 AM (18 years ago)
Author:
bird
Message:

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

Location:
trunk/kBuild/tools
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/kBuild/tools/VCC70.kmk

    r1288 r1350  
    308308                $(subst /,\\,$(libs))
    309309ifeq ($(filter %.exp .def,$(othersrc)),)
    310 ifdef KMK_NEW_CP
    311310        $(QUIET)$(CP) --changed --ignore-non-existing $(outbase).exp $(outbase).lib $(PATH_LIB)/
    312 else
    313         $(QUIET)if test -f $(outbase).exp; then $(CP_EXT) $(outbase).exp $(PATH_LIB)/; fi
    314         $(QUIET)if test -f $(outbase).lib; then $(CP_EXT) $(outbase).lib $(PATH_LIB)/; fi
    315 endif
    316311endif
    317312$(eval _DIRS += $(PATH_LIB))

  • trunk/kBuild/tools/VCC80.kmk

    r1312 r1350  
    264264                $(subst /,\\,$(objs)) \
    265265                $(subst /,\\,$(libs))
    266 ifdef KMK_USE_TEST
    267266        $(QUIET)$(TEST) -f $(out).manifest -- \
    268267                $(TOOL_VCC80_MT) -manifest $(subst /,\\,$(out)).manifest -outputresource:$(subst /,\\,$(out))
    269 else
    270         $(QUIET)if test -f $(out).manifest; then \
    271                 $(TOOL_VCC80_MT) -manifest $(subst /,\\,$(out)).manifest -outputresource:$(subst /,\\,$(out)); \
    272         fi
    273 endif
    274268endef
    275269
    … …  
    305299                $(subst /,\\,$(objs)) \
    306300                $(subst /,\\,$(libs))
    307 ifdef KMK_USE_TEST
    308301        $(QUIET)$(TEST) -f $(out).manifest -- \
    309302                $(TOOL_VCC80_MT) -manifest $(subst /,\\,$(out)).manifest '-outputresource:$(subst /,\\,$(out));#2'
    310 else
    311         $(QUIET)if test -f $(out).manifest; then \
    312                 $(TOOL_VCC80_MT) -manifest $(subst /,\\,$(out)).manifest "-outputresource:$(subst /,\\,$(out));#2"; \
    313         fi
    314 endif
    315303ifeq ($(filter %.exp .def,$(othersrc)),)
    316 ifdef KMK_NEW_CP
    317304        $(QUIET)$(CP) --changed --ignore-non-existing $(outbase).exp $(outbase).lib $(PATH_LIB)/
    318 else
    319         $(QUIET)if test -f $(outbase).exp; then $(CP_EXT) $(outbase).exp $(PATH_LIB)/; fi
    320         $(QUIET)if test -f $(outbase).lib; then $(CP_EXT) $(outbase).lib $(PATH_LIB)/; fi
    321 endif
    322305endif
    323306$(eval _DIRS += $(PATH_LIB))
    … …  
    353336                $(subst /,\\,$(objs)) \
    354337                $(subst /,\\,$(libs))
    355 ifdef KMK_USE_TEST
    356338        $(QUIET)$(TEST) -f $(out).manifest -- \
    357339                $(TOOL_VCC80_MT) -manifest $(subst /,\\,$(out)).manifest '-outputresource:$(subst /,\\,$(out));#2'
    358 else
    359         $(QUIET)if test -f $(out).manifest; then \
    360                 $(TOOL_VCC80_MT) -manifest $(subst /,\\,$(out)).manifest "-outputresource:$(subst /,\\,$(out));#2"; \
    361         fi
    362 endif
    363 endef
    364 
     340endef
     341

  • trunk/kBuild/tools/VCC80AMD64.kmk

    r1312 r1350  
    282282                $(subst /,\\,$(objs)) \
    283283                $(subst /,\\,$(libs))
    284 ifdef KMK_USE_TEST
    285284        $(QUIET)$(TEST) -f $(out).manifest -- \
    286285                $(TOOL_VCC80AMD64_MT) -manifest $(subst /,\\,$(out)).manifest '-outputresource:$(subst /,\\,$(out));#2'
    287 else
    288         $(QUIET)if test -f $(out).manifest; then \
    289                 $(TOOL_VCC80AMD64_MT) -manifest $(subst /,\\,$(out)).manifest "-outputresource:$(subst /,\\,$(out));#2"; \
    290         fi
    291 endif
    292286ifeq ($(filter %.exp .def,$(othersrc)),)
    293 ifdef KMK_NEW_CP
    294287        $(QUIET)$(CP) --changed --ignore-non-existing $(outbase).exp $(outbase).lib $(PATH_LIB)/
    295 else
    296         $(QUIET)if test -f $(outbase).exp; then $(CP_EXT) $(outbase).exp $(PATH_LIB)/; fi
    297         $(QUIET)if test -f $(outbase).lib; then $(CP_EXT) $(outbase).lib $(PATH_LIB)/; fi
    298 endif
    299288endif
    300289$(eval _DIRS += $(PATH_LIB))
    … …  
    330319                $(subst /,\\,$(objs)) \
    331320                $(subst /,\\,$(libs))
    332 ifdef KMK_USE_TEST
    333321        $(QUIET)$(TEST) -f $(out).manifest -- \
    334322                $(TOOL_VCC80AMD64_MT) -manifest $(subst /,\\,$(out)).manifest '-outputresource:$(subst /,\\,$(out));#2'
    335 else
    336         $(QUIET)if test -f $(out).manifest; then \
    337                 $(TOOL_VCC80AMD64_MT) -manifest $(subst /,\\,$(out)).manifest "-outputresource:$(subst /,\\,$(out));#2"; \
    338         fi
    339 endif
    340 endef
    341 
     323endef
     324

  • trunk/kBuild/tools/VCC80X86.kmk

    r1312 r1350  
    243243                $(subst /,\\,$(objs)) \
    244244                $(subst /,\\,$(libs))
    245 ifdef KMK_USE_TEST
    246245        $(QUIET)$(TEST) -f $(out).manifest -- \
    247246                $(TOOL_VCC80X86_MT) -manifest $(subst /,\\,$(out)).manifest -outputresource:$(subst /,\\,$(out))
    248 else
    249         $(QUIET)if test -f $(out).manifest; then \
    250                 $(TOOL_VCC80X86_MT) -manifest $(subst /,\\,$(out)).manifest -outputresource:$(subst /,\\,$(out)); \
    251         fi
    252 endif
    253247endef
    254248
    … …  
    284278                $(subst /,\\,$(objs)) \
    285279                $(subst /,\\,$(libs))
    286 ifdef KMK_USE_TEST
    287280        $(QUIET)$(TEST) -f $(out).manifest -- \
    288281                $(TOOL_VCC80X86_MT) -manifest $(subst /,\\,$(out)).manifest '-outputresource:$(subst /,\\,$(out));#2'
    289 else
    290         $(QUIET)if test -f $(out).manifest; then \
    291                 $(TOOL_VCC80X86_MT) -manifest $(subst /,\\,$(out)).manifest "-outputresource:$(subst /,\\,$(out));#2"; \
    292         fi
    293 endif
    294282ifeq ($(filter %.exp .def,$(othersrc)),)
    295 ifdef KMK_NEW_CP
    296283        $(QUIET)$(CP) --changed --ignore-non-existing $(outbase).exp $(outbase).lib $(PATH_LIB)/
    297 else
    298         $(QUIET)if test -f $(outbase).exp; then $(CP_EXT) $(outbase).exp $(PATH_LIB)/; fi
    299         $(QUIET)if test -f $(outbase).lib; then $(CP_EXT) $(outbase).lib $(PATH_LIB)/; fi
    300 endif
    301284endif
    302285$(eval _DIRS += $(PATH_LIB))
    … …  
    332315                $(subst /,\\,$(objs)) \
    333316                $(subst /,\\,$(libs))
    334 ifdef KMK_USE_TEST
    335317        $(QUIET)$(TEST) -f $(out).manifest -- \
    336318                $(TOOL_VCC80X86_MT) -manifest $(subst /,\\,$(out)).manifest '-outputresource:$(subst /,\\,$(out));#2'
    337 else
    338         $(QUIET)if test -f $(out).manifest; then \
    339                 $(TOOL_VCC80X86_MT) -manifest $(subst /,\\,$(out)).manifest "-outputresource:$(subst /,\\,$(out));#2"; \
    340         fi
    341 endif
    342 endef
    343 
     319endef
     320
Note: See TracChangeset for help on using the changeset viewer.