Skip to content

Commit

Permalink
Change: Make installing feed sync scripts optional #1946
Browse files Browse the repository at this point in the history
Change: Make installing feed sync scripts optional
  • Loading branch information
bjoernricks authored Apr 19, 2023
2 parents 5772d2a + a460309 commit 39d0774
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 31 deletions.
32 changes: 18 additions & 14 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ endif (NOT CMAKE_BUILD_TYPE)

OPTION (ENABLE_COVERAGE "Enable support for coverage analysis" OFF)
OPTION (DEBUG_FUNCTION_NAMES "Print function names on entry and exit" OFF)
# the shell based scripts got replaced by https://github.com/greenbone/greenbone-feed-sync/
OPTION (INSTALL_OLD_SYNC_SCRIPTS "Install shell based feed sync scripts" OFF)

## Retrieve git revision (at configure time)
include (GetGit)
Expand Down Expand Up @@ -394,20 +396,22 @@ install (FILES tools/cert_bund_getbyname.xsl tools/dfn_cert_getbyname.xsl
DESTINATION ${GVM_CERT_RES_DIR}
PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ)

install (FILES ${CMAKE_BINARY_DIR}/tools/greenbone-feed-sync
DESTINATION ${SBINDIR}
PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE
GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)

install (FILES ${CMAKE_BINARY_DIR}/tools/greenbone-scapdata-sync
DESTINATION ${SBINDIR}
PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE
GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)

install (FILES ${CMAKE_BINARY_DIR}/tools/greenbone-certdata-sync
DESTINATION ${SBINDIR}
PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE
GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
if (INSTALL_OLD_SYNC_SCRIPTS)
install (FILES ${CMAKE_BINARY_DIR}/tools/greenbone-feed-sync
DESTINATION ${SBINDIR}
PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE
GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)

install (FILES ${CMAKE_BINARY_DIR}/tools/greenbone-scapdata-sync
DESTINATION ${SBINDIR}
PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE
GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)

install (FILES ${CMAKE_BINARY_DIR}/tools/greenbone-certdata-sync
DESTINATION ${SBINDIR}
PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE
GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
endif (INSTALL_OLD_SYNC_SCRIPTS)

install (FILES ${CMAKE_SOURCE_DIR}/tools/gvm-lsc-deb-creator
${CMAKE_SOURCE_DIR}/tools/gvm-lsc-exe-creator
Expand Down
19 changes: 2 additions & 17 deletions doc/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -106,33 +106,18 @@ endif (NOT XSLTPROC_EXECUTABLE)

if (XMLTOMAN_EXECUTABLE)
add_custom_target (man COMMENT "Building manual page..."
DEPENDS gvmd.8 greenbone-certdata-sync.8 greenbone-scapdata-sync.8)
DEPENDS gvmd.8)

add_custom_command (OUTPUT gvmd.8
COMMAND sh
ARGS -c \"${XMLTOMAN_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/gvmd.8.xml > ${CMAKE_CURRENT_BINARY_DIR}/gvmd.8\;\"
DEPENDS gvmd.8.xml)

add_custom_command (OUTPUT greenbone-certdata-sync.8
COMMAND sh
ARGS -c \"${XMLTOMAN_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/greenbone-certdata-sync.8.xml > ${CMAKE_CURRENT_BINARY_DIR}/greenbone-certdata-sync.8\;\"
DEPENDS greenbone-certdata-sync.8.xml)

add_custom_command (OUTPUT greenbone-scapdata-sync.8
COMMAND sh
ARGS -c \"${XMLTOMAN_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/greenbone-scapdata-sync.8.xml > ${CMAKE_CURRENT_BINARY_DIR}/greenbone-scapdata-sync.8\;\"
DEPENDS greenbone-scapdata-sync.8.xml)
else (XMLTOMAN_EXECUTABLE)
message (STATUS "WARNING: xmltoman is required to generate manpage.")
add_custom_command (OUTPUT gvmd.8
COMMAND echo "[Error: xmltoman required to see manpage here]"
> gvmd.8)
add_custom_command (OUTPUT greenbone-certdata-sync.8
COMMAND echo "[Error: xmltoman required to see manpage here]"
> greenbone-certdata-sync.8)
add_custom_command (OUTPUT greenbone-scapdata-sync.8
COMMAND echo "[Error: xmltoman required to see manpage here]"
> greenbone-scapdata-sync.8)
endif (XMLTOMAN_EXECUTABLE)

if (XMLMANTOHTML_EXECUTABLE)
Expand All @@ -158,6 +143,6 @@ if (XSLTPROC_EXECUTABLE)
COMPONENT doc)
endif (XSLTPROC_EXECUTABLE)

install (FILES gvmd.8 greenbone-certdata-sync.8 greenbone-scapdata-sync.8
install (FILES gvmd.8
DESTINATION share/man/man8/
COMPONENT doc)

0 comments on commit 39d0774

Please sign in to comment.