Makefile cleanup (COVESA#652)

Removing some targets not used

Signed-off-by: Erik Jaegervall <erik.jaegervall@se.bosch.com>

.github/workflows/buildcheck.yml

@@ -38,7 +38,7 @@ jobs:
  - name: Test mandatory targets
  run: |
  pipenv install
- pipenv run make travis_targets
+ pipenv run make mandatory_targets
  env:
  PIPENV_PIPFILE: ./vss-tools/Pipfile
  PIPENV_VENV_IN_PROJECT: 1
@@ -54,7 +54,7 @@ jobs:
  - name: Test optional targets. NOTE - always succeeds
  run: |
  pipenv install
- pipenv run make -k travis_optional || true
+ pipenv run make -k optional_targets || true
  env:
  PIPENV_PIPFILE: ./vss-tools/Pipfile
  PIPENV_VENV_IN_PROJECT: 1

Makefile

@@ -2,24 +2,22 @@
 # Makefile to generate specifications
 #
 
-.PHONY: clean all travis_targets json franca yaml csv ddsidl tests binary protobuf ttl graphql ocf c install overlays
+.PHONY: clean all mandatory_targets json franca yaml csv ddsidl tests binary protobuf ttl graphql ocf c overlays
 
 all: clean json franca yaml csv ddsidl binary tests protobuf graphql overlays ttl
 
 # All mandatory targets that shall be built and pass on each pull request for
 # vehicle-signal-specification or vss-tools
-travis_targets: clean json franca yaml binary csv graphql ddsidl overlays tests tar
-
+mandatory_targets: clean json franca yaml binary csv graphql ddsidl overlays tests
 
 # Additional targets that shall be built by travis, but where it is not mandatory
 # that the builds shall pass.
 # This is typically intended for less maintainted tools that are allowed to break
 # from time to time
-# Can be run from e.g. travis with "make -k travis_optional || true" to continue
+# 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
-travis_optional: clean protobuf ttl
+optional_targets: clean protobuf ttl
 
-DESTDIR?=/usr/local
 TOOLSDIR?=./vss-tools
 
 json:
@@ -58,20 +56,6 @@ graphql:
 ttl:
  ${TOOLSDIR}/contrib/vspec2ttl/vspec2ttl.py -I ./spec -u ./spec/units.yaml ./spec/VehicleSignalSpecification.vspec vss_rel_$$(cat VERSION).ttl
 
-# 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.
-# As of today all artifacts generated for release shall include UUID if supported.
-# Note: From VSS 3.1 individual files are uploaded instead of tar file, but this command kept for now anyway
-tar:
- tar -czvf vss_rel_$$(cat VERSION).tar.gz vss_rel_$$(cat VERSION).json vss_rel_$$(cat VERSION).fidl vss_rel_$$(cat VERSION).yaml \
- vss_rel_$$(cat VERSION).csv vss_rel_$$(cat VERSION).graphql.ts vss_rel_$$(cat VERSION).idl
-
 clean:
+ rm -f ${TOOLSDIR}/binary/binarytool.so
  rm -f vss_rel_*
-
-install:
- git submodule init
- git submodule update
- (cd ${TOOLSDIR}/; python3 setup.py install --install-scripts=${DESTDIR}/bin)
- install -d ${DESTDIR}/share/vss
- (cd spec; cp -r * ${DESTDIR}/share/vss)