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 devel

This commit is contained in:
Jan Steemann 2016-11-09 16:58:27 +01:00
parent 4c3c8ac93c 55ce25ac83
commit a2bbe6e971
6 changed files with 71 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
CMakeLists.txt
View File

@ -107,6 +107,7 @@ set(BIN_ARANGOVPACK arangovpack)
# test binaries # test binaries
set(TEST_BASICS_SUITE basics_suite) set(TEST_BASICS_SUITE basics_suite)
set(TEST_GEO_SUITE geo_suite) set(TEST_GEO_SUITE geo_suite)
set(CLEAN_AUTOGENERATED_FILES)
set(PACKAGES_LIST) set(PACKAGES_LIST)
set(COPY_PACKAGES_LIST) set(COPY_PACKAGES_LIST)
set(CLEAN_PACKAGES_LIST) set(CLEAN_PACKAGES_LIST)
@ -477,6 +478,12 @@ if (USE_MAINTAINER_MODE)
find_package(FLEX) find_package(FLEX)
find_package(BISON) find_package(BISON)
# these are required for generateREADME.sh
find_program(FGREP_EXECUTABLE fgrep)
find_program(MARKDOWN_EXECUTABLE markdown)
find_program(HTML2TEXT_EXECUTABLE html2text)
find_program(SED_EXECUTABLE sed)
find_program(AWK_EXECUTABLE awk)
endif () endif ()
################################################################################ ################################################################################
@ -926,4 +933,8 @@ add_custom_target(clean_packages
DEPENDS ${CLEAN_PACKAGES_LIST} DEPENDS ${CLEAN_PACKAGES_LIST}
) )
add_custom_target(clean_autogenerated_files
DEPENDS ${CLEAN_AUTOGENERATED_FILES}
)
message(STATUS "building for git revision: ${ARANGODB_BUILD_REPOSITORY}") message(STATUS "building for git revision: ${ARANGODB_BUILD_REPOSITORY}")

48
Documentation/CMakeLists.txt
View File

@ -22,48 +22,46 @@ if (USE_MAINTAINER_MODE)
man8/arangod.8 man8/arangod.8
man8/arango-dfdb.8 man8/arango-dfdb.8
man8/foxx-manager.8 man8/foxx-manager.8
) )
set(MAN_FILES) set(MAN_FILES)
set(GENERATED_MAN_FILES)
foreach (m IN LISTS MAN_NAMES) foreach (m IN LISTS MAN_NAMES)
set(msrc ${CMAKE_SOURCE_DIR}/Documentation/${m}) set(msrc ${CMAKE_SOURCE_DIR}/Documentation/${m})
set(mdst ${CMAKE_SOURCE_DIR}/Documentation/man/${m}) set(mdst ${CMAKE_SOURCE_DIR}/Documentation/man/${m})
add_custom_command( add_custom_command(
OUTPUT WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
${mdst} OUTPUT ${mdst}
COMMAND COMMAND ${CMAKE_SOURCE_DIR}/utils/manPages.sh ${msrc} ${mdst} ${ARANGODB_VERSION}
${CMAKE_SOURCE_DIR}/utils/manPages.sh DEPENDS ${msrc}
${msrc} ${mdst} ${ARANGODB_VERSION} COMMENT "Building manpage ${mdst}"
DEPENDS
${msrc}
WORKING_DIRECTORY
${CMAKE_BINARY_DIR}
COMMENT
"Building manpage ${mdst}"
VERBATIM VERBATIM
) )
list(APPEND MAN_FILES ${mdst}) list(APPEND MAN_FILES ${mdst})
endforeach () endforeach ()
add_custom_command( add_custom_command(
OUTPUT WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/README OUTPUT ${CMAKE_SOURCE_DIR}/README
COMMAND COMMAND ${CMAKE_SOURCE_DIR}/utils/generateREADME.sh ${CMAKE_SOURCE_DIR}/README.md ${CMAKE_SOURCE_DIR}/README
${CMAKE_SOURCE_DIR}/utils/generateREADME.sh DEPENDS ${CMAKE_SOURCE_DIR}/README.md
${CMAKE_SOURCE_DIR}/README.md ${CMAKE_SOURCE_DIR}/README COMMENT "Building README"
DEPENDS
${CMAKE_SOURCE_DIR}/README.md
WORKING_DIRECTORY
${CMAKE_SOURCE_DIR}
COMMENT
"Building README"
VERBATIM VERBATIM
) )
list(APPEND MAN_FILES ${CMAKE_SOURCE_DIR}/README) list(APPEND MAN_FILES ${CMAKE_SOURCE_DIR}/README)
add_custom_target(man ALL DEPENDS ${MAN_FILES}) add_custom_target(man ALL DEPENDS ${MAN_FILES})
add_custom_target(clean_man_autogenerated
COMMAND rm -f ${CMAKE_SOURCE_DIR}/README
COMMAND rm -f ${MAN_FILES})
list(APPEND CLEAN_AUTOGENERATED_FILES clean_man_autogenerated)
set(CLEAN_AUTOGENERATED_FILES ${CLEAN_AUTOGENERATED_FILES} PARENT_SCOPE)
endif () endif ()

2
Installation/release.sh
View File

@ -112,6 +112,8 @@ if [ "$BUILD" != "0" ]; then
( (
cd build cd build
cmake .. ${CMAKE_CONFIGURE} cmake .. ${CMAKE_CONFIGURE}
make clean_autogenerated_files
cmake .. ${CMAKE_CONFIGURE}
make -j 8 make -j 8
) )

43
arangod/CMakeLists.txt
View File

@ -13,34 +13,29 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/bin/")
if (USE_MAINTAINER_MODE AND NOT MSVC) if (USE_MAINTAINER_MODE AND NOT MSVC)
add_custom_command( add_custom_command(
OUTPUT OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/Aql/tokens.cpp
${CMAKE_CURRENT_SOURCE_DIR}/Aql/tokens.cpp WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
WORKING_DIRECTORY COMMAND ${CMAKE_SOURCE_DIR}/utils/flex-c++.sh
${CMAKE_CURRENT_SOURCE_DIR} ${FLEX_EXECUTABLE} Aql/tokens.cpp Aql/tokens.ll
COMMAND MAIN_DEPENDENCY ${CMAKE_CURRENT_SOURCE_DIR}/Aql/tokens.ll
${CMAKE_SOURCE_DIR}/utils/flex-c++.sh
${FLEX_EXECUTABLE}
Aql/tokens.cpp
Aql/tokens.ll
MAIN_DEPENDENCY
${CMAKE_CURRENT_SOURCE_DIR}/Aql/tokens.ll
VERBATIM VERBATIM
) )
add_custom_command( add_custom_command(
OUTPUT OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/Aql/grammar.cpp
${CMAKE_CURRENT_SOURCE_DIR}/Aql/grammar.cpp WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
WORKING_DIRECTORY COMMAND ${CMAKE_SOURCE_DIR}/utils/bison-c.sh
${CMAKE_CURRENT_SOURCE_DIR} ${BISON_EXECUTABLE} Aql/grammar.cpp Aql/grammar.y
COMMAND MAIN_DEPENDENCY ${CMAKE_CURRENT_SOURCE_DIR}/Aql/grammar.y
${CMAKE_SOURCE_DIR}/utils/bison-c.sh
${BISON_EXECUTABLE}
Aql/grammar.cpp
Aql/grammar.y
MAIN_DEPENDENCY
${CMAKE_CURRENT_SOURCE_DIR}/Aql/grammar.y
VERBATIM VERBATIM
) )
add_custom_target(clean_aql_autogenerated
COMMAND rm -f Aql/tokens.cpp Aql/tokens.h Aql/grammar.cpp Aql/grammar.h)
list(APPEND CLEAN_AUTOGENERATED_FILES clean_aql_autogenerated)
set(CLEAN_AUTOGENERATED_FILES ${CLEAN_AUTOGENERATED_FILES} PARENT_SCOPE)
endif () endif ()
################################################################################ ################################################################################

11
cmake/InstallMacros.cmake
View File

@ -84,16 +84,13 @@ macro (install_readme input output)
if (${USE_VERSION_IN_LICENSEDIR}) if (${USE_VERSION_IN_LICENSEDIR})
set(PKG_VERSION "-${ARANGODB_VERSION}") set(PKG_VERSION "-${ARANGODB_VERSION}")
endif () endif ()
set(CRLFSTYLE "UNIX")
FILE(READ ${PROJECT_SOURCE_DIR}/${input} FileContent)
STRING(REPLACE "\r" "" FileContent "${FileContent}")
if (MSVC) if (MSVC)
STRING(REPLACE "\n" "\r\n" FileContent "${FileContent}") set(CRLFSTYLE "CRLF")
endif () endif ()
FILE(WRITE ${PROJECT_BINARY_DIR}/${output} "${FileContent}")
install( install(
FILES ${PROJECT_BINARY_DIR}/${output} CODE "configure_file(${PROJECT_SOURCE_DIR}/${input} \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${where}${PKG_VERSION}/${output} NEWLINE_STYLE ${CRLFSTYLE})"
DESTINATION ${where}${PKG_VERSION}) )
endmacro () endmacro ()
# installs a link to an executable --------------------------------------------- # installs a link to an executable ---------------------------------------------

24
lib/CMakeLists.txt
View File

@ -11,19 +11,19 @@ include_directories(.)
if (USE_MAINTAINER_MODE AND NOT MSVC) if (USE_MAINTAINER_MODE AND NOT MSVC)
add_custom_command( add_custom_command(
OUTPUT OUTPUT ${CMAKE_SOURCE_DIR}/lib/V8/v8-json.cpp
${CMAKE_SOURCE_DIR}/lib/V8/v8-json.cpp WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
WORKING_DIRECTORY COMMAND ${CMAKE_SOURCE_DIR}/utils/flex-c++.sh
${CMAKE_SOURCE_DIR} ${FLEX_EXECUTABLE} lib/V8/v8-json.cpp lib/V8/v8-json.ll
COMMAND MAIN_DEPENDENCY ${CMAKE_SOURCE_DIR}/lib/V8/v8-json.ll
${CMAKE_SOURCE_DIR}/utils/flex-c++.sh
${FLEX_EXECUTABLE}
lib/V8/v8-json.cpp
lib/V8/v8-json.ll
MAIN_DEPENDENCY
${CMAKE_SOURCE_DIR}/lib/V8/v8-json.ll
VERBATIM VERBATIM
) )
add_custom_target(clean_lib_autogenerated
COMMAND rm -f ${CMAKE_SOURCE_DIR}/lib/V8/v8-json.cpp)
list(APPEND CLEAN_AUTOGENERATED_FILES clean_lib_autogenerated)
set(CLEAN_AUTOGENERATED_FILES ${CLEAN_AUTOGENERATED_FILES} PARENT_SCOPE)
endif () endif ()
################################################################################ ################################################################################