vxWorks compilation almost working.

We need to pass proper -D and -I flags to compiler.

darcs-hash:20061018225321-f2ef6-c40923580e745c2f8a64018fa88be2216681bc8b.gz

diff --git a/snippets/vxworks b/snippets/vxworks
index f0431cd2c3e9d254b2721fc3f9e12f475cb95b67..7187bf3039a564ffaa6a31e9dcfa9dd9f8930664 100644 (file)
--- a/snippets/vxworks
+++ b/snippets/vxworks
@@ -1,7 +1,3 @@
-
-#TODO: Asi je potreba pouzit wrenv.sh utilitku!!!
-
-
 # Some support to serialize some targets for parallel make
 ifneq ($(OMK_SERIALIZE_INCLUDED),y)
 include-pass: $(check-dir)
@@ -17,8 +13,7 @@ endif
 
 
 BUILD_ROOT=$(USER_OBJS_DIR)
-WIND_HOST_TYPE := $(shell $(WIND_BASE)/host/resource/wind_host_type)
-export BUILD_ROOT WIND_HOST_TYPE
+export BUILD_ROOT
 #OBJ_DIR - mozna taky nejak nastavit
 
 USER_SOURCES2OBJS = .o/.c .o/.cc .o/.cxx .o/.o
@@ -45,11 +40,11 @@ USER_SOURCES += $$($(1)_SOURCES)
 
 $(2)/$(1): $$($(1)_OBJS)
        @$(QUIET_CMD_ECHO) "  LINK    $$@"
-       @echo "EXE = $(1).vxe" > Makefile.vxe.$(1); \
-       echo "OBJS = $(1)_OBJS" >> Makefile.vxe.$(1); \
-       echo "VXE_DIR = $(2)" >> Makefile.vxe.$(1); \
-       echo "include $(WIND_BASE)/target/usr/make/rules.rtp" >> Makefile.vxe.$(1); \
-       $(MAKE)  CPU=$(CPU) TOOL=$(TOOL) -f Makefile.vxe.$(1)
+       @echo 'EXE = $(1).vxe' > Makefile.vxe.$(1); \
+       echo 'OBJS = $(1)_OBJS' >> Makefile.vxe.$(1); \
+       echo 'VXE_DIR = $(2)' >> Makefile.vxe.$(1); \
+       echo 'include $$$$(WIND_USR)/make/rules.rtp' >> Makefile.vxe.$(1); \
+       $(WRENV) -p $(WRPACKAGE) $(MAKE)  CPU=$(CPU) TOOL=$(TOOL) -f Makefile.vxe.$(1)
 #      $(Q) $$(shell if [ -z "$$(filter %.cc,$$($(1)_SOURCES:%.cxx=%.cc))" ] ; then echo $$(CC) ; else echo $$(CXX) ; fi) \
 #        $$($(1)_OBJS) $$($(1)_LIBS:%=-l%) $$(LOADLIBES) $$(LDFLAGS) -Wl,-Map,$(USER_OBJS_DIR)/$(1).exe.map -o $(2)/$(1)
 #      @echo "$(2)/$(1): \\" >$(USER_OBJS_DIR)/$(1).exe.d
@@ -79,12 +74,12 @@ USER_SOURCES += $$($(1)_SOURCES)
 
 $(USER_LIB_DIR)/lib$(1).a: #$$($(1)_OBJS)
        @$(QUIET_CMD_ECHO) "  LIB     $$@"
-       @echo "LIB_BASE_NAME = $(1)" > Makefile.lib.$(1); \
-       echo "OBJS = $$($(1)_OBJS)" >> Makefile.lib.$(1); \
-       echo "LIB_ROOT = $(USER_LIB_DIR)" >> Makefile.lib.$(1); \
-       echo "VPATH = $(SOURCES_DIR)" >> Makefile.lib.$(1); \
-       echo "include $(WIND_BASE)/target/usr/make/rules.library" >> Makefile.lib.$(1); \
-       $(MAKE) CPU=$(CPU) TOOL=$(TOOL) -f Makefile.lib.$(1)
+       @echo 'LIB_BASE_NAME = $(1)' > Makefile.lib.$(1); \
+       echo 'OBJS = $$($(1)_OBJS)' >> Makefile.lib.$(1); \
+       echo 'LIB_ROOT = $(USER_LIB_DIR)' >> Makefile.lib.$(1); \
+       echo 'VPATH = $(SOURCES_DIR)' >> Makefile.lib.$(1); \
+       echo 'include $$$$(WIND_USR)/make/rules.library' >> Makefile.lib.$(1); 
+       $(WRENV) -p $(WRPACKAGE) $(MAKE) CPU=$(CPU) TOOL=$(TOOL) -f Makefile.lib.$(1)
 endef
 
 

diff --git a/snippets/vxworks-setup b/snippets/vxworks-setup
index 65a83fa659521efa99db5dfa3cc40c3456bbb6ae..67e01637b2afce8a63264e1b2f7e836e9f653157 100644 (file)
--- a/snippets/vxworks-setup
+++ b/snippets/vxworks-setup
@@ -2,8 +2,11 @@
 # Include VxWorks target configuration containig definition of these
 # variables: WIND_BASE CPU TOOL
 include $(MAKERULES_DIR)/config.target
-ifndef WIND_BASE
-$(error WIND_BASE not defined in config.target)
+ifndef WRENV
+$(error WRENV not defined in config.target)
+endif
+ifndef WRPACKAGE
+$(error WRPACKAGE not defined in config.target)
 endif
 ifndef CPU
 $(error CPU not defined in config.target)
@@ -11,10 +14,6 @@ endif
 ifndef TOOL
 $(error TOOL not defined in config.target)
 endif
-WIND_USR ?= $(WIND_BASE)/target/usr
-export WIND_USR WIND_BASE CPU TOOL
-
-# TODO: Set OBJ_DIR for VxWorks Makefile
 
 BUILD_DIR_NAME = _build/$(CPU)$(TOOL)
 COMPILED_DIR_NAME = _compiled/$(CPU)$(TOOL)

diff --git a/tests/vxworks/config.target b/tests/vxworks/config.target
index 8892df9f89e6d4b6e2e3747ff22dbb0f5bc963df..fd84dfa7995eb90c413e8d1cd015f948b139d23a 100644 (file)
--- a/tests/vxworks/config.target
+++ b/tests/vxworks/config.target
@@ -1,3 +1,5 @@
 CPU=SIMPENTIUM
 TOOL=diab
-WIND_BASE=~/opt/WindRiver/vxworks-6.1
+WRENV = ~/opt/WindRiver/wrenv.sh
+WRPACKAGE = vxworks-6.1
+