diff options
| author | Jacob Keeler <jacob.keeler@livioradio.com> | 2022-04-13 10:31:56 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-13 10:31:56 -0400 |
| commit | 65947fd1eb30a392948d67003df0fe803c070c6b (patch) | |
| tree | bb3a88b2b132421f8c0c157c592e617af99b55fd /tools | |
| parent | 68f082169e0a40fccd9eb0db3c83911c28870f07 (diff) | |
| parent | 6b423eb0a2b01600d399cad18f789a7dfbcc83af (diff) | |
| download | sdl_core-65947fd1eb30a392948d67003df0fe803c070c6b.tar.gz | |
Merge pull request #3872 from smartdevicelink/release/8.1.08.1.0
Release 8.1.0
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/cmake/helpers/generators.cmake | 6 | ||||
| -rwxr-xr-x | tools/infrastructure/collect_coverage.sh | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/tools/cmake/helpers/generators.cmake b/tools/cmake/helpers/generators.cmake index 1a5a4b8fa1..ae315ab1c6 100644 --- a/tools/cmake/helpers/generators.cmake +++ b/tools/cmake/helpers/generators.cmake @@ -63,7 +63,11 @@ macro(generate_interface ARG_XML_NAME ARG_NAMESPACE PARSER_TYPE) ) set(CPP_FILE "${CMAKE_CURRENT_BINARY_DIR}/${FILE_NAME}_schema.cc") - set(FULL_XML_NAME "${CMAKE_CURRENT_SOURCE_DIR}/${ARG_XML_NAME}") + if("${ARG_XML_NAME}" STREQUAL "MOBILE_API.xml") + set(FULL_XML_NAME "${CMAKE_SOURCE_DIR}/tools/rpc_spec/${ARG_XML_NAME}") + else() + set(FULL_XML_NAME "${CMAKE_CURRENT_SOURCE_DIR}/${ARG_XML_NAME}") +endif() add_custom_command( OUTPUT ${HPP_FILE} ${CPP_FILE} diff --git a/tools/infrastructure/collect_coverage.sh b/tools/infrastructure/collect_coverage.sh index 47559e6c47..498eee7f65 100755 --- a/tools/infrastructure/collect_coverage.sh +++ b/tools/infrastructure/collect_coverage.sh @@ -17,7 +17,7 @@ rm -rf $COVERAGE_DIR rm -rf $REPORTS_DIR - mkdir $COVERAGE_DIR -lcov --quiet --capture --directory . --output-file $COVERAGE_DIR/full_report.info +lcov --quiet --capture --directory $BUILD_DIR --output-file $COVERAGE_DIR/full_report.info lcov --quiet --remove $COVERAGE_DIR/full_report.info '/usr/*' '*/test/*' '*/src/3rd*' '*/build/src/*' --output-file $COVERAGE_DIR/coverage.info mkdir $REPORTS_DIR |