Merge pull request #18 from UlfBj/main

Make file update to support the validate keyword.

Makefile

@@ -24,10 +24,11 @@ TOOLSDIR?=./vss-tools
 #COMMON_ARGS=-u ./spec/units.yaml --strict
 COMMON_ARGS= --uuid -u ./spec/units.yaml
 # Default vspec root file if not overridden by command line input.
-VSPECROOT=./spec/VehicleSignalSpecification.vspec
+VSPECROOT=
+VALIDATE=
 
 json:
-	${TOOLSDIR}/vspec2json.py -I ./spec ${COMMON_ARGS} $(VSPECROOT) vss_rel_$$(cat VERSION).json
+	${TOOLSDIR}/vspec2json.py -I ./spec ${COMMON_ARGS} $(VSPECROOT) $(VALIDATE) vss_rel_$$(cat VERSION).json
 
 json-noexpand:
 	${TOOLSDIR}/vspec2json.py -I ./spec ${COMMON_ARGS} --no-expand $(VSPECROOT) vss_rel_$$(cat VERSION)_noexpand.json
@@ -39,10 +40,10 @@ franca:
 	${TOOLSDIR}/vspec2franca.py --franca-vss-version $$(cat VERSION) -I ./spec ${COMMON_ARGS} $(VSPECROOT) vss_rel_$$(cat VERSION).fidl
 
 yaml:
-	${TOOLSDIR}/vspec2yaml.py -I ./spec ${COMMON_ARGS} $(VSPECROOT) vss_rel_$$(cat VERSION).yaml
+	${TOOLSDIR}/vspec2yaml.py -I ./spec ${COMMON_ARGS} $(VSPECROOT) $(VALIDATE) vss_rel_$$(cat VERSION).yaml
 
 csv:
-	${TOOLSDIR}/vspec2csv.py -I ./spec ${COMMON_ARGS} $(VSPECROOT) vss_rel_$$(cat VERSION).csv
+	${TOOLSDIR}/vspec2csv.py -I ./spec ${COMMON_ARGS} $(VSPECROOT) $(VALIDATE) vss_rel_$$(cat VERSION).csv
 
 ddsidl:
 	${TOOLSDIR}/vspec2ddsidl.py -I ./spec ${COMMON_ARGS} $(VSPECROOT) vss_rel_$$(cat VERSION).idl
@@ -59,7 +60,7 @@ tests:
 binary:
 #	cd ${TOOLSDIR}/binary
 	gcc -shared -o ${TOOLSDIR}/binary/binarytool.so -fPIC ${TOOLSDIR}/binary/binarytool.c
-	${TOOLSDIR}/vspec2binary.py ${COMMON_ARGS} $(VSPECROOT) vss_rel_$$(cat VERSION).binary
+	${TOOLSDIR}/vspec2binary.py ${COMMON_ARGS} $(VSPECROOT) $(VALIDATE) vss_rel_$$(cat VERSION).binary
 
 protobuf:
 	${TOOLSDIR}/vspec2protobuf.py -I ./spec ${COMMON_ARGS} $(VSPECROOT) vss_rel_$$(cat VERSION).proto

spec/trees/Vehicle/Bus/Cabin/Cabin.vspec

@@ -148,31 +148,10 @@ Cabin.IsWindowChildLockEngaged:
 
 Cabin.Seat:
   type: branch
+  instances0: x #Seat
+  instances1: x #Seat
   description: All seats.
-
-Cabin.Seat.Row1:
-  type: branch
-  instances: ["Driver"]
-  description: Cabin.Seat.Row1
-#include SingleSeat.vspec Cabin.Seat.Row1
-
-Cabin.Seat.Row2:
-  type: branch
-  instances: ["Left1", "Left2", "Right3", "Right4"]
-  description: Cabin.Seat.Row2
-#include SingleSeat.vspec Cabin.Seat.Row2
-
-Cabin.Seat.Row3:
-  type: branch
-  instances: ["Left1", "Left2", "Right3", "Right4"]
-  description: Cabin.Seat.Row3
-#include SingleSeat.vspec Cabin.Seat.Row3
-
-Cabin.Seat.Row4:
-  type: branch
-  instances: ["Rear1", "Rear2", "Rear3", "Rear4", "Rear5"]
-  description: Cabin.Seat.Row4
-#include SingleSeat.vspec Cabin.Seat.Row4
+#include SingleSeat.vspec Cabin.Seat
 
 #
 # Seat attributes.
@@ -214,4 +193,3 @@ Cabin.Convertible.Status:
 
 #include ../include/PowerOptimize.yaml Cabin
 
-

spec/trees/make.sh

@@ -1,3 +1,4 @@
 #! /usr/bin/bash
-make -C ../../ $1 VSPECROOT=$2
-#make -C ../../ $1 VSPECROOT=./spec/trees/$2
+make -C ../../ $1 VSPECROOT=$2 VALIDATE='-e validate'
+#make -C ../../ $1 VSPECROOT=$2
+