Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-10-30 22:29:00 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed jsonapi generator:

Browse source 
- Doxygen failed, because it got Unix like paths on Windows
- Josnapi generator created empty output files, because multiple _ in input file names
This commit is contained in:
hunbernd 2019-03-09 20:49:54 +01:00
parent 294d711cc3
commit bbb15fd960
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
jsonapi-generator/src/jsonapi-generator.cpp
View file

@ -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;

4
libretroshare/src/libretroshare.pro
View file

@ -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