diff --git a/.github/workflows/vspec2aasigproperties.yml b/.github/workflows/vspec2aasigproperties.yml deleted file mode 100644 index 2abedb4c..00000000 --- a/.github/workflows/vspec2aasigproperties.yml +++ /dev/null @@ -1,45 +0,0 @@ -name: AA code generation quick build Check - -on: [push, pull_request] - -jobs: - quickbuild: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - - name: Setup Python - uses: actions/setup-python@v1 - with: - python-version: 3.8 - - - name: Install dependencies - run: | - python -V - pip install -r requirements.txt - python setup.py -q install - - - name: Prepare vss-tools inside VSS - run: | - # Go up to parent dir and fetch VSS (master branch) there - cd .. - git clone https://github.com/GENIVI/vehicle_signal_specification - - # In the parent dir we should find our dir, i.e. vss-tools with - # the version that is being tested now. Put that inside of VSS - # dir where it is expected to be. - # (Later jobs fail if we remove the working dir entirely, so copy instead of move) - rm -rf vehicle_signal_specification/vss-tools - cp -a vss-tools vehicle_signal_specification/ - - - name: Test mandatory targets - run: | - # "Our" version of vss-tools was prepared inside VSS => go there and run tests - cd ../vehicle_signal_specification - make travis_targets - - - name: Test optional targets. NOTE - always succeeds - run: | - cd ../vehicle_signal_specification - make -k travis_optional || true - diff --git a/.gitignore b/.gitignore index 07844c9e..da6559c0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ -<<<<<<< HEAD # Byte-compiled / optimized / DLL files __pycache__/ *.py[cod] @@ -96,10 +95,3 @@ ENV/ # IDE .idea .vscode -======= -*.cpp -*.csv -.vscode -__pycache__ -*.pyc ->>>>>>> 3eec52a (Second draft version of the converter.) diff --git a/README.md b/README.md index 780a0dc7..458281e1 100644 --- a/README.md +++ b/README.md @@ -142,23 +142,3 @@ This repository is set up to use pre-commit hooks. After you clone the project, ## Building and installing with Pip For usage of VSS-Tools with Pip (PyPI) please see [README-PYPI.md](README-PYPI.md) -## 5. CPP adaptation code generation -You can run the CPP generator with following parameters: -``` -python contrib/vspec2aaproperties/vspec2aaprop.py ../spec/VehicleSignalSpecification.vspec contrib/vspec2aaproperties/vspec2prop_mapping.yml contrib/vspec2aaproperties/types.hal android_vhal_mapping_cpp.tpl test.cpp -``` -## 5. CPP adaptation code generation -You can run the CPP generator with following parameters: -``` -./test.sh -``` - -The script runs the following generator -python3 contrib/vspec2aaproperties/vspec2aaprop.py ../spec/VehicleSignalSpecification.vspec contrib/vspec2aaproperties/vspec2prop_mapping.yml contrib/vspec2aaproperties/types.hal android_vhal_mapping_cpp.tpl test.cpp -contrib/vspec2aaproperties/vspec2aaprop.py: Generator host python code. Code uses Jinja2 to actual conversion. -../spec/VehicleSignalSpecification.vspec: VSS. Used to grab the VSS variable type for the items. -contrib/vspec2aaproperties/vspec2prop_mapping.yml: YAML representation of the VSS-Android VHAL mapping with scaling/complex conversions. -contrib/vspec2aaproperties/types.hal: Android header for the VHAL. Used to grab the Android variable type for the items. -android_vhal_mapping_cpp.tpl: Actual Jinja2 generator for generating the CPP conversion code. -test.cpp: Output CPP file. - diff --git a/contrib/vspec2aaproperties/README.md b/obsolete/vspec2aaproperties/README.md similarity index 100% rename from contrib/vspec2aaproperties/README.md rename to obsolete/vspec2aaproperties/README.md diff --git a/contrib/vspec2aaproperties/read_mapping_layer.py b/obsolete/vspec2aaproperties/read_mapping_layer.py similarity index 100% rename from contrib/vspec2aaproperties/read_mapping_layer.py rename to obsolete/vspec2aaproperties/read_mapping_layer.py diff --git a/contrib/vspec2aaproperties/read_type_layer.py b/obsolete/vspec2aaproperties/read_type_layer.py similarity index 100% rename from contrib/vspec2aaproperties/read_type_layer.py rename to obsolete/vspec2aaproperties/read_type_layer.py diff --git a/requirements.txt b/obsolete/vspec2aaproperties/requirements.txt similarity index 100% rename from requirements.txt rename to obsolete/vspec2aaproperties/requirements.txt diff --git a/contrib/vspec2aaproperties/templates/android_vhal_mapping_cpp.j2 b/obsolete/vspec2aaproperties/templates/android_vhal_mapping_cpp.j2 similarity index 100% rename from contrib/vspec2aaproperties/templates/android_vhal_mapping_cpp.j2 rename to obsolete/vspec2aaproperties/templates/android_vhal_mapping_cpp.j2 diff --git a/contrib/vspec2aaproperties/templates/android_vhal_mapping_cpp.tpl b/obsolete/vspec2aaproperties/templates/android_vhal_mapping_cpp.tpl similarity index 100% rename from contrib/vspec2aaproperties/templates/android_vhal_mapping_cpp.tpl rename to obsolete/vspec2aaproperties/templates/android_vhal_mapping_cpp.tpl diff --git a/contrib/vspec2aaproperties/type_hal_parser.py b/obsolete/vspec2aaproperties/type_hal_parser.py similarity index 100% rename from contrib/vspec2aaproperties/type_hal_parser.py rename to obsolete/vspec2aaproperties/type_hal_parser.py diff --git a/contrib/vspec2aaproperties/typemap.yml b/obsolete/vspec2aaproperties/typemap.yml similarity index 100% rename from contrib/vspec2aaproperties/typemap.yml rename to obsolete/vspec2aaproperties/typemap.yml diff --git a/contrib/vspec2aaproperties/types.hal b/obsolete/vspec2aaproperties/types.hal similarity index 100% rename from contrib/vspec2aaproperties/types.hal rename to obsolete/vspec2aaproperties/types.hal diff --git a/contrib/vspec2aaproperties/vspec2aaprop.py b/obsolete/vspec2aaproperties/vspec2aaprop.py similarity index 100% rename from contrib/vspec2aaproperties/vspec2aaprop.py rename to obsolete/vspec2aaproperties/vspec2aaprop.py diff --git a/contrib/vspec2aaproperties/vspec2aaprop_test.sh b/obsolete/vspec2aaproperties/vspec2aaprop_test.sh similarity index 100% rename from contrib/vspec2aaproperties/vspec2aaprop_test.sh rename to obsolete/vspec2aaproperties/vspec2aaprop_test.sh diff --git a/contrib/vspec2aaproperties/vspec2prop_mapping.yml b/obsolete/vspec2aaproperties/vspec2prop_mapping.yml similarity index 100% rename from contrib/vspec2aaproperties/vspec2prop_mapping.yml rename to obsolete/vspec2aaproperties/vspec2prop_mapping.yml diff --git a/contrib/vspec2aaproperties/vspec_helper.py b/obsolete/vspec2aaproperties/vspec_helper.py similarity index 100% rename from contrib/vspec2aaproperties/vspec_helper.py rename to obsolete/vspec2aaproperties/vspec_helper.py diff --git a/contrib/vspec2aaproperties/vss-code-gen-plan.md b/obsolete/vspec2aaproperties/vss-code-gen-plan.md similarity index 100% rename from contrib/vspec2aaproperties/vss-code-gen-plan.md rename to obsolete/vspec2aaproperties/vss-code-gen-plan.md