diff --git a/CMakeLists.txt b/CMakeLists.txt index a531c71928..4fb9571b8a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1249,10 +1249,12 @@ add_subdirectory(arangod) if (USE_GOOGLE_TESTS) add_subdirectory(tests) -endif() +endif () add_dependencies(arangobench zlibstatic) -add_dependencies(arangobackup zlibstatic) +if (USE_ENTERPRISE) + add_dependencies(arangobackup zlibstatic) +endif () add_dependencies(arangod zlibstatic) add_dependencies(arangodump zlibstatic) add_dependencies(arangoexport zlibstatic) @@ -1260,21 +1262,26 @@ add_dependencies(arangoimport zlibstatic) add_dependencies(arangorestore zlibstatic) add_dependencies(arangosh zlibstatic) -if(UNIX) +if (UNIX) add_dependencies(arangobench man) - add_dependencies(arangobackup man) + if (USE_ENTERPRISE) + add_dependencies(arangobackup man) + endif () add_dependencies(arangod man) add_dependencies(arangodump man) add_dependencies(arangoexport man) add_dependencies(arangoimport man) add_dependencies(arangorestore man) add_dependencies(arangosh man) -endif() +endif () if (NOT USE_PRECOMPILED_V8) # all binaries depend on v8_build because it contains ICU as well 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(arangodump v8_build) add_dependencies(arangoexport v8_build) @@ -1283,7 +1290,7 @@ if (NOT USE_PRECOMPILED_V8) add_dependencies(arangosh v8_build) if (USE_GOOGLE_TESTS) add_dependencies(arangodbtests v8_build) - endif() + endif () endif () add_custom_target(packages @@ -1296,11 +1303,11 @@ add_custom_target(copy_packages add_custom_target(clean_packages DEPENDS ${CLEAN_PACKAGES_LIST} - ) +) add_custom_target(clean_autogenerated_files DEPENDS ${CLEAN_AUTOGENERATED_FILES} - ) +) message(STATUS "building for git revision: ${ARANGODB_BUILD_REPOSITORY}") diff --git a/arangosh/CMakeLists.txt b/arangosh/CMakeLists.txt index 620c3ce37f..4ca388941e 100644 --- a/arangosh/CMakeLists.txt +++ b/arangosh/CMakeLists.txt @@ -64,6 +64,8 @@ endif() ## arangobackup ################################################################################ +if (USE_ENTERPRISE) + if (MSVC AND NOT(SKIP_PACKAGING)) generate_product_version(ProductVersionFiles_arangobackup NAME arangobackup @@ -118,6 +120,8 @@ if (DARWIN) target_compile_options(arangobackup PRIVATE -Werror) endif() +endif () # USE_ENTERPRISE + ################################################################################ ## arangodump ################################################################################ diff --git a/js/client/modules/@arangodb/process-utils.js b/js/client/modules/@arangodb/process-utils.js index 4302894dbb..4ae770b153 100755 --- a/js/client/modules/@arangodb/process-utils.js +++ b/js/client/modules/@arangodb/process-utils.js @@ -250,14 +250,22 @@ function setupBinaries (builddir, buildType, configDir) { LOGS_DIR = fs.join(TOP_DIR, 'logs'); let checkFiles = [ - ARANGOBACKUP_BIN, ARANGOBENCH_BIN, ARANGODUMP_BIN, ARANGOD_BIN, ARANGOIMPORT_BIN, ARANGORESTORE_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) { if (!fs.isFile(checkFiles[b])) { throw new Error('unable to locate ' + checkFiles[b]);