From bbb15fd9601c80eaacfdebe2f6cce61af06008fc Mon Sep 17 00:00:00 2001 From: hunbernd Date: Sat, 9 Mar 2019 20:49:54 +0100 Subject: [PATCH] Fixed jsonapi generator: - Doxygen failed, because it got Unix like paths on Windows - Josnapi generator created empty output files, because multiple _ in input file names --- jsonapi-generator/src/jsonapi-generator.cpp | 2 +- libretroshare/src/libretroshare.pro | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/jsonapi-generator/src/jsonapi-generator.cpp b/jsonapi-generator/src/jsonapi-generator.cpp index aa20eda01..90d44cbd9 100644 --- a/jsonapi-generator/src/jsonapi-generator.cpp +++ b/jsonapi-generator/src/jsonapi-generator.cpp @@ -140,7 +140,7 @@ int main(int argc, char *argv[]) QString refid(member.attributes().namedItem("refid").nodeValue()); QString methodName(member.firstChildElement("name").toElement().text()); bool requiresAuth = true; - QString defFilePath(doxPrefix + refid.split('_')[0] + ".xml"); + QString defFilePath(doxPrefix + refid.left(refid.lastIndexOf('_')) + ".xml"); qDebug() << "Looking for" << typeName << methodName << "into" << typeFilePath; diff --git a/libretroshare/src/libretroshare.pro b/libretroshare/src/libretroshare.pro index cdfadde1d..4012f798f 100644 --- a/libretroshare/src/libretroshare.pro +++ b/libretroshare/src/libretroshare.pro @@ -900,8 +900,8 @@ rs_jsonapi { jsonwrappersincl.commands = \ mkdir -p $${JSONAPI_GENERATOR_OUT} && \ cp $${DOXIGEN_CONFIG_SRC} $${DOXIGEN_CONFIG_OUT} && \ - echo OUTPUT_DIRECTORY=$$shell_path($${JSONAPI_GENERATOR_OUT}) >> $${DOXIGEN_CONFIG_OUT} && \ - echo INPUT=$$shell_path($${DOXIGEN_INPUT_DIRECTORY}) >> $${DOXIGEN_CONFIG_OUT} && \ + echo OUTPUT_DIRECTORY=$${JSONAPI_GENERATOR_OUT} >> $${DOXIGEN_CONFIG_OUT} && \ + echo INPUT=$${DOXIGEN_INPUT_DIRECTORY} >> $${DOXIGEN_CONFIG_OUT} && \ doxygen $${DOXIGEN_CONFIG_OUT} && \ $${JSONAPI_GENERATOR_EXE} $${JSONAPI_GENERATOR_SRC} $${JSONAPI_GENERATOR_OUT}; QMAKE_EXTRA_TARGETS += jsonwrappersincl