| 1 | diff --git a/webui-vue/build-dist.cmake b/webui-vue/build-dist.cmake
|
| 2 | index ab94e5a..fc0925e 100644
|
| 3 | |
| 4 | |
| 5 | @@ -80,16 +80,6 @@ if(NOT npm_ci_result EQUAL 0)
|
| 6 | message(FATAL_ERROR "npm ci failed with exit code ${npm_ci_result}")
|
| 7 | endif()
|
| 8 |
|
| 9 | -message(STATUS "Running npm audit in ${WEBUI_VUE_SRC_DIR}")
|
| 10 | -execute_process(
|
| 11 | - COMMAND "${NPM_EXECUTABLE}" audit
|
| 12 | - WORKING_DIRECTORY "${WEBUI_VUE_SRC_DIR}"
|
| 13 | - RESULT_VARIABLE npm_audit_result
|
| 14 | -)
|
| 15 | -if(NOT npm_audit_result EQUAL 0)
|
| 16 | - message(WARNING "npm audit failed with exit code ${npm_audit_result}")
|
| 17 | -endif()
|
| 18 | -
|
| 19 | message(STATUS "Building webui-vue dist in ${DIST_DIR}")
|
| 20 | execute_process(
|
| 21 | COMMAND "${CMAKE_COMMAND}" -E env "BAREOS_FULL_VERSION=${BAREOS_FULL_VERSION}"
|
| 22 | diff --git a/webui-vue/CMakeLists.txt b/webui-vue/CMakeLists.txt
|
| 23 | index cfd7958..1afd7c9 100644
|
| 24 | |
| 25 | |
| 26 | @@ -53,7 +53,6 @@ set(WEBUI_VUE_PACKAGE_JSON "${WEBUI_VUE_SRC}/package.json")
|
| 27 | set(WEBUI_VUE_PACKAGE_LOCK "${WEBUI_VUE_SRC}/package-lock.json")
|
| 28 | set(WEBUI_VUE_BUILD_SCRIPT "${WEBUI_VUE_SRC}/build-dist.cmake")
|
| 29 | set(WEBUI_VUE_BUILD_STAMP "${CMAKE_CURRENT_BINARY_DIR}/webui-vue-build.stamp")
|
| 30 | -set(WEBUI_VUE_AUDIT_STAMP "${CMAKE_CURRENT_BINARY_DIR}/webui-vue-audit.stamp")
|
| 31 | set(WEBUI_VUE_NPM_CI_STAMP "${CMAKE_CURRENT_BINARY_DIR}/webui-vue-npm-ci.stamp")
|
| 32 | set(WEBUI_VUE_NPM_MISSING_SCRIPT
|
| 33 | "${CMAKE_CURRENT_BINARY_DIR}/webui-vue-npm-missing.cmake"
|
| 34 | @@ -110,17 +109,6 @@ if(NPM_EXECUTABLE)
|
| 35 | USES_TERMINAL VERBATIM
|
| 36 | )
|
| 37 |
|
| 38 | - add_custom_command(
|
| 39 | - OUTPUT "${WEBUI_VUE_AUDIT_STAMP}"
|
| 40 | - COMMAND ${CMAKE_COMMAND} -E chdir "${WEBUI_VUE_SRC}" "${NPM_EXECUTABLE}"
|
| 41 | - audit
|
| 42 | - COMMAND ${CMAKE_COMMAND} -E touch "${WEBUI_VUE_AUDIT_STAMP}"
|
| 43 | - DEPENDS "${WEBUI_VUE_NPM_CI_STAMP}" "${WEBUI_VUE_PACKAGE_JSON}"
|
| 44 | - "${WEBUI_VUE_PACKAGE_LOCK}"
|
| 45 | - COMMENT "Auditing Bareos WebUI Vue npm packages"
|
| 46 | - USES_TERMINAL VERBATIM
|
| 47 | - )
|
| 48 | -
|
| 49 | add_custom_command(
|
| 50 | OUTPUT "${WEBUI_VUE_BUILD_STAMP}"
|
| 51 | COMMAND ${CMAKE_COMMAND} -DDIST_DIR=${WEBUI_VUE_DIST} -P
|
| 52 | @@ -131,15 +119,12 @@ if(NPM_EXECUTABLE)
|
| 53 | USES_TERMINAL VERBATIM
|
| 54 | )
|
| 55 |
|
| 56 | - add_custom_target(bareos-webui-vue-audit DEPENDS "${WEBUI_VUE_AUDIT_STAMP}")
|
| 57 | add_custom_target(bareos-webui-vue-build DEPENDS "${WEBUI_VUE_BUILD_STAMP}")
|
| 58 | else()
|
| 59 | add_custom_target(
|
| 60 | - bareos-webui-vue-audit
|
| 61 | COMMAND ${CMAKE_COMMAND} -P "${WEBUI_VUE_NPM_MISSING_SCRIPT}"
|
| 62 | VERBATIM
|
| 63 | )
|
| 64 | - add_custom_target(bareos-webui-vue-build DEPENDS bareos-webui-vue-audit)
|
| 65 | endif()
|
| 66 |
|
| 67 | install(CODE "${WEBUI_VUE_INSTALL_CODE}" COMPONENT webui-vue)
|