Changeset 2064 in kBuild

Timestamp:

Nov 16, 2008 1:39:23 PM (16 years ago)

Author:

bird

Message:

VAC308.kmk: some fixes and enhancements.

File:

• trunk/kBuild/tools/VAC308.kmk (modified) (5 diffs)

trunk/kBuild/tools/VAC308.kmk

@@ -38 +38 @@
 # Determin VAC308 location.
 ifndef PATH_TOOL_VAC308
- PATH_TOOL_VAC308 := $(wildcard $(PATH_DEVTOOLS_BLD)/vac/v308*)
+ PATH_TOOL_VAC308 := $(wildcard $(PATH_DEVTOOLS_BLD)/vac/v3.0.8*)
  ifeq ($(PATH_TOOL_VAC308),)
- PATH_TOOL_VAC308 := $(wildcard $(PATH_DEVTOOLS_TRG)/vac/v308*)
+  PATH_TOOL_VAC308 := $(wildcard $(PATH_DEVTOOLS_BLD)/vac/v308*)
  endif
  ifeq ($(PATH_TOOL_VAC308),)
-  PATH_TOOL_VAC308 := $(lastword $(sort $(PATH_TOOL_VAC308)))
+  PATH_TOOL_VAC308 := $(wildcard $(PATH_DEVTOOLS_TRG)/vac/v3.0.8*)
+  ifeq ($(PATH_TOOL_VAC308),)
+   PATH_TOOL_VAC308 := $(wildcard $(PATH_DEVTOOLS_TRG)/vac/v308*)
+  endif
+ endif
+ ifeq ($(PATH_TOOL_VAC308),)
+  PATH_TOOL_VAC308 := $(firstword $(rsort $(PATH_TOOL_VAC308)))
  endif
  # if not found, we'll enter 'pathless' mode.
@@ -51 +57 @@
 endif
 ifneq ($(PATH_TOOL_VAC308),)
- PATH_TOOL_VAC308_BIN ?= $(PATH_TOOL_VAC308)/bin
- PATH_TOOL_VAC308_LIB ?= $(PATH_TOOL_VAC308)/lib
- PATH_TOOL_VAC308_INC ?= $(PATH_TOOL_VAC308)/include
-
- TOOL_VAC308_CC  ?= $(PATH_TOOL_VAC308_BIN)/icc$(HOSTSUFF_EXE)
- TOOL_VAC308_CXX ?= $(PATH_TOOL_VAC308_BIN)/icc$(HOSTSUFF_EXE)
- TOOL_VAC308_AR  ?= $(PATH_TOOL_VAC308_BIN)/ilib$(HOSTSUFF_EXE)
- TOOL_VAC308_LD  ?= $(PATH_TOOL_VAC308_BIN)/icc$(HOSTSUFF_EXE)
- TOOL_VAC308_RC  ?= $(PATH_TOOL_VAC308_BIN)/rc$(HOSTSUFF_EXE)
+ TOOL_VAC308_PATHLESS := yes
+ 
+ PATH_TOOL_VAC308_BIN    ?= $(PATH_TOOL_VAC308)/bin
+ PATH_TOOL_VAC308_LIB    ?= $(PATH_TOOL_VAC308)/lib
+ PATH_TOOL_VAC308_INC    ?= $(PATH_TOOL_VAC308)/include
+ PATH_TOOL_VAC308_DLL    ?= $(PATH_TOOL_VAC308)/dll
+ PATH_TOOL_VAC308_HELP   ?= $(PATH_TOOL_VAC308)/help
+ PATH_TOOL_VAC308_LOCALE ?= $(PATH_TOOL_VAC308)/locale
+ 
+ TOOL_VAC308_REDIRECT ?= $(REDIRECT) \
+        -E 'BEGINLIBPATH=$(PATH_TOOL_VAC308_DLL);$(BEGINLIBPATH)' \
+        -E 'DPATH=$(PATH_TOOL_VAC308_LOCALE);$(PATH_TOOL_VAC308_HELP);$(DPATH)' \
+        -E 'LIB=' \
+        -E 'INCLUDE=' \
+        --
+ TOOL_VAC308_CC  ?= $(TOOL_VAC308_REDIRECT) $(PATH_TOOL_VAC308_BIN)/icc$(HOSTSUFF_EXE)
+ TOOL_VAC308_CXX ?= $(TOOL_VAC308_REDIRECT) $(PATH_TOOL_VAC308_BIN)/icc$(HOSTSUFF_EXE)
+ TOOL_VAC308_AR  ?= $(TOOL_VAC308_REDIRECT) $(PATH_TOOL_VAC308_BIN)/ilib$(HOSTSUFF_EXE)
+ TOOL_VAC308_LD  ?= $(TOOL_VAC308_REDIRECT) $(PATH_TOOL_VAC308_BIN)/icc$(HOSTSUFF_EXE)
+ TOOL_VAC308_RC  ?= $(TOOL_VAC308_REDIRECT) $(PATH_TOOL_VAC308_BIN)/rc$(HOSTSUFF_EXE)
 
 else
  # Pathless, relies on the environment.
+ TOOL_VAC308_PATHLESS :=
  TOOL_VAC308_CC  ?= icc$(HOSTSUFF_EXE)
  TOOL_VAC308_CXX ?= icc$(HOSTSUFF_EXE)
@@ -81 +99 @@
 TOOL_VAC308_CFLAGS.debug     ?= -Ti+
 TOOL_VAC308_CFLAGS.release   ?= -O
-TOOL_VAC308_CINCS            ?=
+TOOL_VAC308_CINCS            ?= $(PATH_TOOL_VAC308_INC)
 TOOL_VAC308_CDEFS            ?=
 
@@ -88 +106 @@
 TOOL_VAC308_CXXFLAGS.debug   ?= -Ti
 TOOL_VAC308_CXXFLAGS.release ?= -O
-TOOL_VAC308_CXXINCS          ?=
+TOOL_VAC308_CXXINCS          ?= $(PATH_TOOL_VAC308_INC)
 TOOL_VAC308_CXXDEFS          ?=
 
@@ -194 +212 @@
 #
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
-TOOL_VAC308_LINK_LIBRARY_OUTPUT = $(outbase).rsp
+TOOL_VAC308_LINK_LIBRARY_OUTPUT = ## @todo $(outbase).rsp 
 TOOL_VAC308_LINK_LIBRARY_DEPEND = $(othersrc)
 TOOL_VAC308_LINK_LIBRARY_DEPORD =