diff options
| author | Vladyslav Mustafin <v.mustafin@gmail.com> | 2020-02-06 21:23:23 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-06 14:23:23 -0500 |
| commit | 88c73e25c957cf5eae521688d74064ae8429fb8c (patch) | |
| tree | 383d380f15e94848f1385ff9f51f49fc6614d7a2 /tools/cmake | |
| parent | fcdacd760c6182e73f3517b3baa0dd10660ff0e8 (diff) | |
| download | sdl_core-88c73e25c957cf5eae521688d74064ae8429fb8c.tar.gz | |
#3211 [SDL 0234] Proxy Library RPC Generation (#3213)
* #3211 [SDL 0234] Proxy Library RPC Generation
* Split existing `InterfaceGenerator` into `InterfaceParser` and `InterfaceGenerator`
* Moved InterfaceParser into `smartdevicelink/rpc_spec`
* Rejoined `InterfaceParser` as `tools/rpc_spec` Git submodule from `smartdevicelink/rpc_spec`
* Refactored `InterfaceGenerator` to use Parser from `tools/rpc_spec` Git submodule and be compatible with Python 3.5
* Replaced url SSH to HTTPS in submodule
* refactoring according to comments in pull/202
* move common parsers to rpc_spec repo
* change cmake argument
* fix cmake argument list
* fix cmake argument list
* fix cmake argument list
* small refactoring as requested in code review
* adding *.xsd
* adding *.xsd
* xmlschema dependency added for python interface generator
* align changes from parser rpc_spec
* align changes from parser rpc_spec
* align with rpc_spec
* moved xmlschema python dependency installation to build script
* installing all python requirements
* Corrected requirements file
* Additional dependencies for requirements
* Correcting requirements
* adding jsoncpp submodule
* fixing unit tests
* fixing unit tests
* rename CodeFormatAndQuality
* updated rpc_spec reference
Co-authored-by: Aleksandr Mishchenko <amishchenko@luxoft.com>
Co-authored-by: Kostiantyn Sologubov <ksologubov@luxoft.com>
Diffstat (limited to 'tools/cmake')
| -rw-r--r-- | tools/cmake/helpers/generators.cmake | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tools/cmake/helpers/generators.cmake b/tools/cmake/helpers/generators.cmake index dbdb725e49..1a5a4b8fa1 100644 --- a/tools/cmake/helpers/generators.cmake +++ b/tools/cmake/helpers/generators.cmake @@ -28,12 +28,12 @@ # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # POSSIBILITY OF SUCH DAMAGE. -find_package(PythonInterp REQUIRED) +find_package(PythonInterp 3.5 REQUIRED) if(NOT PYTHONINTERP_FOUND) message(STATUS "Python interpreter is not found") message(STATUS "To install it type in the command line:") - message(STATUS "sudo apt-get install python") + message(STATUS "sudo apt-get install python3") message(FATAL_ERROR "Exiting!") endif(NOT PYTHONINTERP_FOUND) @@ -47,10 +47,10 @@ macro(generate_policy_types GENERATED_FILES PARSER_TYPE) add_custom_command( OUTPUT ${GENERATED_FILES} - COMMAND ${INTEFRACE_GENERATOR_CMD} ${ARG_FULL_XML_NAME} ${ARG_NAMESPACE} ${CMAKE_CURRENT_BINARY_DIR} "--parser-type" "${PARSER_TYPE}" + COMMAND ${INTEFRACE_GENERATOR_CMD} "--source-xml" "${ARG_FULL_XML_NAME}" "--namespace" "${ARG_NAMESPACE}" "--output-dir" "${CMAKE_CURRENT_BINARY_DIR}" "--parser-type" "${PARSER_TYPE}" "-y" DEPENDS ${INTERFACE_GENERATOR_DEPENDENCIES} ${ARG_FULL_XML_NAME} COMMENT "Generating files:\n\t${GENERATED_FILES}\nfrom:\n\t${ARG_FULL_XML_NAME}\n\ - ${INTEFRACE_GENERATOR_CMD} ${ARG_FULL_XML_NAME} ${ARG_NAMESPACE} ${CMAKE_CURRENT_BINARY_DIR} --parser-type ${PARSER_TYPE}" + ${INTEFRACE_GENERATOR_CMD} --source-xml ${ARG_FULL_XML_NAME} --namespace ${ARG_NAMESPACE} --output-dir ${CMAKE_CURRENT_BINARY_DIR} --parser-type ${PARSER_TYPE}" -y VERBATIM) endmacro() @@ -67,7 +67,7 @@ macro(generate_interface ARG_XML_NAME ARG_NAMESPACE PARSER_TYPE) add_custom_command( OUTPUT ${HPP_FILE} ${CPP_FILE} - COMMAND ${INTEFRACE_GENERATOR_CMD} ${FULL_XML_NAME} ${ARG_NAMESPACE} ${CMAKE_CURRENT_BINARY_DIR} "--parser-type" "${PARSER_TYPE}" + COMMAND ${INTEFRACE_GENERATOR_CMD} "--source-xml" "${FULL_XML_NAME}" "--namespace" "${ARG_NAMESPACE}" "--output-dir" "${CMAKE_CURRENT_BINARY_DIR}" "--parser-type" "${PARSER_TYPE}" "-y" DEPENDS ${INTERFACE_GENERATOR_DEPENDENCIES} ${FULL_XML_NAME} COMMENT "Generating files:\n ${HPP_FILE}\n ${CPP_FILE}\nfrom:\n ${FULL_XML_NAME} ..." VERBATIM |