From ce1bbe88509715c9a35bb7aeeb5f20f0d4918ec4 Mon Sep 17 00:00:00 2001
From: Kitsune Ral <Kitsune-Ral@users.sf.net>
Date: Mon, 2 Oct 2017 20:07:59 +0900
Subject: api-generator has been renamed to gtad

---
 .travis.yml      |  6 +++---
 CMakeLists.txt   | 13 ++++++++-----
 jobs/apigen.yaml | 57 --------------------------------------------------------
 jobs/gtad.yaml   | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 68 insertions(+), 65 deletions(-)
 delete mode 100644 jobs/apigen.yaml
 create mode 100644 jobs/gtad.yaml

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/apigen.yaml
deleted file mode 100644
index 69662a5d..00000000
--- a/jobs/apigen.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
-preprocess:
-  "%CLIENT_RELEASE_LABEL%": r0
-  "%CLIENT_MAJOR_VERSION%": r0
-
-# Structure:
-# swaggerType: <targetTypeSpec>
-# OR
-# swaggerType:
-#   - swaggerFormat: <targetTypeSpec>
-#   - /swaggerFormatRegEx/: <targetTypeSpec>
-#   - //: <targetTypeSpec> # default, if the format doesn't mach anything above
-# WHERE
-# targetTypeSpec = targetType OR
-#   { type: targetType, imports: <filename OR [ filenames... ]>, <other attributes...> }
-types:
-  integer:
-  - int64: qint64
-  - int32: qint32
-  - //: int
-  number:
-  - float: float
-  - //: double
-  boolean: bool
-  string:
-  - byte: &QByteArray { type: QByteArray, imports: <QtCore/QByteArray> }
-  - binary: *QByteArray
-  - date:
-      type: QDate
-      avoidCopy?: true
-      imports: <QtCore/QDate>
-  - dateTime:
-      type: QDateTime
-      avoidCopy?: true
-      imports: <QtCore/QDateTime>
-  - //: { type: QString, imports: <QtCore/QString> }
-  file:
-    type: QByteArray
-    imports: <QtCore/QByteArray>
-    "returnFile?": true
-  object: { type: QJsonObject, "avoidCopy?": true, imports: <QtCore/QJsonObject> }
-  array: { type: "QVector<{{1}}>", "avoidCopy?": true, imports: <QtCore/QVector> }
-
-#operations:
-
-env:
-#  preamble: preamble.mustache
-  copyrightName: Kitsune Ral
-  copyrightEmail: <kitsune-ral@users.sf.net>
-#  imports: { set: }
-#  returnFile?: { bool: false }
-
-templates:
-- "{{base}}.h.mustache"
-- "{{base}}.cpp.mustache"
-
-#outFilesList: apifiles.txt
-
diff --git a/jobs/gtad.yaml b/jobs/gtad.yaml
new file mode 100644
index 00000000..69662a5d
--- /dev/null
+++ b/jobs/gtad.yaml
@@ -0,0 +1,57 @@
+preprocess:
+  "%CLIENT_RELEASE_LABEL%": r0
+  "%CLIENT_MAJOR_VERSION%": r0
+
+# Structure:
+# swaggerType: <targetTypeSpec>
+# OR
+# swaggerType:
+#   - swaggerFormat: <targetTypeSpec>
+#   - /swaggerFormatRegEx/: <targetTypeSpec>
+#   - //: <targetTypeSpec> # default, if the format doesn't mach anything above
+# WHERE
+# targetTypeSpec = targetType OR
+#   { type: targetType, imports: <filename OR [ filenames... ]>, <other attributes...> }
+types:
+  integer:
+  - int64: qint64
+  - int32: qint32
+  - //: int
+  number:
+  - float: float
+  - //: double
+  boolean: bool
+  string:
+  - byte: &QByteArray { type: QByteArray, imports: <QtCore/QByteArray> }
+  - binary: *QByteArray
+  - date:
+      type: QDate
+      avoidCopy?: true
+      imports: <QtCore/QDate>
+  - dateTime:
+      type: QDateTime
+      avoidCopy?: true
+      imports: <QtCore/QDateTime>
+  - //: { type: QString, imports: <QtCore/QString> }
+  file:
+    type: QByteArray
+    imports: <QtCore/QByteArray>
+    "returnFile?": true
+  object: { type: QJsonObject, "avoidCopy?": true, imports: <QtCore/QJsonObject> }
+  array: { type: "QVector<{{1}}>", "avoidCopy?": true, imports: <QtCore/QVector> }
+
+#operations:
+
+env:
+#  preamble: preamble.mustache
+  copyrightName: Kitsune Ral
+  copyrightEmail: <kitsune-ral@users.sf.net>
+#  imports: { set: }
+#  returnFile?: { bool: false }
+
+templates:
+- "{{base}}.h.mustache"
+- "{{base}}.cpp.mustache"
+
+#outFilesList: apifiles.txt
+
-- 
cgit v1.2.3