diff options
| -rw-r--r-- | .travis.yml | 6 | ||||
| -rw-r--r-- | CMakeLists.txt | 13 | ||||
| -rw-r--r-- | jobs/gtad.yaml (renamed from jobs/apigen.yaml) | 0 |
3 files changed, 11 insertions, 8 deletions
diff --git a/.travis.yml b/.travis.yml index b8917ef1..2abf0e2b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,15 +22,15 @@ matrix: install: - eval "${ENV_EVAL}" - git clone https://github.com/QMatrixClient/matrix-doc.git -- git clone --recursive https://github.com/KitsuneRal/api-generator.git -- pushd api-generator +- git clone --recursive https://github.com/KitsuneRal/gtad.git +- pushd gtad - cmake -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH} . - cmake --build . - popd before_script: - mkdir build && cd build -- cmake -DMATRIX_DOC_PATH="matrix-doc" -DAPIGEN_PATH="api-generator/api-generator" -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH} .. +- cmake -DMATRIX_DOC_PATH="matrix-doc" -DGTAD_PATH="gtad/gtad" -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH} .. - cmake --build . --target update-api script: cmake --build . diff --git a/CMakeLists.txt b/CMakeLists.txt index f4358521..44f63c79 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -50,6 +50,11 @@ if (CMAKE_BUILD_TYPE) endif(CMAKE_BUILD_TYPE) message( STATUS "Using compiler: ${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION}" ) message( STATUS "Using Qt ${Qt5_VERSION} at ${Qt5_Prefix}" ) +if (MATRIX_DOC_PATH AND GTAD_PATH) + message( STATUS "Generating API stubs enabled" ) + message( STATUS " Using GTAD at ${GTAD_PATH}" ) + message( STATUS " Using CS API files at ${MATRIX_DOC_PATH}/api/client-server" ) +endif () message( STATUS "=============================================================================" ) message( STATUS ) @@ -84,16 +89,14 @@ set(libqmatrixclient_SRCS jobs/logoutjob.cpp ) -aux_source_directory(jobs/generated libqmatrixclient_job_SRCS) - -if (MATRIX_DOC_PATH AND APIGEN_PATH) +if (MATRIX_DOC_PATH AND GTAD_PATH) add_custom_target(update-api - ${APIGEN_PATH} --config jobs/apigen.yaml --out jobs/generated + ${GTAD_PATH} --config jobs/gtad.yaml --out jobs/generated ${MATRIX_DOC_PATH}/api/client-server content-repo.yaml- cas_login_redirect.yaml- cas_login_ticket.yaml- old_sync.yaml- room_initial_sync.yaml- WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} - SOURCES jobs/apigen.yaml jobs/{{base}}.h.mustache jobs/{{base}}.cpp.mustache + SOURCES jobs/gtad.yaml jobs/{{base}}.h.mustache jobs/{{base}}.cpp.mustache VERBATIM ) endif() diff --git a/jobs/apigen.yaml b/jobs/gtad.yaml index 69662a5d..69662a5d 100644 --- a/jobs/apigen.yaml +++ b/jobs/gtad.yaml |