From 174b0d661c2ddee7ea1876197a47981c9034f712 Mon Sep 17 00:00:00 2001 From: Frank Celler Date: Wed, 16 Mar 2016 10:49:35 +0100 Subject: [PATCH 1/2] changed to 3.0.x-devel --- CMakeLists.txt | 2 +- VERSION | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a7aaaa2652..0d02b6da46 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,7 +33,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake) set(ARANGODB_VERSION_MAJOR "3") set(ARANGODB_VERSION_MINOR "0") -set(ARANGODB_VERSION_REVISION "0-devel") +set(ARANGODB_VERSION_REVISION "x-devel") set(ARANGODB_VERSION "${ARANGODB_VERSION_MAJOR}.${ARANGODB_VERSION_MINOR}.${ARANGODB_VERSION_REVISION}") diff --git a/VERSION b/VERSION index cbd6733503..486e7ac1a1 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.0.0-devel +3.0.x-devel From d8746aaf8848f7daebdc88d5246376ba9503fe39 Mon Sep 17 00:00:00 2001 From: Frank Celler Date: Wed, 16 Mar 2016 11:56:50 +0100 Subject: [PATCH 2/2] moved swagger --- Documentation/CMakeLists.txt | 10 ++++++++++ cmake/ArangoDBMacros.cmake | 9 --------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/Documentation/CMakeLists.txt b/Documentation/CMakeLists.txt index ced47fdb5a..8935aa5c4c 100644 --- a/Documentation/CMakeLists.txt +++ b/Documentation/CMakeLists.txt @@ -1,5 +1,15 @@ # -*- mode: CMAKE; -*- +# 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) + +# manual pages if (USE_MAINTAINER_MODE) set(MAN_NAMES man1/arangob.1 diff --git a/cmake/ArangoDBMacros.cmake b/cmake/ArangoDBMacros.cmake index b460e60a39..003f9ad8e2 100644 --- a/cmake/ArangoDBMacros.cmake +++ b/cmake/ArangoDBMacros.cmake @@ -404,15 +404,6 @@ install( # Custom targets ---------------------------------------------------------------- -# 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) - # love add_custom_target (love COMMENT "ArangoDB loves you."