From f6a833ac5d764dbf562a29d5a9640d1c9da5cade Mon Sep 17 00:00:00 2001 From: Frank Celler Date: Thu, 17 Mar 2016 14:40:09 +0100 Subject: [PATCH] added generateSwagger --- Documentation/CMakeLists.txt | 10 +++------- utils/generateErrorfile.py | 0 utils/{generateExamples => generateExamples.sh} | 1 + utils/generateMimetypes.py | 0 {Documentation/Scripts => utils}/generateSwagger.py | 0 utils/generateSwagger.sh | 9 +++++++++ 6 files changed, 13 insertions(+), 7 deletions(-) mode change 100755 => 100644 utils/generateErrorfile.py rename utils/{generateExamples => generateExamples.sh} (97%) mode change 100755 => 100644 utils/generateMimetypes.py rename {Documentation/Scripts => utils}/generateSwagger.py (100%) create mode 100644 utils/generateSwagger.sh diff --git a/Documentation/CMakeLists.txt b/Documentation/CMakeLists.txt index 088c5d640e..7b7f5e3b67 100644 --- a/Documentation/CMakeLists.txt +++ b/Documentation/CMakeLists.txt @@ -2,16 +2,12 @@ # swagger add_custom_target(swagger - COMMAND ${PYTHON_EXECUTABLE} - ${PROJECT_SOURCE_DIR}/Documentation/Scripts/generateSwagger.py - ${PROJECT_SOURCE_DIR} - ${PROJECT_SOURCE_DIR}/js/apps/system/_admin/aardvark/APP/api-docs api-docs - ${PROJECT_SOURCE_DIR}/Documentation/DocuBlocks/Rest/ - > ${PROJECT_SOURCE_DIR}/js/apps/system/_admin/aardvark/APP/api-docs.json) + COMMAND ${PROJECT_SOURCE_DIR}/utils/generateSwagger.sh + WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}) # swagger add_custom_target(examples - COMMAND ${PROJECT_SOURCE_DIR}/utils/generateExamples + COMMAND ${PROJECT_SOURCE_DIR}/utils/generateExamples.sh WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}) # manual pages diff --git a/utils/generateErrorfile.py b/utils/generateErrorfile.py old mode 100755 new mode 100644 diff --git a/utils/generateExamples b/utils/generateExamples.sh similarity index 97% rename from utils/generateExamples rename to utils/generateExamples.sh index f45bb9d6be..02bf3715cc 100755 --- a/utils/generateExamples +++ b/utils/generateExamples.sh @@ -35,6 +35,7 @@ ${ARANGOSH} \ --log.file ${LOGFILE} \ --javascript.startup-directory js \ --javascript.execute $SCRIPT \ + --server.password "" \ "${ARGS[@]}" if test $? -eq 0; then diff --git a/utils/generateMimetypes.py b/utils/generateMimetypes.py old mode 100755 new mode 100644 diff --git a/Documentation/Scripts/generateSwagger.py b/utils/generateSwagger.py similarity index 100% rename from Documentation/Scripts/generateSwagger.py rename to utils/generateSwagger.py diff --git a/utils/generateSwagger.sh b/utils/generateSwagger.sh new file mode 100644 index 0000000000..a1db9c70ef --- /dev/null +++ b/utils/generateSwagger.sh @@ -0,0 +1,9 @@ +#!/bin/bash + +python \ + utils/generateExamples \ + . \ + js/apps/system/_admin/aardvark/APP/api-docs \ + api-docs \ + Documentation/DocuBlocks/Rest \ + > js/apps/system/_admin/aardvark/APP/api-docs.json