Skip to content

Commit

Permalink
Prepare move of vspec2c and vspec2ocf to obsolete (COVESA#494)
Browse files Browse the repository at this point in the history
Signed-off-by: Erik Jaegervall <erik.jaegervall@se.bosch.com>

Signed-off-by: Erik Jaegervall <erik.jaegervall@se.bosch.com>
  • Loading branch information
erikbosch authored and jdacoello committed Feb 15, 2023
1 parent 871503c commit 73b8e27
Showing 1 changed file with 1 addition and 10 deletions.
11 changes: 1 addition & 10 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ travis_targets: clean json franca yaml binary csv graphql ddsidl overlays tests
# from time to time
# Can be run from e.g. travis with "make -k travis_optional || true" to continue
# even if errors occur and not do not halt travis build if errors occur
travis_optional: clean c ocf protobuf ttl
travis_optional: clean protobuf ttl

DESTDIR?=/usr/local
TOOLSDIR?=./vss-tools
Expand Down Expand Up @@ -55,16 +55,9 @@ protobuf:
graphql:
${TOOLSDIR}/vspec2graphql.py -I ./spec ./spec/VehicleSignalSpecification.vspec vss_rel_$$(cat VERSION).graphql.ts

ocf:
${TOOLSDIR}/contrib/ocf/vspec2ocf.py -I ./spec ./spec/VehicleSignalSpecification.vspec vss_rel_$$(cat VERSION).ocf.json

ttl:
${TOOLSDIR}/contrib/vspec2ttl/vspec2ttl.py -I ./spec ./spec/VehicleSignalSpecification.vspec vss_rel_$$(cat VERSION).ttl

c:
(cd ${TOOLSDIR}/contrib/vspec2c/; make )
PYTHONPATH=${TOOLSDIR} ${TOOLSDIR}/contrib/vspec2c.py -I ./spec ./spec/VehicleSignalSpecification.vspec vss_rel_$$(cat VERSION).h vss_rel_$$(cat VERSION)_macro.h

# Include all offically supported outputs (i.e. those created by travis_targets)
# Exception is binary as it might be target specific and library anyway needs to be rebuilt
tar:
Expand All @@ -73,12 +66,10 @@ tar:

clean:
rm -f vss_rel_*
(cd ${TOOLSDIR}/contrib/vspec2c/; make clean)

install:
git submodule init
git submodule update
(cd ${TOOLSDIR}/; python3 setup.py install --install-scripts=${DESTDIR}/bin)
$(MAKE) DESTDIR=${DESTDIR} -C ${TOOLSDIR}/vspec2c install
install -d ${DESTDIR}/share/vss
(cd spec; cp -r * ${DESTDIR}/share/vss)

0 comments on commit 73b8e27

Please sign in to comment.