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

naive attempt to not build arangobackup in community version (#10013) 

* naive attempt to not build arangobackup in community version

* fix testing.js

* try to fix enterprise detection
This commit is contained in:
Jan 2019-09-13 19:26:35 +02:00 committed by KVS85
parent 351ca41553
commit 935a35a275
3 changed files with 30 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
CMakeLists.txt
View File

@ -1249,10 +1249,12 @@ add_subdirectory(arangod)
if (USE_GOOGLE_TESTS) if (USE_GOOGLE_TESTS)
add_subdirectory(tests) add_subdirectory(tests)
endif() endif ()
add_dependencies(arangobench zlibstatic) add_dependencies(arangobench zlibstatic)
add_dependencies(arangobackup zlibstatic) if (USE_ENTERPRISE)
add_dependencies(arangobackup zlibstatic)
endif ()
add_dependencies(arangod zlibstatic) add_dependencies(arangod zlibstatic)
add_dependencies(arangodump zlibstatic) add_dependencies(arangodump zlibstatic)
add_dependencies(arangoexport zlibstatic) add_dependencies(arangoexport zlibstatic)
@ -1260,21 +1262,26 @@ add_dependencies(arangoimport zlibstatic)
add_dependencies(arangorestore zlibstatic) add_dependencies(arangorestore zlibstatic)
add_dependencies(arangosh zlibstatic) add_dependencies(arangosh zlibstatic)
if(UNIX) if (UNIX)
add_dependencies(arangobench man) add_dependencies(arangobench man)
add_dependencies(arangobackup man) if (USE_ENTERPRISE)
add_dependencies(arangobackup man)
endif ()
add_dependencies(arangod man) add_dependencies(arangod man)
add_dependencies(arangodump man) add_dependencies(arangodump man)
add_dependencies(arangoexport man) add_dependencies(arangoexport man)
add_dependencies(arangoimport man) add_dependencies(arangoimport man)
add_dependencies(arangorestore man) add_dependencies(arangorestore man)
add_dependencies(arangosh man) add_dependencies(arangosh man)
endif() endif ()
if (NOT USE_PRECOMPILED_V8) if (NOT USE_PRECOMPILED_V8)
# all binaries depend on v8_build because it contains ICU as well # all binaries depend on v8_build because it contains ICU as well
add_dependencies(arangobench v8_build) add_dependencies(arangobench v8_build)
add_dependencies(arangobackup v8_build)
if (USE_ENTERPRISE)
add_dependencies(arangobackup v8_build)
endif ()
add_dependencies(arangod v8_build) add_dependencies(arangod v8_build)
add_dependencies(arangodump v8_build) add_dependencies(arangodump v8_build)
add_dependencies(arangoexport v8_build) add_dependencies(arangoexport v8_build)
@ -1283,7 +1290,7 @@ if (NOT USE_PRECOMPILED_V8)
add_dependencies(arangosh v8_build) add_dependencies(arangosh v8_build)
if (USE_GOOGLE_TESTS) if (USE_GOOGLE_TESTS)
add_dependencies(arangodbtests v8_build) add_dependencies(arangodbtests v8_build)
endif() endif ()
endif () endif ()
add_custom_target(packages add_custom_target(packages
@ -1296,11 +1303,11 @@ add_custom_target(copy_packages
add_custom_target(clean_packages add_custom_target(clean_packages
DEPENDS ${CLEAN_PACKAGES_LIST} DEPENDS ${CLEAN_PACKAGES_LIST}
) )
add_custom_target(clean_autogenerated_files add_custom_target(clean_autogenerated_files
DEPENDS ${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}")

4
arangosh/CMakeLists.txt
View File

@ -64,6 +64,8 @@ endif()
## arangobackup ## arangobackup
################################################################################ ################################################################################
if (USE_ENTERPRISE)
if (MSVC AND NOT(SKIP_PACKAGING)) if (MSVC AND NOT(SKIP_PACKAGING))
generate_product_version(ProductVersionFiles_arangobackup generate_product_version(ProductVersionFiles_arangobackup
NAME arangobackup NAME arangobackup
@ -118,6 +120,8 @@ if (DARWIN)
target_compile_options(arangobackup PRIVATE -Werror) target_compile_options(arangobackup PRIVATE -Werror)
endif() endif()
endif () # USE_ENTERPRISE
################################################################################ ################################################################################
## arangodump ## arangodump
################################################################################ ################################################################################

12
js/client/modules/@arangodb/process-utils.js
View File

@ -250,14 +250,22 @@ function setupBinaries (builddir, buildType, configDir) {
LOGS_DIR = fs.join(TOP_DIR, 'logs'); LOGS_DIR = fs.join(TOP_DIR, 'logs');
let checkFiles = [ let checkFiles = [
ARANGOBACKUP_BIN,
ARANGOBENCH_BIN, ARANGOBENCH_BIN,
ARANGODUMP_BIN, ARANGODUMP_BIN,
ARANGOD_BIN, ARANGOD_BIN,
ARANGOIMPORT_BIN, ARANGOIMPORT_BIN,
ARANGORESTORE_BIN, ARANGORESTORE_BIN,
ARANGOEXPORT_BIN, ARANGOEXPORT_BIN,
ARANGOSH_BIN]; ARANGOSH_BIN
];
if (global.ARANGODB_CLIENT_VERSION) {
let version = global.ARANGODB_CLIENT_VERSION(true);
if (version.hasOwnProperty('enterprise-version')) {
checkFiles.push(ARANGOBACKUP_BIN);
}
}
for (let b = 0; b < checkFiles.length; ++b) { for (let b = 0; b < checkFiles.length; ++b) {
if (!fs.isFile(checkFiles[b])) { if (!fs.isFile(checkFiles[b])) {
throw new Error('unable to locate ' + checkFiles[b]); throw new Error('unable to locate ' + checkFiles[b]);