From cea35d0c33868cbfac9623d3add70d53f6ebf2c9 Mon Sep 17 00:00:00 2001 From: Jan Christoph Uhde Date: Fri, 29 Nov 2019 18:31:41 +0100 Subject: [PATCH] fix js-files install --- cmake/ArangoDBInstall.cmake | 36 ++++++++++++++++++++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-) diff --git a/cmake/ArangoDBInstall.cmake b/cmake/ArangoDBInstall.cmake index 09b3f1333e..45d8c95bf6 100644 --- a/cmake/ArangoDBInstall.cmake +++ b/cmake/ArangoDBInstall.cmake @@ -81,11 +81,43 @@ install( ${PROJECT_SOURCE_DIR}/js/apps ${PROJECT_SOURCE_DIR}/js/server DESTINATION ${CMAKE_INSTALL_DATAROOTDIR_ARANGO}/${ARANGODB_JS_VERSION} - REGEX "^.*/aardvark/APP/react/node_modules$" EXCLUDE + REGEX "^.*/aardvark/APP/.*/react/.*$" EXCLUDE REGEX "^.*/js/server/assets/swagger/*.map$" EXCLUDE REGEX "^.*/.bin" EXCLUDE ) +set(APP_FILES + "react/public/assets/aqltemplates.json" + "react/build/favicon.ico" + "react/build/static" + "react/build/static/media" + "react/build/assets/src/worker-json.js" + "react/build/assets/src/ace.min.js" + "react/build/assets/src/mode-aql.js" + "react/build/assets/src/ext-searchbox.js" +) + +foreach (file ${APP_FILES}) + if(IS_DIRECTORY ${PROJECT_SOURCE_DIR}/js/apps/system/_admin/aardvark/APP/${file}) + install( + DIRECTORY + ${PROJECT_SOURCE_DIR}/js/apps/system/_admin/aardvark/APP/${file} + DESTINATION + ${CMAKE_INSTALL_DATAROOTDIR_ARANGO}/${ARANGODB_JS_VERSION}/system/_admin/aardvark/APP/${file} + REGEX + ".*react.*" EXCLUDE + ) + else() + get_filename_component(dir ${file} DIRECTORY) + install( + FILES + ${PROJECT_SOURCE_DIR}/js/apps/system/_admin/aardvark/APP/${file} + DESTINATION + ${CMAKE_INSTALL_DATAROOTDIR_ARANGO}/${ARANGODB_JS_VERSION}/system/_admin/aardvark/APP/${dir} + ) + endif() +endforeach() + install( FILES ${ARANGODB_SOURCE_DIR}/js/JS_SHA1SUM.txt @@ -151,7 +183,7 @@ if (UNIX) # use pkgconfig for systemd detection find_package(PkgConfig QUIET) if(NOT PKG_CONFIG_FOUND) - message(STATUS "pkg-config not found - skipping systemd detection") + message(STATUS "pkg-config not found - skipping systemd detection") else() set(SYSTEMD_UNIT_DIR "") message(STATUS "detecting systemd")