diff --git a/Makefile b/Makefile index fb80abb2..42df61b4 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,7 @@ mandatory_targets: clean json json-noexpand franca yaml binary csv graphql ddsid # from time to time # Can be run from e.g. travis with "make -k optional_targets || true" to continue # even if errors occur and not do not halt travis build if errors occur -optional_targets: clean protobuf ttl +optional_targets: clean protobuf ttl apigear samm TOOLSDIR?=./vss-tools COMMON_ARGS=-u ./spec/units.yaml --strict @@ -64,6 +64,12 @@ protobuf: graphql: vspec export graphql ${COMMON_ARGS} ${COMMON_VSPEC_ARG} -o vss_rel_$$(cat VERSION).graphql.ts +apigear: + vspec export apigear ${COMMON_ARGS} ${COMMON_VSPEC_ARG} --output-dir apigear + +samm: + vspec export samm ${COMMON_ARGS} ${COMMON_VSPEC_ARG} --target-folder samm + # vspec2ttl does not use common generator framework ttl: ${TOOLSDIR}/contrib/vspec2ttl/vspec2ttl.py -u ./spec/units.yaml ./spec/VehicleSignalSpecification.vspec vss_rel_$$(cat VERSION).ttl @@ -74,3 +80,5 @@ id: clean: cd ${TOOLSDIR}/binary && $(MAKE) clean rm -f vss_rel_* + rm -rf apigear + rm -rf samm diff --git a/vss-tools b/vss-tools index 50b29494..b8985624 160000 --- a/vss-tools +++ b/vss-tools @@ -1 +1 @@ -Subproject commit 50b2949476849d1a050c4ec58108416642e4d0c0 +Subproject commit b8985624c12f1d8cce176a8da4fce87f58de1646