Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updating vss-tools and adapting Makefile #712

Merged
merged 1 commit into from
Feb 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Makefile
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 80 files
+4 −4 .github/workflows/buildcheck.yml
+1 −1 .github/workflows/check-header.yml
+4 −2 .github/workflows/pre-commit.yml
+18 −4 CHANGELOG.md
+1 −1 README-PYPI.md
+4 −5 README.md
+4 −3 binary/README.md
+37 −15 binary/c_parser/cparserlib.c
+2 −0 binary/c_parser/cparserlib.h
+21 −11 binary/go_parser/datamodel/datamodel.go
+20 −3 binary/go_parser/parserlib/parser.go
+29 −8 docs/vspec2id.md
+35 −46 docs/vspec2x.md
+1 −1 setup.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 −1 tests/vspec/test_multiple_type_trees/test_multiple_type_trees.py
+18 −16 tests/vspec/test_no_expand/test_no_expand.py
+2 −2 tests/vspec/test_overlay_struct/test_overlay_struct.py
+1 −1 tests/vspec/test_overlay_struct_array/test_overlay_struct_array.py
+9 −0 tests/vspec/test_quantities.yaml
+73 −35 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
+12 −12 tests/vspec/test_static_uids/validation.yaml
+14 −13 tests/vspec/test_static_uids/validation_vspecs/validation.vspec
+13 −11 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
+1 −1 tests/vspec/test_struct_as_root/test_struct_as_root.py
+69 −0 tests/vspec/test_structs/VehicleDataTypesFlat.vspec
+5 −4 tests/vspec/test_structs/test_commandline.py
+15 −14 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
+19 −10 tests/vspec/test_types_with_uuid/test_uuid.py
+10 −10 tests/vspec/test_units.yaml
+2 −0 tests/vspec/test_units/quantities_no_def.yaml
+13 −4 tests/vspec/test_units/test_units.py
+3 −3 tests/vspec/test_units_no_quantity/expected.json
+17 −0 tests/vspec/test_units_no_quantity/test.vspec
+3 −0 tests/vspec/test_units_no_quantity/test_quantities.yaml
+84 −0 tests/vspec/test_units_no_quantity/test_units_no_quantity.py
+47 −6 vspec/model/constants.py
+25 −14 vspec/model/vsstree.py
+24 −9 vspec/utils/idgen_utils.py
+13 −10 vspec/utils/vss2id_val.py
+50 −0 vspec/vspec2vss_config.py
+180 −0 vspec/vspec2x.py
+38 −0 vspec/vss2x.py
+30 −29 vspec/vssexporters/vss2binary.py
+20 −28 vspec/vssexporters/vss2csv.py
+21 −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
+7 −2 vspec2binary.py
+7 −2 vspec2csv.py
+7 −2 vspec2ddsidl.py
+7 −2 vspec2franca.py
+7 −2 vspec2graphql.py
+12 −2 vspec2id.py
+8 −3 vspec2json.py
+7 −2 vspec2jsonschema.py
+8 −2 vspec2protobuf.py
+0 −239 vspec2x.py
+7 −2 vspec2yaml.py
Loading