Changeset 1097 in kBuild

Timestamp:

Sep 16, 2007 4:55:55 PM (18 years ago)

Author:

bird

Message:

very basic VAC308.

File:

• trunk/kBuild/tools/VAC308.kmk (copied) (copied from trunk/kBuild/tools/GCC3OMF.kmk ) (8 diffs)

trunk/kBuild/tools/VAC308.kmk

@@ -2 +2 @@
 ## @file
 #
-# kBuild Tool Config - GCC v3 targeting OS/2 OMF.
+# kBuild Tool Config - VisualAge for C++ v3.08.
 #
 # Copyright (c) 2004-2007 knut st. osmundsen <[email protected]>
@@ -25 +25 @@
 #
 
-TOOL_GCC3OMF := GCC v3 targeting OS/2 OMF.
-
-# Tool Specific Properties
-TOOL_GCC3OMF_CC  ?= gcc$(HOSTSUFF_EXE)
-TOOL_GCC3OMF_CXX ?= g++$(HOSTSUFF_EXE)
-TOOL_GCC3OMF_AS  ?= gcc$(HOSTSUFF_EXE)
-TOOL_GCC3OMF_AR  ?= emxomfar$(HOSTSUFF_EXE)
-TOOL_GCC3OMF_AR_IMP ?= emximp$(HOSTSUFF_EXE)
-TOOL_GCC3OMF_LD ?= gcc$(HOSTSUFF_EXE)
-TOOL_GCC3OMF_LD_SYSMOD ?= gcc$(HOSTSUFF_EXE)
-ifndef TOOL_GCC3OMF_LDFLAGS.$(BUILD_TARGET)
-TOOL_GCC3OMF_LDFLAGS.dll ?= -shared -Zdll
+TOOL_VAC308 := VisualAge for C++ v3.08
+
+TOOL_VAC308_ENV_SETUP ?=
+
+# Determin VAC308 location.
+ifndef PATH_TOOL_VAC308
+ PATH_TOOL_VAC308 := $(wildcard $(PATH_DEVTOOLS_BLD)/vac/v308*)
+ ifeq ($(PATH_TOOL_VAC308),)
+ PATH_TOOL_VAC308 := $(wildcard $(PATH_DEVTOOLS_TRG)/vac/v308*)
+ endif
+ ifeq ($(PATH_TOOL_VAC308),)
+  PATH_TOOL_VAC308 := $(lastword $(sort $(PATH_TOOL_VAC308)))
+ endif
+ # if not found, we'll enter 'pathless' mode.
 else
-TOOL_GCC3OMF_LDFLAGS.dll ?= $(TOOL_GCC3OMF_LDFLAGS.$(BUILD_TARGET))
+ # Resolve any fancy stuff once and for all.
+ PATH_TOOL_VAC308 := $(PATH_TOOL_VAC308)
 endif
-TOOL_GCC3OMF_LDFLAGS.sysmod ?= -nostdlib
-TOOL_GCC3OMF_LD_MAP ?= -Zmap=$(1)
-TOOL_GCC3OMF_LD_SYSMOD_MAP ?= -Zmap=$(1)
-
-ifdef SLKRUNS
-TOOL_GCC3OMF_CC  += -fmessage-length=0
-TOOL_GCC3OMF_CXX += -fmessage-length=0
+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)
+
+else
+ # Pathless, relies on the environment.
+ TOOL_VAC308_CC  ?= icc$(HOSTSUFF_EXE)
+ TOOL_VAC308_CXX ?= icc$(HOSTSUFF_EXE)
+ TOOL_VAC308_AR  ?= ilib$(HOSTSUFF_EXE)
+ TOOL_VAC308_LD  ?= icc$(HOSTSUFF_EXE)
+ TOOL_VAC308_RC  ?= rc$(HOSTSUFF_EXE)
+
 endif
 
+# More tool specific properties.
+# Note: implib isn't really a part of VAC308.
+TOOL_VAC308_IMP              ?= implib$(HOSTSUFF_EXE)
+TOOL_VAC308_IMPFLAGS         ?= /nologo /noignorecase
+
 # General Properties used by kBuild
-TOOL_GCC3OMF_COBJSUFF         ?= .o
-TOOL_GCC3OMF_CFLAGS           ?= -Zomf
-TOOL_GCC3OMF_CFLAGS.debug     ?= -g
-TOOL_GCC3OMF_CFLAGS.profile   ?= -O2 #-g -pg
-TOOL_GCC3OMF_CFLAGS.release   ?= -O2
-TOOL_GCC3OMF_CINCS            ?=
-TOOL_GCC3OMF_CDEFS            ?=
-
-TOOL_GCC3OMF_CXXOBJSUFF       ?= .o
-TOOL_GCC3OMF_CXXOBJSUFF       ?= .o
-TOOL_GCC3OMF_CXXFLAGS         ?= -Zomf
-TOOL_GCC3OMF_CXXFLAGS.debug   ?= -g
-TOOL_GCC3OMF_CXXFLAGS.profile ?= -O2 #-g -pg
-TOOL_GCC3OMF_CXXFLAGS.release ?= -O2
-TOOL_GCC3OMF_CXXINCS          ?=
-TOOL_GCC3OMF_CXXDEFS          ?=
-
-TOOL_GCC3OMF_ASFLAGS          ?= -x assembler-with-cpp -Zomf
-TOOL_GCC3OMF_ASFLAGS.debug    ?= -g
-TOOL_GCC3OMF_ASFLAGS.profile  ?= -g
-TOOL_GCC3OMF_ASOBJSUFF        ?= .obj
-
-TOOL_GCC3OMF_ARFLAGS          ?= cr
-TOOL_GCC3OMF_ARLIBSUFF        ?= .lib
-
-TOOL_GCC3OMF_LDFLAGS          ?= -Zomf
-TOOL_GCC3OMF_LDFLAGS.debug    ?= -g
-TOOL_GCC3OMF_LDFLAGS.profile  ?= -g
+TOOL_VAC308_COBJSUFF         ?= .obj
+TOOL_VAC308_CFLAGS           ?= -Q+
+TOOL_VAC308_CFLAGS.debug     ?= -Ti+
+TOOL_VAC308_CFLAGS.release   ?= -O
+TOOL_VAC308_CINCS            ?=
+TOOL_VAC308_CDEFS            ?=
+
+TOOL_VAC308_CXXOBJSUFF       ?= .obj
+TOOL_VAC308_CXXFLAGS         ?= -Q+
+TOOL_VAC308_CXXFLAGS.debug   ?= -Ti
+TOOL_VAC308_CXXFLAGS.release ?= -O
+TOOL_VAC308_CXXINCS          ?=
+TOOL_VAC308_CXXDEFS          ?=
+
+TOOL_VAC308_ARFLAGS          ?= /nologo /noignorecase
+TOOL_VAC308_ARLIBSUFF        ?= .lib
+
+TOOL_VAC308_LDFLAGS          ?= -Q+
+TOOL_VAC308_LDFLAGS.debug    ?= -Ti+
+
 
 
@@ -93 +105 @@
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
 # @param    $(objsuff)  Object suffix.
-TOOL_GCC3OMF_COMPILE_C_DEPEND =
-TOOL_GCC3OMF_COMPILE_C_DEPORD =
-ifdef USE_KOBJCACHE
-TOOL_GCC3OMF_COMPILE_C_USES_KOBJCACHE = 1
-TOOL_GCC3OMF_COMPILE_C_OUTPUT = $(outbase).i
-define TOOL_GCC3OMF_COMPILE_C_CMDS
-        $(QUIET)$(KOBJCACHE) -f $(outbase).koc -d $(PATH_OBJCACHE) -t $(bld_trg).$(bld_trg_arch) -p\
-                --kObjCache-cpp $(outbase).i\
-                $(TOOL_GCC3OMF_CC) -E -o -\
-                $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
-                -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
-                $(abspath $(source))\
-                --kObjCache-cc $(obj)\
-                $(TOOL_GCC3OMF_CC) -c\
-                $(flags) -fpreprocessed -x c\
-                -o $(obj)\
-                -
-endef
-else # !USE_KOBJCACHE
-TOOL_GCC3OMF_COMPILE_C_OUTPUT =
-define TOOL_GCC3OMF_COMPILE_C_CMDS
-        $(QUIET)$(TOOL_GCC3OMF_CC) -c\
-                $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
-                -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP \
-                -o $(obj)\
+TOOL_VAC308_COMPILE_C_DEPEND =
+TOOL_VAC308_COMPILE_C_DEPORD =
+TOOL_VAC308_COMPILE_C_OUTPUT =
+define TOOL_VAC308_COMPILE_C_CMDS
+        $(QUIET) $(TOOL_VAC308_ENV_SETUP) $(TOOL_VAC308_CC) -c\
+                $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
+                -Fo$(obj)\
                 $(abspath $(source))
-endef
-endif # !USE_KOBJCACHE
+        $(QUIET) $(TOOL_VAC308_ENV_SETUP) $(TOOL_VAC308_CC) -P+ -Pd+ \
+                $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
+                $(abspath $(source)) \
+                | $(DEP_PRE) -f -s -o $(dep) -t $(obj) -
+endef
 
 
@@ -136 +133 @@
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
 # @param    $(objsuff)  Object suffix.
-TOOL_GCC3OMF_COMPILE_CXX_DEPEND =
-TOOL_GCC3OMF_COMPILE_CXX_DEPORD =
-ifdef USE_KOBJCACHE
-TOOL_GCC3OMF_COMPILE_CXX_USES_KOBJCACHE = 1
-TOOL_GCC3OMF_COMPILE_CXX_OUTPUT = $(outbase).ii
-define TOOL_GCC3OMF_COMPILE_CXX_CMDS
-        $(QUIET)$(KOBJCACHE) -f $(outbase).koc -d $(PATH_OBJCACHE) -t $(bld_trg).$(bld_trg_arch) -p\
-                --kObjCache-cpp $(outbase).ii\
-                $(TOOL_GCC3OMF_CXX) -E -o -\
-                $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
-                -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
-                $(abspath $(source))\
-                --kObjCache-cc $(obj)\
-                $(TOOL_GCC3OMF_CXX) -c\
-                $(flags) -fpreprocessed -x c++\
-                -o $(obj)\
-                -
-endef
-else # !USE_KOBJCACHE
-TOOL_GCC3OMF_COMPILE_CXX_OUTPUT =
-define TOOL_GCC3OMF_COMPILE_CXX_CMDS
-        $(QUIET)$(TOOL_GCC3OMF_CXX) -c\
-                $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
-                -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP \
-                -o $(obj)\
+TOOL_VAC308_COMPILE_CXX_DEPEND =
+TOOL_VAC308_COMPILE_CXX_DEPORD =
+TOOL_VAC308_COMPILE_CXX_OUTPUT =
+define TOOL_VAC308_COMPILE_CXX_CMDS
+        $(QUIET) $(TOOL_VAC308_ENV_SETUP) $(TOOL_VAC308_CXX) -c\
+                $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
+                -Fo$(obj)\
                 $(abspath $(source))
-endef
-endif # !USE_KOBJCACHE
-
-
-## Compile Assembly source.
-# @param    $(target)   Normalized main target name.
-# @param    $(source)   Source filename (relative).
-# @param    $(obj)      Object file name. This shall be (re)created by the compilation.
-# @param    $(dep)      Dependcy file. This shall be (re)created by the compilation.
-# @param    $(flags)    Flags.
-# @param    $(defs)     Definitions. No -D or something.
-# @param    $(incs)     Includes. No -I or something.
-# @param    $(dirdep)   Directory creation dependency.
-# @param    $(deps)     Other dependencies.
-# @param    $(outbase)  Output basename (full). Use this for list files and such.
-# @param    $(objsuff)  Object suffix.
-#
-TOOL_GCC3OMF_COMPILE_AS_OUTPUT =
-TOOL_GCC3OMF_COMPILE_AS_DEPEND =
-TOOL_GCC3OMF_COMPILE_AS_DEPORD =
-define TOOL_GCC3OMF_COMPILE_AS_CMDS
-        $(QUIET)$(TOOL_GCC3OMF_AS) -c\
-                $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
-                -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
-                -o $(obj)\
-                $(abspath $(source))
+        $(QUIET) $(TOOL_VAC308_ENV_SETUP) $(TOOL_VAC308_CXX) -P+ -Pd+ \
+                $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
+                $(abspath $(source)) \
+                | $(DEP_PRE) -f -s -o $(dep) -t $(obj) -
 endef
 
@@ -201 +158 @@
 #
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
-TOOL_GCC3OMF_LINK_LIBRARY_OUTPUT = $(outbase).rsp
-TOOL_GCC3OMF_LINK_LIBRARY_DEPEND = $(othersrc)
-TOOL_GCC3OMF_LINK_LIBRARY_DEPORD =
-define TOOL_GCC3OMF_LINK_LIBRARY_CMDS
-        $(if $(filter %.def %.imp,$(othersrc))\
-                ,$(QUIET)$(APPEND) -n $(outbase).rsp $(filter %.def %.imp,$(othersrc))\
-                 $(NL)$(TAB)$(QUIET)$(QUIET)$(TOOL_GCC3OMF_AR_IMP) -o $(out) @$(outbase).rsp\
-                 $(NL)$(TAB)$(QUIET)$(RM) -f $(outbase).rsp)
-        $(QUIET)$(APPEND) -n $(outbase).rsp $(flags) $(out) $(objs) $(filter-out %.def %.imp,$(othersrc))
-        $(TOOL_GCC3OMF_AR) @$(outbase).rsp
+TOOL_VAC308_LINK_LIBRARY_OUTPUT = $(outbase).rsp
+TOOL_VAC308_LINK_LIBRARY_DEPEND = $(othersrc)
+TOOL_VAC308_LINK_LIBRARY_DEPORD =
+define TOOL_VAC308_LINK_LIBRARY_CMDS
+        $(if $(strip $(othersrc)),\
+                $(QUIET)$(TOOL_VAC308_ENV_SETUP) \
+                $(TOOL_VAC308_IMP) $(TOOL_VAC308_IMPFLAGS) $(subst /,\\,$(out)) $(subst /,\\,$(othersrc)) )
+        $(if $(strip $(objs)),$(QUIET)$(TOOL_VAC308_ENV_SETUP) \
+                $(QUIET)$(TOOL_VAC308_ENV_SETUP) \
+                $(TOOL_VAC308_AR) $(flags) $(subst /,\\,$(out)) $(foreach obj,$(subst /,\\,$(objs)),+"$(obj)") ";" )
 endef
 
@@ -228 +185 @@
 #
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
-TOOL_GCC3OMF_LINK_PROGRAM_OUTPUT = $(outbase).map $(outbase).rsp
-TOOL_GCC3OMF_LINK_PROGRAM_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
-TOOL_GCC3OMF_LINK_PROGRAM_DEPORD =
-define TOOL_GCC3OMF_LINK_PROGRAM_CMDS
-        $(QUIET)$(APPEND) -n $(outbase).rsp\
-                $(flags)\
-                -o $(out)\
-                $(objs)\
-                $(foreach p,$(libpath), -L$(p))\
-                $(othersrc)\
-                $(foreach lib,$(libs), $(if $(findstring $(lib),$(subst /,x,$(lib))), -l$(patsubst lib%,%,$(basename $(lib))), $(lib)))\
-                -Zmap=$(outbase).map
-        $(QUIET)$(TOOL_GCC3OMF_LD) @$(outbase).rsp
+TOOL_VAC308_LINK_PROGRAM_OUTPUT = $(outbase).map
+TOOL_VAC308_LINK_PROGRAM_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
+TOOL_VAC308_LINK_PROGRAM_DEPORD =
+define TOOL_VAC308_LINK_PROGRAM_CMDS
+        $(QUIET)$(TOOL_VAC308_ENV_SETUP) \
+        $(if $(strip $(libpath)),LIB="$(subst ; ,;,$(foreach lp,$(libpath),$(lp);))$(LIB)") \
+                $(TOOL_VAC308_LD) $(flags) -Fe$(out) -Fm$(outbase).map $(objs) $(libs) $(othersrc)
 endef
 
@@ -258 +209 @@
 #
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
-TOOL_GCC3OMF_LINK_DLL_OUTPUT = $(outbase).map $(outbase).rsp
-TOOL_GCC3OMF_LINK_DLL_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
-TOOL_GCC3OMF_LINK_DLL_DEPORD =
-define TOOL_GCC3OMF_LINK_DLL_CMDS
-        $(QUIET)$(APPEND) -n $(outbase).rsp\
-                $(TOOL_GCC3OMF_LDFLAGS.dll)\
-                $(flags)\
-                -o $(out)\
-                $(objs)\
-                $(foreach p,$(libpath), -L$(p))\
-                $(othersrc)\
-                $(foreach lib,$(libs), $(if $(findstring $(lib),$(subst /,x,$(lib))), -l$(patsubst lib%,%,$(basename $(lib))), $(lib)))\
-                -Zmap=$(outbase).map
-        $(TOOL_GCC3OMF_LD) @$(outbase).rsp
+TOOL_VAC308_LINK_DLL_OUTPUT = $(outbase).map
+TOOL_VAC308_LINK_DLL_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
+TOOL_VAC308_LINK_DLL_DEPORD =
+define TOOL_VAC308_LINK_DLL_CMDS
+        $(QUIET)$(TOOL_VAC308_ENV_SETUP) \
+        $(if $(strip $(libpath)),LIB="$(subst ; ,;,$(foreach lp,$(libpath),$(lp);))$(LIB)") \
+                $(TOOL_VAC308_LD) /B"/DLL" $(flags) -Fe$(out) -Fm$(outbase).map $(objs) $(libs) $(othersrc)
 endef
 
@@ -289 +233 @@
 #
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
-TOOL_GCC3OMF_LINK_SYSMOD_OUTPUT = $(outbase).map $(outbase).rsp
-TOOL_GCC3OMF_LINK_SYSMOD_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
-TOOL_GCC3OMF_LINK_SYSMOD_DEPORD =
-define TOOL_GCC3OMF_LINK_SYSMOD_CMDS
-        $(QUIET)$(APPEND) -n $(outbase).rsp\
-                $(TOOL_GCC3OMF_LDFLAGS.sysmod)\
-                $(flags)\
-                -o $(out)\
-                $(objs)\
-                $(foreach p,$(libpath), -L$(p))\
-                $(othersrc)\
-                $(foreach lib,$(libs), $(if $(findstring $(lib),$(subst /,x,$(lib))), -l$(patsubst lib%,%,$(basename $(lib))), $(lib)))\
-                -Zmap=$(outbase).map
-        $(QUIET)$(TOOL_GCC3OMF_LD_SYSMOD) @$(outbase).rsp
-endef
-
+TOOL_VAC308_LINK_SYSMOD_OUTPUT = $(outbase).map
+TOOL_VAC308_LINK_SYSMOD_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
+TOOL_VAC308_LINK_SYSMOD_DEPORD =
+define TOOL_VAC308_LINK_SYSMOD_CMDS
+        $(QUIET)$(TOOL_VAC308_ENV_SETUP) \
+        $(if $(strip $(libpath)),LIB="$(subst ; ,;,$(foreach lp,$(libpath),$(lp);))$(LIB)") \
+                $(TOOL_VAC308_LD) $(flags) -Fe$(out)  -Fm$(outbase).map $(objs) $(libs) $(othersrc)
+endef
+