Skip to content

Commit

Permalink
Merge pull request #905 from janowagner/cleanup
Browse files Browse the repository at this point in the history
Remove remaining support for SQLite migration.
  • Loading branch information
mattmundell authored Dec 13, 2019
2 parents 21ca8a7 + 4ebb930 commit 339e2ed
Show file tree
Hide file tree
Showing 7 changed files with 5 additions and 3,224 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- Removed tag_value() by using nvti_get_tag() [#825](https://github.com/greenbone/gvmd/pull/825)
- Remove support for "MODIFY_REPORT" GMP command [#823](https://github.com/greenbone/gvmd/pull/823)
- Remove 1.3.6.1.4.1.25623.1.0.90011 from Discovery config (9.0) [#847](https://github.com/greenbone/gvmd/pull/847)
- Removed migration tool "gvm-migrate-to-postgres" including the man page [#905](https://github.com/greenbone/gvmd/pull/905)

[20.4]: https://github.com/greenbone/gvmd/compare/v9.0.0...master

Expand Down
6 changes: 0 additions & 6 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,6 @@ configure_file (src/schema_formats/XML/GMP.xml.in src/schema_formats/XML/GMP.xml
configure_file (tools/greenbone-scapdata-sync.in tools/greenbone-scapdata-sync @ONLY)
configure_file (tools/greenbone-certdata-sync.in tools/greenbone-certdata-sync @ONLY)
configure_file (tools/gvm-portnames-update.in tools/gvm-portnames-update @ONLY)
configure_file (tools/gvm-migrate-to-postgres.in tools/gvm-migrate-to-postgres @ONLY)
configure_file (tools/gvm-manage-certs.in tools/gvm-manage-certs @ONLY)

## Testing
Expand Down Expand Up @@ -582,11 +581,6 @@ install (FILES ${CMAKE_SOURCE_DIR}/tools/gvm-lsc-deb-creator.sh
GROUP_READ GROUP_EXECUTE
WORLD_READ WORLD_EXECUTE)

install (FILES ${CMAKE_BINARY_DIR}/tools/gvm-migrate-to-postgres
DESTINATION ${SBINDIR}
PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE
GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)

install (FILES ${CMAKE_BINARY_DIR}/tools/gvm-manage-certs
DESTINATION ${BINDIR}
PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE
Expand Down
12 changes: 2 additions & 10 deletions doc/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ 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
gvm-migrate-to-postgres.8 gvm-portnames-update.8)
gvm-portnames-update.8)

add_custom_command (OUTPUT gvmd.8
COMMAND sh
Expand All @@ -125,11 +125,6 @@ if (XMLTOMAN_EXECUTABLE)
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)

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

add_custom_command (OUTPUT gvm-portnames-update.8
COMMAND sh
ARGS -c \"${XMLTOMAN_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/gvm-portnames-update.8.xml > ${CMAKE_CURRENT_BINARY_DIR}/gvm-portnames-update.8\;\"
Expand All @@ -145,9 +140,6 @@ else (XMLTOMAN_EXECUTABLE)
add_custom_command (OUTPUT greenbone-scapdata-sync.8
COMMAND echo "[Error: xmltoman required to see manpage here]"
> greenbone-scapdata-sync.8)
add_custom_command (OUTPUT gvm-migrate-to-postgres.8
COMMAND echo "[Error: xmltoman required to see manpage here]"
> gvm-migrate-to-postgres.8)
add_custom_command (OUTPUT gvm-portnames-update.8
COMMAND echo "[Error: xmltoman required to see manpage here]"
> gvm-portnames-update.8)
Expand Down Expand Up @@ -177,6 +169,6 @@ if (XSLTPROC_EXECUTABLE)
endif (XSLTPROC_EXECUTABLE)

install (FILES gvmd.8 greenbone-certdata-sync.8 greenbone-scapdata-sync.8
gvm-migrate-to-postgres.8 gvm-portnames-update.8
gvm-portnames-update.8
DESTINATION share/man/man8/
COMPONENT doc)
24 changes: 0 additions & 24 deletions doc/gvm-migrate-to-postgres.8

This file was deleted.

84 changes: 0 additions & 84 deletions doc/gvm-migrate-to-postgres.8.xml

This file was deleted.

Loading

0 comments on commit 339e2ed

Please sign in to comment.