Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk

This commit is contained in:
jsteemann 2016-03-16 12:12:19 +01:00
parent 665c1b9103 d8746aaf88
commit d6709de403
4 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -33,7 +33,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)
set(ARANGODB_VERSION_MAJOR "3") set(ARANGODB_VERSION_MAJOR "3")
set(ARANGODB_VERSION_MINOR "0") set(ARANGODB_VERSION_MINOR "0")
set(ARANGODB_VERSION_REVISION "0-devel") set(ARANGODB_VERSION_REVISION "x-devel")
set(ARANGODB_VERSION set(ARANGODB_VERSION
"${ARANGODB_VERSION_MAJOR}.${ARANGODB_VERSION_MINOR}.${ARANGODB_VERSION_REVISION}") "${ARANGODB_VERSION_MAJOR}.${ARANGODB_VERSION_MINOR}.${ARANGODB_VERSION_REVISION}")

10
Documentation/CMakeLists.txt
View File

@ -1,5 +1,15 @@
# -*- mode: CMAKE; -*- # -*- 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) if (USE_MAINTAINER_MODE)
set(MAN_NAMES set(MAN_NAMES
man1/arangob.1 man1/arangob.1

2
VERSION
View File

@ -1 +1 @@
3.0.0-devel 3.0.x-devel

9
cmake/ArangoDBMacros.cmake
View File

@ -404,15 +404,6 @@ install(
# Custom targets ---------------------------------------------------------------- # 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 # love
add_custom_target (love add_custom_target (love
COMMENT "ArangoDB loves you." COMMENT "ArangoDB loves you."