Skip to content

Commit

Permalink
Updating vss-tools and adapting Makefile
Browse files Browse the repository at this point in the history 
With recent changes in vss-tools some minor changes are needed:

- vspec2graphql has nevered cared about --uuid, but now it does not accept it
- The franca -v argument has been renamed to avoid conflcit with -vt

Signed-off-by: Erik Jaegervall <[email protected]>
  • Loading branch information
@erikbosch
erikbosch committed May 6, 2024
1 parent 1d842cb commit f53b3c5
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jsonschema:
${TOOLSDIR}/vspec2jsonschema.py -I ./spec --uuid -u ./spec/units.yaml ./spec/VehicleSignalSpecification.vspec vss_rel_$$(cat VERSION).jsonschema

franca:
${TOOLSDIR}/vspec2franca.py -v $$(cat VERSION) -I ./spec --uuid -u ./spec/units.yaml ./spec/VehicleSignalSpecification.vspec vss_rel_$$(cat VERSION).fidl
${TOOLSDIR}/vspec2franca.py --franca-vss-version $$(cat VERSION) -I ./spec --uuid -u ./spec/units.yaml ./spec/VehicleSignalSpecification.vspec vss_rel_$$(cat VERSION).fidl

yaml:
${TOOLSDIR}/vspec2yaml.py -I ./spec --uuid -u ./spec/units.yaml ./spec/VehicleSignalSpecification.vspec vss_rel_$$(cat VERSION).yaml
Expand All @@ -57,7 +57,7 @@ protobuf:
${TOOLSDIR}/vspec2protobuf.py -I ./spec -u ./spec/units.yaml ./spec/VehicleSignalSpecification.vspec vss_rel_$$(cat VERSION).proto

graphql:
${TOOLSDIR}/vspec2graphql.py -I ./spec --uuid -u ./spec/units.yaml ./spec/VehicleSignalSpecification.vspec vss_rel_$$(cat VERSION).graphql.ts
${TOOLSDIR}/vspec2graphql.py -I ./spec -u ./spec/units.yaml ./spec/VehicleSignalSpecification.vspec vss_rel_$$(cat VERSION).graphql.ts

ttl:
${TOOLSDIR}/contrib/vspec2ttl/vspec2ttl.py -I ./spec -u ./spec/units.yaml ./spec/VehicleSignalSpecification.vspec vss_rel_$$(cat VERSION).ttl
Expand Down
2 changes: 1 addition & 1 deletion vss-tools
Submodule vss-tools updated 86 files
+4 −4 .github/workflows/buildcheck.yml
+1 −1 .github/workflows/check-header.yml
+5 −3 .github/workflows/pre-commit.yml
+1 −1 .pre-commit-config.yaml
+11 −9 FAQ.md
+1 −1 README-PYPI.md
+30 −6 README.md
+4 −3 binary/README.md
+29 −8 docs/vspec2id.md
+41 −49 docs/vspec2x.md
+86 −14 docs/vspec2x_arch.md
+2 −2 setup.py
+58 −0 tests/backward_compatibility/test_compatibility.py
+73 −0 tests/generators/example_generator.py
+34 −0 tests/generators/test.vspec
+30 −0 tests/generators/test_generator.py
+2 −0 tests/model/explicit_units.yaml
+92 −0 tests/model/test_vsstree.py
+1 −0 tests/vspec/.gitignore
+1 −1 tests/vspec/test_multiple_type_trees/test_multiple_type_trees.py
+18 −16 tests/vspec/test_no_expand/test_no_expand.py
+71 −0 tests/vspec/test_node_removal/test_files/test.vspec
+11 −0 tests/vspec/test_node_removal/test_files/test_del_branch_overlay.vspec
+11 −0 tests/vspec/test_node_removal/test_files/test_del_instance_overlay.vspec
+12 −0 tests/vspec/test_node_removal/test_files/test_del_node_overlay.vspec
+11 −0 tests/vspec/test_node_removal/test_files/test_del_wrong_instance_overlay.vspec
+72 −0 tests/vspec/test_node_removal/test_files/test_deleted_branch.vspec
+72 −0 tests/vspec/test_node_removal/test_files/test_deleted_node.vspec
+279 −0 tests/vspec/test_node_removal/test_node_removal.py
+149 −0 tests/vspec/test_overlay_on_instance/expected.json
+7 −1 tests/vspec/test_overlay_on_instance/overlay_1.vspec
+45 −0 tests/vspec/test_overlay_on_instance/overlay_2.vspec
+33 −0 tests/vspec/test_overlay_on_instance/test.vspec
+4 −2 tests/vspec/test_overlay_struct/test_overlay_struct.py
+2 −1 tests/vspec/test_overlay_struct_array/test_overlay_struct_array.py
+68 −30 tests/vspec/test_static_uids/test_static_uids.py
+1 −1 tests/vspec/test_static_uids/test_vspecs/test.vspec
+1 −1 tests/vspec/test_static_uids/test_vspecs/test_added_attribute.vspec
+1 −1 tests/vspec/test_static_uids/test_vspecs/test_datatype.vspec
+1 −1 tests/vspec/test_static_uids/test_vspecs/test_deleted_attribute.vspec
+1 −1 tests/vspec/test_static_uids/test_vspecs/test_deprecation.vspec
+1 −1 tests/vspec/test_static_uids/test_vspecs/test_description.vspec
+1 −1 tests/vspec/test_static_uids/test_vspecs/test_name_datatype.vspec
+1 −1 tests/vspec/test_static_uids/test_vspecs/test_unit.vspec
+1 −1 tests/vspec/test_static_uids/test_vspecs/test_vss_path.vspec
+2 −2 tests/vspec/test_static_uids/validation.yaml
+2 −2 tests/vspec/test_static_uids/validation_vspecs/validation.vspec
+1 −1 tests/vspec/test_static_uids/validation_vspecs/validation_semantic_change_1.vspec
+74 −0 tests/vspec/test_static_uids/validation_vspecs/validation_semantic_change_2.vspec
+2 −1 tests/vspec/test_struct_as_root/test_struct_as_root.py
+38 −0 tests/vspec/test_structs/expected-signals-types.idl
+27 −4 tests/vspec/test_structs/test_commandline.py
+14 −9 tests/vspec/test_structs/test_data_type_parsing.py
+0 −59 tests/vspec/test_types_with_uuid/expected_no_uuid.graphql
+0 −59 tests/vspec/test_types_with_uuid/expected_uuid.graphql
+2 −2 tests/vspec/test_types_with_uuid/test_uuid.py
+20 −0 tests/vspec/test_units.yaml
+24 −2 vspec/__init__.py
+87 −42 vspec/model/constants.py
+218 −101 vspec/model/vsstree.py
+24 −9 vspec/utils/idgen_utils.py
+13 −10 vspec/utils/vss2id_val.py
+53 −0 vspec/vspec2vss_config.py
+188 −0 vspec/vspec2x.py
+38 −0 vspec/vss2x.py
+30 −29 vspec/vssexporters/vss2binary.py
+20 −28 vspec/vssexporters/vss2csv.py
+25 −23 vspec/vssexporters/vss2ddsidl.py
+23 −16 vspec/vssexporters/vss2franca.py
+22 −19 vspec/vssexporters/vss2graphql.py
+72 −60 vspec/vssexporters/vss2id.py
+35 −42 vspec/vssexporters/vss2json.py
+49 −49 vspec/vssexporters/vss2jsonschema.py
+31 −28 vspec/vssexporters/vss2protobuf.py
+24 −30 vspec/vssexporters/vss2yaml.py
+12 −2 vspec2binary.py
+12 −2 vspec2csv.py
+12 −2 vspec2ddsidl.py
+12 −2 vspec2franca.py
+12 −2 vspec2graphql.py
+12 −2 vspec2id.py
+13 −3 vspec2json.py
+12 −2 vspec2jsonschema.py
+12 −2 vspec2protobuf.py
+0 −247 vspec2x.py
+12 −2 vspec2yaml.py

0 comments on commit f53b3c5

Please sign in to comment.