From 5aa8d886948912e27f95968bbb3964fd4c760726 Mon Sep 17 00:00:00 2001 From: Marcus Holland-Moritz Date: Fri, 9 Aug 2024 17:41:06 +0200 Subject: [PATCH] refactor: move tools to their own directory --- CMakeLists.txt | 216 +++++++++--------- cmake/dwarfs_install.cmake.in | 4 +- cmake/version.cmake | 6 +- include/dwarfs/tool/manpage.h | 5 - src/{dwarfs => }/block_compressor.cpp | 0 src/{dwarfs => }/block_compressor_parser.cpp | 0 src/{dwarfs => }/checksum.cpp | 0 src/{dwarfs => }/compression/brotli.cpp | 0 src/{dwarfs => }/compression/flac.cpp | 0 src/{dwarfs => }/compression/lz4.cpp | 0 src/{dwarfs => }/compression/lzma.cpp | 0 src/{dwarfs => }/compression/null.cpp | 0 src/{dwarfs => }/compression/ricepp.cpp | 0 src/{dwarfs => }/compression/zstd.cpp | 0 src/{dwarfs => }/conv.cpp | 0 src/{dwarfs => }/error.cpp | 0 src/{dwarfs => }/file_access_generic.cpp | 0 src/{dwarfs => }/file_stat.cpp | 0 src/{dwarfs => }/fstypes.cpp | 0 src/{dwarfs => }/history.cpp | 0 src/{dwarfs => }/internal/features.cpp | 0 .../internal/file_status_conv.cpp | 0 src/{dwarfs => }/internal/fs_section.cpp | 0 src/{dwarfs => }/internal/string_table.cpp | 0 src/{dwarfs => }/internal/wcwidth.c | 0 src/{dwarfs => }/internal/worker_group.cpp | 0 src/{dwarfs => }/library_dependencies.cpp | 0 src/{dwarfs => }/logger.cpp | 0 src/{dwarfs => }/mmap.cpp | 0 src/{dwarfs => }/option_map.cpp | 0 src/{dwarfs => }/options.cpp | 0 src/{dwarfs => }/os_access_generic.cpp | 0 src/{dwarfs => }/pcm_sample_transformer.cpp | 0 src/{dwarfs => }/performance_monitor.cpp | 0 src/{dwarfs => }/reader/block_range.cpp | 0 src/{dwarfs => }/reader/filesystem_v2.cpp | 0 .../reader/internal/block_cache.cpp | 0 .../reader/internal/cached_block.cpp | 0 .../reader/internal/filesystem_parser.cpp | 0 .../reader/internal/inode_reader_v2.cpp | 0 .../reader/internal/metadata_types.cpp | 0 .../reader/internal/metadata_v2.cpp | 0 src/{dwarfs => }/reader/metadata_types.cpp | 0 src/{dwarfs => }/terminal_ansi.cpp | 0 src/{dwarfs => }/thread_pool.cpp | 0 src/{dwarfs => }/tool/iolayer.cpp | 0 src/{dwarfs => }/tool/main_adapter.cpp | 0 src/{dwarfs => }/tool/pager.cpp | 0 src/{dwarfs => }/tool/render_manpage.cpp | 0 src/{dwarfs => }/tool/safe_main.cpp | 0 src/{dwarfs => }/tool/sys_char.cpp | 0 src/{dwarfs => }/tool/tool.cpp | 0 src/{dwarfs => }/util.cpp | 0 .../utility/filesystem_extractor.cpp | 0 .../utility/rewrite_filesystem.cpp | 0 src/{dwarfs => }/writer/categorizer.cpp | 0 .../writer/categorizer/binary_categorizer.cpp | 0 .../writer/categorizer/fits_categorizer.cpp | 0 .../incompressible_categorizer.cpp | 0 .../categorizer/libmagic_categorizer.cpp | 0 .../categorizer/pcmaudio_categorizer.cpp | 0 src/{dwarfs => }/writer/category_parser.cpp | 0 .../writer/chmod_entry_transformer.cpp | 0 .../compression_metadata_requirements.cpp | 0 src/{dwarfs => }/writer/console_writer.cpp | 0 src/{dwarfs => }/writer/entry_factory.cpp | 0 .../filesystem_block_category_resolver.cpp | 0 src/{dwarfs => }/writer/filesystem_writer.cpp | 0 src/{dwarfs => }/writer/filter_debug.cpp | 0 src/{dwarfs => }/writer/fragment_category.cpp | 0 .../writer/fragment_order_parser.cpp | 0 src/{dwarfs => }/writer/inode_fragments.cpp | 0 .../writer/internal/block_manager.cpp | 0 .../writer/internal/chmod_transformer.cpp | 0 src/{dwarfs => }/writer/internal/entry.cpp | 0 .../writer/internal/file_scanner.cpp | 0 .../writer/internal/fragment_chunkable.cpp | 0 .../writer/internal/global_entry_data.cpp | 0 .../writer/internal/inode_element_view.cpp | 0 .../writer/internal/inode_manager.cpp | 0 .../writer/internal/inode_ordering.cpp | 0 .../writer/internal/metadata_freezer.cpp | 0 src/{dwarfs => }/writer/internal/nilsimsa.cpp | 0 src/{dwarfs => }/writer/internal/progress.cpp | 0 .../writer/internal/scanner_progress.cpp | 0 .../writer/internal/similarity.cpp | 0 .../writer/internal/similarity_ordering.cpp | 0 .../writer/rule_based_entry_filter.cpp | 0 src/{dwarfs => }/writer/scanner.cpp | 0 src/{dwarfs => }/writer/segmenter.cpp | 0 src/{dwarfs => }/writer/segmenter_factory.cpp | 0 src/{dwarfs => }/writer/writer_progress.cpp | 0 src/{dwarfs => }/xattr.cpp | 0 src/{dwarfs => }/xattr_posix.cpp | 0 src/{dwarfs => }/xattr_win.cpp | 0 test/manpage_test.cpp | 1 + {include => tools/include}/dwarfs_tool_main.h | 0 tools/include/dwarfs_tool_manpage.h | 33 +++ {src => tools/src}/dwarfs.cpp | 0 {src => tools/src}/dwarfs_main.cpp | 1 + {src => tools/src}/dwarfsck.cpp | 0 {src => tools/src}/dwarfsck_main.cpp | 1 + {src => tools/src}/dwarfsextract.cpp | 0 {src => tools/src}/dwarfsextract_main.cpp | 1 + {src => tools/src}/mkdwarfs.cpp | 0 {src => tools/src}/mkdwarfs_main.cpp | 1 + {src => tools/src}/pxattr.cpp | 0 {src => tools/src}/universal.cpp | 0 108 files changed, 154 insertions(+), 115 deletions(-) rename src/{dwarfs => }/block_compressor.cpp (100%) rename src/{dwarfs => }/block_compressor_parser.cpp (100%) rename src/{dwarfs => }/checksum.cpp (100%) rename src/{dwarfs => }/compression/brotli.cpp (100%) rename src/{dwarfs => }/compression/flac.cpp (100%) rename src/{dwarfs => }/compression/lz4.cpp (100%) rename src/{dwarfs => }/compression/lzma.cpp (100%) rename src/{dwarfs => }/compression/null.cpp (100%) rename src/{dwarfs => }/compression/ricepp.cpp (100%) rename src/{dwarfs => }/compression/zstd.cpp (100%) rename src/{dwarfs => }/conv.cpp (100%) rename src/{dwarfs => }/error.cpp (100%) rename src/{dwarfs => }/file_access_generic.cpp (100%) rename src/{dwarfs => }/file_stat.cpp (100%) rename src/{dwarfs => }/fstypes.cpp (100%) rename src/{dwarfs => }/history.cpp (100%) rename src/{dwarfs => }/internal/features.cpp (100%) rename src/{dwarfs => }/internal/file_status_conv.cpp (100%) rename src/{dwarfs => }/internal/fs_section.cpp (100%) rename src/{dwarfs => }/internal/string_table.cpp (100%) rename src/{dwarfs => }/internal/wcwidth.c (100%) rename src/{dwarfs => }/internal/worker_group.cpp (100%) rename src/{dwarfs => }/library_dependencies.cpp (100%) rename src/{dwarfs => }/logger.cpp (100%) rename src/{dwarfs => }/mmap.cpp (100%) rename src/{dwarfs => }/option_map.cpp (100%) rename src/{dwarfs => }/options.cpp (100%) rename src/{dwarfs => }/os_access_generic.cpp (100%) rename src/{dwarfs => }/pcm_sample_transformer.cpp (100%) rename src/{dwarfs => }/performance_monitor.cpp (100%) rename src/{dwarfs => }/reader/block_range.cpp (100%) rename src/{dwarfs => }/reader/filesystem_v2.cpp (100%) rename src/{dwarfs => }/reader/internal/block_cache.cpp (100%) rename src/{dwarfs => }/reader/internal/cached_block.cpp (100%) rename src/{dwarfs => }/reader/internal/filesystem_parser.cpp (100%) rename src/{dwarfs => }/reader/internal/inode_reader_v2.cpp (100%) rename src/{dwarfs => }/reader/internal/metadata_types.cpp (100%) rename src/{dwarfs => }/reader/internal/metadata_v2.cpp (100%) rename src/{dwarfs => }/reader/metadata_types.cpp (100%) rename src/{dwarfs => }/terminal_ansi.cpp (100%) rename src/{dwarfs => }/thread_pool.cpp (100%) rename src/{dwarfs => }/tool/iolayer.cpp (100%) rename src/{dwarfs => }/tool/main_adapter.cpp (100%) rename src/{dwarfs => }/tool/pager.cpp (100%) rename src/{dwarfs => }/tool/render_manpage.cpp (100%) rename src/{dwarfs => }/tool/safe_main.cpp (100%) rename src/{dwarfs => }/tool/sys_char.cpp (100%) rename src/{dwarfs => }/tool/tool.cpp (100%) rename src/{dwarfs => }/util.cpp (100%) rename src/{dwarfs => }/utility/filesystem_extractor.cpp (100%) rename src/{dwarfs => }/utility/rewrite_filesystem.cpp (100%) rename src/{dwarfs => }/writer/categorizer.cpp (100%) rename src/{dwarfs => }/writer/categorizer/binary_categorizer.cpp (100%) rename src/{dwarfs => }/writer/categorizer/fits_categorizer.cpp (100%) rename src/{dwarfs => }/writer/categorizer/incompressible_categorizer.cpp (100%) rename src/{dwarfs => }/writer/categorizer/libmagic_categorizer.cpp (100%) rename src/{dwarfs => }/writer/categorizer/pcmaudio_categorizer.cpp (100%) rename src/{dwarfs => }/writer/category_parser.cpp (100%) rename src/{dwarfs => }/writer/chmod_entry_transformer.cpp (100%) rename src/{dwarfs => }/writer/compression_metadata_requirements.cpp (100%) rename src/{dwarfs => }/writer/console_writer.cpp (100%) rename src/{dwarfs => }/writer/entry_factory.cpp (100%) rename src/{dwarfs => }/writer/filesystem_block_category_resolver.cpp (100%) rename src/{dwarfs => }/writer/filesystem_writer.cpp (100%) rename src/{dwarfs => }/writer/filter_debug.cpp (100%) rename src/{dwarfs => }/writer/fragment_category.cpp (100%) rename src/{dwarfs => }/writer/fragment_order_parser.cpp (100%) rename src/{dwarfs => }/writer/inode_fragments.cpp (100%) rename src/{dwarfs => }/writer/internal/block_manager.cpp (100%) rename src/{dwarfs => }/writer/internal/chmod_transformer.cpp (100%) rename src/{dwarfs => }/writer/internal/entry.cpp (100%) rename src/{dwarfs => }/writer/internal/file_scanner.cpp (100%) rename src/{dwarfs => }/writer/internal/fragment_chunkable.cpp (100%) rename src/{dwarfs => }/writer/internal/global_entry_data.cpp (100%) rename src/{dwarfs => }/writer/internal/inode_element_view.cpp (100%) rename src/{dwarfs => }/writer/internal/inode_manager.cpp (100%) rename src/{dwarfs => }/writer/internal/inode_ordering.cpp (100%) rename src/{dwarfs => }/writer/internal/metadata_freezer.cpp (100%) rename src/{dwarfs => }/writer/internal/nilsimsa.cpp (100%) rename src/{dwarfs => }/writer/internal/progress.cpp (100%) rename src/{dwarfs => }/writer/internal/scanner_progress.cpp (100%) rename src/{dwarfs => }/writer/internal/similarity.cpp (100%) rename src/{dwarfs => }/writer/internal/similarity_ordering.cpp (100%) rename src/{dwarfs => }/writer/rule_based_entry_filter.cpp (100%) rename src/{dwarfs => }/writer/scanner.cpp (100%) rename src/{dwarfs => }/writer/segmenter.cpp (100%) rename src/{dwarfs => }/writer/segmenter_factory.cpp (100%) rename src/{dwarfs => }/writer/writer_progress.cpp (100%) rename src/{dwarfs => }/xattr.cpp (100%) rename src/{dwarfs => }/xattr_posix.cpp (100%) rename src/{dwarfs => }/xattr_win.cpp (100%) rename {include => tools/include}/dwarfs_tool_main.h (100%) create mode 100644 tools/include/dwarfs_tool_manpage.h rename {src => tools/src}/dwarfs.cpp (100%) rename {src => tools/src}/dwarfs_main.cpp (99%) rename {src => tools/src}/dwarfsck.cpp (100%) rename {src => tools/src}/dwarfsck_main.cpp (99%) rename {src => tools/src}/dwarfsextract.cpp (100%) rename {src => tools/src}/dwarfsextract_main.cpp (99%) rename {src => tools/src}/mkdwarfs.cpp (100%) rename {src => tools/src}/mkdwarfs_main.cpp (99%) rename {src => tools/src}/pxattr.cpp (100%) rename {src => tools/src}/universal.cpp (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 72487604..562a15c6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -407,134 +407,134 @@ endif() add_library( dwarfs_common - src/dwarfs/block_compressor.cpp - src/dwarfs/block_compressor_parser.cpp - src/dwarfs/checksum.cpp - src/dwarfs/conv.cpp - src/dwarfs/error.cpp - src/dwarfs/file_access_generic.cpp - src/dwarfs/file_stat.cpp - src/dwarfs/fstypes.cpp - src/dwarfs/history.cpp - src/dwarfs/library_dependencies.cpp - src/dwarfs/logger.cpp - src/dwarfs/mmap.cpp - src/dwarfs/option_map.cpp - src/dwarfs/options.cpp - src/dwarfs/os_access_generic.cpp - src/dwarfs/pcm_sample_transformer.cpp - src/dwarfs/performance_monitor.cpp - src/dwarfs/terminal_ansi.cpp - src/dwarfs/thread_pool.cpp - src/dwarfs/util.cpp - src/dwarfs/xattr.cpp + src/block_compressor.cpp + src/block_compressor_parser.cpp + src/checksum.cpp + src/conv.cpp + src/error.cpp + src/file_access_generic.cpp + src/file_stat.cpp + src/fstypes.cpp + src/history.cpp + src/library_dependencies.cpp + src/logger.cpp + src/mmap.cpp + src/option_map.cpp + src/options.cpp + src/os_access_generic.cpp + src/pcm_sample_transformer.cpp + src/performance_monitor.cpp + src/terminal_ansi.cpp + src/thread_pool.cpp + src/util.cpp + src/xattr.cpp - src/dwarfs/internal/features.cpp - src/dwarfs/internal/file_status_conv.cpp - src/dwarfs/internal/fs_section.cpp - src/dwarfs/internal/string_table.cpp - src/dwarfs/internal/wcwidth.c - src/dwarfs/internal/worker_group.cpp + src/internal/features.cpp + src/internal/file_status_conv.cpp + src/internal/fs_section.cpp + src/internal/string_table.cpp + src/internal/wcwidth.c + src/internal/worker_group.cpp - src/dwarfs/xattr_$,win,posix>.cpp + src/xattr_$,win,posix>.cpp - $/src/dwarfs/version.cpp + $/src/version.cpp - src/dwarfs/compression/null.cpp - src/dwarfs/compression/zstd.cpp - $<$:src/dwarfs/compression/lzma.cpp> - $<$:src/dwarfs/compression/lz4.cpp> - $<$,$>:src/dwarfs/compression/brotli.cpp> - $<$:src/dwarfs/compression/flac.cpp> - $<$:src/dwarfs/compression/ricepp.cpp> + src/compression/null.cpp + src/compression/zstd.cpp + $<$:src/compression/lzma.cpp> + $<$:src/compression/lz4.cpp> + $<$,$>:src/compression/brotli.cpp> + $<$:src/compression/flac.cpp> + $<$:src/compression/ricepp.cpp> ) add_library( dwarfs_reader - src/dwarfs/reader/block_range.cpp - src/dwarfs/reader/filesystem_v2.cpp - src/dwarfs/reader/metadata_types.cpp + src/reader/block_range.cpp + src/reader/filesystem_v2.cpp + src/reader/metadata_types.cpp - src/dwarfs/reader/internal/block_cache.cpp - src/dwarfs/reader/internal/cached_block.cpp - src/dwarfs/reader/internal/filesystem_parser.cpp - src/dwarfs/reader/internal/inode_reader_v2.cpp - src/dwarfs/reader/internal/metadata_types.cpp - src/dwarfs/reader/internal/metadata_v2.cpp + src/reader/internal/block_cache.cpp + src/reader/internal/cached_block.cpp + src/reader/internal/filesystem_parser.cpp + src/reader/internal/inode_reader_v2.cpp + src/reader/internal/metadata_types.cpp + src/reader/internal/metadata_v2.cpp ) add_library( dwarfs_writer - src/dwarfs/writer/categorizer.cpp - src/dwarfs/writer/category_parser.cpp - src/dwarfs/writer/chmod_entry_transformer.cpp - src/dwarfs/writer/compression_metadata_requirements.cpp - src/dwarfs/writer/console_writer.cpp - src/dwarfs/writer/entry_factory.cpp - src/dwarfs/writer/filesystem_block_category_resolver.cpp - src/dwarfs/writer/filesystem_writer.cpp - src/dwarfs/writer/filter_debug.cpp - src/dwarfs/writer/fragment_category.cpp - src/dwarfs/writer/fragment_order_parser.cpp - src/dwarfs/writer/inode_fragments.cpp - src/dwarfs/writer/rule_based_entry_filter.cpp - src/dwarfs/writer/scanner.cpp - src/dwarfs/writer/segmenter.cpp - src/dwarfs/writer/segmenter_factory.cpp - src/dwarfs/writer/writer_progress.cpp + src/writer/categorizer.cpp + src/writer/category_parser.cpp + src/writer/chmod_entry_transformer.cpp + src/writer/compression_metadata_requirements.cpp + src/writer/console_writer.cpp + src/writer/entry_factory.cpp + src/writer/filesystem_block_category_resolver.cpp + src/writer/filesystem_writer.cpp + src/writer/filter_debug.cpp + src/writer/fragment_category.cpp + src/writer/fragment_order_parser.cpp + src/writer/inode_fragments.cpp + src/writer/rule_based_entry_filter.cpp + src/writer/scanner.cpp + src/writer/segmenter.cpp + src/writer/segmenter_factory.cpp + src/writer/writer_progress.cpp - src/dwarfs/writer/internal/block_manager.cpp - src/dwarfs/writer/internal/chmod_transformer.cpp - src/dwarfs/writer/internal/entry.cpp - src/dwarfs/writer/internal/file_scanner.cpp - src/dwarfs/writer/internal/fragment_chunkable.cpp - src/dwarfs/writer/internal/global_entry_data.cpp - src/dwarfs/writer/internal/inode_element_view.cpp - src/dwarfs/writer/internal/inode_manager.cpp - src/dwarfs/writer/internal/inode_ordering.cpp - src/dwarfs/writer/internal/metadata_freezer.cpp - src/dwarfs/writer/internal/nilsimsa.cpp - src/dwarfs/writer/internal/progress.cpp - src/dwarfs/writer/internal/scanner_progress.cpp - src/dwarfs/writer/internal/similarity.cpp - src/dwarfs/writer/internal/similarity_ordering.cpp + src/writer/internal/block_manager.cpp + src/writer/internal/chmod_transformer.cpp + src/writer/internal/entry.cpp + src/writer/internal/file_scanner.cpp + src/writer/internal/fragment_chunkable.cpp + src/writer/internal/global_entry_data.cpp + src/writer/internal/inode_element_view.cpp + src/writer/internal/inode_manager.cpp + src/writer/internal/inode_ordering.cpp + src/writer/internal/metadata_freezer.cpp + src/writer/internal/nilsimsa.cpp + src/writer/internal/progress.cpp + src/writer/internal/scanner_progress.cpp + src/writer/internal/similarity.cpp + src/writer/internal/similarity_ordering.cpp - # src/dwarfs/writer/categorizer/binary_categorizer.cpp - src/dwarfs/writer/categorizer/fits_categorizer.cpp - src/dwarfs/writer/categorizer/incompressible_categorizer.cpp - src/dwarfs/writer/categorizer/pcmaudio_categorizer.cpp + # src/writer/categorizer/binary_categorizer.cpp + src/writer/categorizer/fits_categorizer.cpp + src/writer/categorizer/incompressible_categorizer.cpp + src/writer/categorizer/pcmaudio_categorizer.cpp - # $<$:src/dwarfs/writer/categorizer/libmagic_categorizer.cpp> + # $<$:src/writer/categorizer/libmagic_categorizer.cpp> ) add_library( dwarfs_rewrite - src/dwarfs/utility/rewrite_filesystem.cpp + src/utility/rewrite_filesystem.cpp ) add_library( dwarfs_extractor - src/dwarfs/utility/filesystem_extractor.cpp + src/utility/filesystem_extractor.cpp ) add_library( dwarfs_tool OBJECT - src/dwarfs/tool/iolayer.cpp - src/dwarfs/tool/main_adapter.cpp - src/dwarfs/tool/safe_main.cpp - src/dwarfs/tool/sys_char.cpp - src/dwarfs/tool/tool.cpp + src/tool/iolayer.cpp + src/tool/main_adapter.cpp + src/tool/safe_main.cpp + src/tool/sys_char.cpp + src/tool/tool.cpp ) if(WITH_MAN_OPTION) target_sources(dwarfs_tool PRIVATE - src/dwarfs/tool/pager.cpp - src/dwarfs/tool/render_manpage.cpp + src/tool/pager.cpp + src/tool/render_manpage.cpp ) endif() @@ -570,15 +570,15 @@ if(STATIC_BUILD_DO_NOT_USE) endif(STATIC_BUILD_DO_NOT_USE) foreach(tgt mkdwarfs dwarfsck dwarfsextract) - add_library(${tgt}_main OBJECT src/${tgt}_main.cpp) + add_library(${tgt}_main OBJECT tools/src/${tgt}_main.cpp) - add_executable(${tgt} src/${tgt}.cpp) + add_executable(${tgt} tools/src/${tgt}.cpp) list(APPEND BINARY_TARGETS ${tgt}) endforeach() if(WITH_UNIVERSAL_BINARY) - add_executable(dwarfsuniversal src/universal.cpp) + add_executable(dwarfsuniversal tools/src/universal.cpp) list(APPEND BINARY_TARGETS dwarfsuniversal) target_link_libraries(dwarfsuniversal PRIVATE @@ -589,7 +589,7 @@ if(WITH_UNIVERSAL_BINARY) endif() if(WITH_PXATTR) - add_executable(pxattr src/pxattr.cpp) + add_executable(pxattr tools/src/pxattr.cpp) list(APPEND BINARY_TARGETS pxattr) endif() @@ -598,9 +598,9 @@ install(TARGETS mkdwarfs dwarfsck dwarfsextract RUNTIME DESTINATION bin) list(APPEND MAIN_TARGETS mkdwarfs_main dwarfsck_main dwarfsextract_main) if(FUSE3_FOUND OR WINFSP OR APPLE) - add_library(dwarfs_main OBJECT src/dwarfs_main.cpp) + add_library(dwarfs_main OBJECT tools/src/dwarfs_main.cpp) target_compile_definitions(dwarfs_main PRIVATE _FILE_OFFSET_BITS=64) - add_executable(dwarfs-bin src/dwarfs.cpp) + add_executable(dwarfs-bin tools/src/dwarfs.cpp) target_link_libraries(dwarfs-bin PRIVATE dwarfs_main) set_target_properties(dwarfs-bin PROPERTIES OUTPUT_NAME dwarfs) if(WINFSP) @@ -639,11 +639,11 @@ if(FUSE3_FOUND OR WINFSP OR APPLE) endif() if(FUSE_FOUND AND (NOT APPLE) AND (WITH_LEGACY_FUSE OR NOT FUSE3_FOUND)) - add_library(dwarfs2_main src/dwarfs_main.cpp) + add_library(dwarfs2_main tools/src/dwarfs_main.cpp) target_compile_definitions(dwarfs2_main PRIVATE _FILE_OFFSET_BITS=64 FUSE_USE_VERSION=29) target_link_libraries(dwarfs2_main PRIVATE PkgConfig::FUSE) - add_executable(dwarfs2-bin src/dwarfs.cpp) + add_executable(dwarfs2-bin tools/src/dwarfs.cpp) target_link_libraries(dwarfs2-bin PRIVATE dwarfs2_main) if(WITH_UNIVERSAL_BINARY AND (NOT FUSE3_FOUND)) target_link_libraries(dwarfsuniversal PRIVATE dwarfs2_main) @@ -662,7 +662,7 @@ endif() if(WITH_MAN_OPTION) if(DWARFS_GIT_BUILD) include(${CMAKE_SOURCE_DIR}/cmake/render_manpage.cmake) - file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/src/dwarfs/tool") + file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/tools/src") set(DWARFS_MANPAGE_SOURCE_DIR ${CMAKE_CURRENT_BINARY_DIR}) else() set(DWARFS_MANPAGE_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) @@ -670,18 +670,18 @@ if(WITH_MAN_OPTION) foreach(man mkdwarfs dwarfs dwarfsck dwarfsextract) if(DWARFS_GIT_BUILD) - file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/src/dwarfs") + file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/tools/src") add_manpage_source(doc/${man}.md NAME ${man} - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/src/dwarfs/tool/${man}_manpage.cpp) + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/tools/src/${man}_manpage.cpp) endif() if(TARGET ${man}_main) - target_sources(${man}_main PRIVATE ${DWARFS_MANPAGE_SOURCE_DIR}/src/dwarfs/tool/${man}_manpage.cpp) + target_sources(${man}_main PRIVATE ${DWARFS_MANPAGE_SOURCE_DIR}/tools/src/${man}_manpage.cpp) endif() endforeach() if(TARGET dwarfs2_main) - target_sources(dwarfs2_main PRIVATE ${DWARFS_MANPAGE_SOURCE_DIR}/src/dwarfs/tool/dwarfs_manpage.cpp) + target_sources(dwarfs2_main PRIVATE ${DWARFS_MANPAGE_SOURCE_DIR}/tools/src/dwarfs_manpage.cpp) endif() endif() @@ -845,6 +845,10 @@ set(DWARFS_PERFMON_ENABLED ${ENABLE_PERFMON}) set(DWARFS_STACKTRACE_ENABLED ${ENABLE_STACKTRACE}) configure_file(cmake/config.h.in include/dwarfs/config.h @ONLY) +foreach(tgt ${BINARY_TARGETS} ${TEST_TARGETS} ${MAIN_TARGETS}) + target_include_directories(${tgt} PRIVATE $) +endforeach() + foreach(tgt dwarfs_common dwarfs_reader dwarfs_writer dwarfs_extractor dwarfs_rewrite dwarfs_tool ${BINARY_TARGETS} ${TEST_TARGETS} ${MAIN_TARGETS}) @@ -1105,7 +1109,7 @@ add_custom_target( dwarfs_install.cmake package_version.cmake CPackConfig.cmake CPackSourceConfig.cmake _CPack_Packages CTestTestfile.cmake Testing - fbthrift folly zstd ricepp + fbthrift folly zstd ricepp tools include src thrift universal bin lib man1 man5 vcpkg-manifest-install.log build.ninja .ninja_deps @@ -1129,6 +1133,8 @@ file(GLOB_RECURSE ALL_SOURCES LIST_DIRECTORIES false ${CMAKE_CURRENT_SOURCE_DIR}/ricepp/*.cpp ${CMAKE_CURRENT_SOURCE_DIR}/include/*.h ${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/tools/include/*.h + ${CMAKE_CURRENT_SOURCE_DIR}/tools/src/*.cpp ${CMAKE_CURRENT_SOURCE_DIR}/test/*.h ${CMAKE_CURRENT_SOURCE_DIR}/test/*.cpp) diff --git a/cmake/dwarfs_install.cmake.in b/cmake/dwarfs_install.cmake.in index ec911437..09097733 100644 --- a/cmake/dwarfs_install.cmake.in +++ b/cmake/dwarfs_install.cmake.in @@ -19,12 +19,12 @@ if(CPACK_SOURCE_INSTALLED_DIRECTORIES) message(STATUS "Adding versioning files from @PROJECT_BINARY_DIR@ to ${CMAKE_CURRENT_BINARY_DIR}...") file(INSTALL "@PROJECT_BINARY_DIR@/include/dwarfs/version.h" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/include/dwarfs") - file(INSTALL "@PROJECT_BINARY_DIR@/src/dwarfs/version.cpp" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/src/dwarfs") + file(INSTALL "@PROJECT_BINARY_DIR@/src/version.cpp" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/src") file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/doc/man1") file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/doc/man5") file(INSTALL "@PROJECT_BINARY_DIR@/man5/dwarfs-format.5" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/doc/man5") foreach(prog dwarfs dwarfsck dwarfsextract mkdwarfs) - file(INSTALL "@PROJECT_BINARY_DIR@/src/dwarfs/tool/${prog}_manpage.cpp" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/src/dwarfs/tool") + file(INSTALL "@PROJECT_BINARY_DIR@/tools/src/${prog}_manpage.cpp" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/tools/src") file(INSTALL "@PROJECT_BINARY_DIR@/man1/${prog}.1" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/doc/man1") endforeach() file(INSTALL "@PROJECT_BINARY_DIR@/package_version.cmake" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/cmake") diff --git a/cmake/version.cmake b/cmake/version.cmake index 1ddd5afd..5af54421 100644 --- a/cmake/version.cmake +++ b/cmake/version.cmake @@ -18,7 +18,7 @@ cmake_minimum_required(VERSION 3.28.0) -set(VERSION_SRC_FILE ${CMAKE_CURRENT_SOURCE_DIR}/src/dwarfs/version.cpp) +set(VERSION_SRC_FILE ${CMAKE_CURRENT_SOURCE_DIR}/src/version.cpp) set(VERSION_HDR_FILE ${CMAKE_CURRENT_SOURCE_DIR}/include/dwarfs/version.h) set(PKG_VERSION_FILE ${CMAKE_CURRENT_SOURCE_DIR}/cmake/package_version.cmake) @@ -67,7 +67,7 @@ else() set(DWARFS_GIT_BUILD 1) set(TMP_PKG_VERSION_FILE ${CMAKE_CURRENT_BINARY_DIR}/package_version.cmake) - set(TMP_VERSION_SRC_FILE ${CMAKE_CURRENT_BINARY_DIR}/src/dwarfs/version.cpp) + set(TMP_VERSION_SRC_FILE ${CMAKE_CURRENT_BINARY_DIR}/src/version.cpp) set(TMP_VERSION_HDR_FILE ${CMAKE_CURRENT_BINARY_DIR}/include/dwarfs/version.h) if ("${NIXPKGS_DWARFS_VERSION_OVERRIDE}" STREQUAL "") @@ -201,7 +201,7 @@ extern char const* const DWARFS_GIT_ID; endif() if(NOT "${VERSION_SRC}" STREQUAL "${VERSION_SRC_OLD}") - file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/src/dwarfs") + file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/src") file(WRITE ${TMP_VERSION_SRC_FILE} "${VERSION_SRC}") endif() diff --git a/include/dwarfs/tool/manpage.h b/include/dwarfs/tool/manpage.h index d0e74a5e..5d018dbc 100644 --- a/include/dwarfs/tool/manpage.h +++ b/include/dwarfs/tool/manpage.h @@ -43,9 +43,4 @@ struct line { using document = std::span; -document get_mkdwarfs_manpage(); -document get_dwarfs_manpage(); -document get_dwarfsck_manpage(); -document get_dwarfsextract_manpage(); - } // namespace dwarfs::tool::manpage diff --git a/src/dwarfs/block_compressor.cpp b/src/block_compressor.cpp similarity index 100% rename from src/dwarfs/block_compressor.cpp rename to src/block_compressor.cpp diff --git a/src/dwarfs/block_compressor_parser.cpp b/src/block_compressor_parser.cpp similarity index 100% rename from src/dwarfs/block_compressor_parser.cpp rename to src/block_compressor_parser.cpp diff --git a/src/dwarfs/checksum.cpp b/src/checksum.cpp similarity index 100% rename from src/dwarfs/checksum.cpp rename to src/checksum.cpp diff --git a/src/dwarfs/compression/brotli.cpp b/src/compression/brotli.cpp similarity index 100% rename from src/dwarfs/compression/brotli.cpp rename to src/compression/brotli.cpp diff --git a/src/dwarfs/compression/flac.cpp b/src/compression/flac.cpp similarity index 100% rename from src/dwarfs/compression/flac.cpp rename to src/compression/flac.cpp diff --git a/src/dwarfs/compression/lz4.cpp b/src/compression/lz4.cpp similarity index 100% rename from src/dwarfs/compression/lz4.cpp rename to src/compression/lz4.cpp diff --git a/src/dwarfs/compression/lzma.cpp b/src/compression/lzma.cpp similarity index 100% rename from src/dwarfs/compression/lzma.cpp rename to src/compression/lzma.cpp diff --git a/src/dwarfs/compression/null.cpp b/src/compression/null.cpp similarity index 100% rename from src/dwarfs/compression/null.cpp rename to src/compression/null.cpp diff --git a/src/dwarfs/compression/ricepp.cpp b/src/compression/ricepp.cpp similarity index 100% rename from src/dwarfs/compression/ricepp.cpp rename to src/compression/ricepp.cpp diff --git a/src/dwarfs/compression/zstd.cpp b/src/compression/zstd.cpp similarity index 100% rename from src/dwarfs/compression/zstd.cpp rename to src/compression/zstd.cpp diff --git a/src/dwarfs/conv.cpp b/src/conv.cpp similarity index 100% rename from src/dwarfs/conv.cpp rename to src/conv.cpp diff --git a/src/dwarfs/error.cpp b/src/error.cpp similarity index 100% rename from src/dwarfs/error.cpp rename to src/error.cpp diff --git a/src/dwarfs/file_access_generic.cpp b/src/file_access_generic.cpp similarity index 100% rename from src/dwarfs/file_access_generic.cpp rename to src/file_access_generic.cpp diff --git a/src/dwarfs/file_stat.cpp b/src/file_stat.cpp similarity index 100% rename from src/dwarfs/file_stat.cpp rename to src/file_stat.cpp diff --git a/src/dwarfs/fstypes.cpp b/src/fstypes.cpp similarity index 100% rename from src/dwarfs/fstypes.cpp rename to src/fstypes.cpp diff --git a/src/dwarfs/history.cpp b/src/history.cpp similarity index 100% rename from src/dwarfs/history.cpp rename to src/history.cpp diff --git a/src/dwarfs/internal/features.cpp b/src/internal/features.cpp similarity index 100% rename from src/dwarfs/internal/features.cpp rename to src/internal/features.cpp diff --git a/src/dwarfs/internal/file_status_conv.cpp b/src/internal/file_status_conv.cpp similarity index 100% rename from src/dwarfs/internal/file_status_conv.cpp rename to src/internal/file_status_conv.cpp diff --git a/src/dwarfs/internal/fs_section.cpp b/src/internal/fs_section.cpp similarity index 100% rename from src/dwarfs/internal/fs_section.cpp rename to src/internal/fs_section.cpp diff --git a/src/dwarfs/internal/string_table.cpp b/src/internal/string_table.cpp similarity index 100% rename from src/dwarfs/internal/string_table.cpp rename to src/internal/string_table.cpp diff --git a/src/dwarfs/internal/wcwidth.c b/src/internal/wcwidth.c similarity index 100% rename from src/dwarfs/internal/wcwidth.c rename to src/internal/wcwidth.c diff --git a/src/dwarfs/internal/worker_group.cpp b/src/internal/worker_group.cpp similarity index 100% rename from src/dwarfs/internal/worker_group.cpp rename to src/internal/worker_group.cpp diff --git a/src/dwarfs/library_dependencies.cpp b/src/library_dependencies.cpp similarity index 100% rename from src/dwarfs/library_dependencies.cpp rename to src/library_dependencies.cpp diff --git a/src/dwarfs/logger.cpp b/src/logger.cpp similarity index 100% rename from src/dwarfs/logger.cpp rename to src/logger.cpp diff --git a/src/dwarfs/mmap.cpp b/src/mmap.cpp similarity index 100% rename from src/dwarfs/mmap.cpp rename to src/mmap.cpp diff --git a/src/dwarfs/option_map.cpp b/src/option_map.cpp similarity index 100% rename from src/dwarfs/option_map.cpp rename to src/option_map.cpp diff --git a/src/dwarfs/options.cpp b/src/options.cpp similarity index 100% rename from src/dwarfs/options.cpp rename to src/options.cpp diff --git a/src/dwarfs/os_access_generic.cpp b/src/os_access_generic.cpp similarity index 100% rename from src/dwarfs/os_access_generic.cpp rename to src/os_access_generic.cpp diff --git a/src/dwarfs/pcm_sample_transformer.cpp b/src/pcm_sample_transformer.cpp similarity index 100% rename from src/dwarfs/pcm_sample_transformer.cpp rename to src/pcm_sample_transformer.cpp diff --git a/src/dwarfs/performance_monitor.cpp b/src/performance_monitor.cpp similarity index 100% rename from src/dwarfs/performance_monitor.cpp rename to src/performance_monitor.cpp diff --git a/src/dwarfs/reader/block_range.cpp b/src/reader/block_range.cpp similarity index 100% rename from src/dwarfs/reader/block_range.cpp rename to src/reader/block_range.cpp diff --git a/src/dwarfs/reader/filesystem_v2.cpp b/src/reader/filesystem_v2.cpp similarity index 100% rename from src/dwarfs/reader/filesystem_v2.cpp rename to src/reader/filesystem_v2.cpp diff --git a/src/dwarfs/reader/internal/block_cache.cpp b/src/reader/internal/block_cache.cpp similarity index 100% rename from src/dwarfs/reader/internal/block_cache.cpp rename to src/reader/internal/block_cache.cpp diff --git a/src/dwarfs/reader/internal/cached_block.cpp b/src/reader/internal/cached_block.cpp similarity index 100% rename from src/dwarfs/reader/internal/cached_block.cpp rename to src/reader/internal/cached_block.cpp diff --git a/src/dwarfs/reader/internal/filesystem_parser.cpp b/src/reader/internal/filesystem_parser.cpp similarity index 100% rename from src/dwarfs/reader/internal/filesystem_parser.cpp rename to src/reader/internal/filesystem_parser.cpp diff --git a/src/dwarfs/reader/internal/inode_reader_v2.cpp b/src/reader/internal/inode_reader_v2.cpp similarity index 100% rename from src/dwarfs/reader/internal/inode_reader_v2.cpp rename to src/reader/internal/inode_reader_v2.cpp diff --git a/src/dwarfs/reader/internal/metadata_types.cpp b/src/reader/internal/metadata_types.cpp similarity index 100% rename from src/dwarfs/reader/internal/metadata_types.cpp rename to src/reader/internal/metadata_types.cpp diff --git a/src/dwarfs/reader/internal/metadata_v2.cpp b/src/reader/internal/metadata_v2.cpp similarity index 100% rename from src/dwarfs/reader/internal/metadata_v2.cpp rename to src/reader/internal/metadata_v2.cpp diff --git a/src/dwarfs/reader/metadata_types.cpp b/src/reader/metadata_types.cpp similarity index 100% rename from src/dwarfs/reader/metadata_types.cpp rename to src/reader/metadata_types.cpp diff --git a/src/dwarfs/terminal_ansi.cpp b/src/terminal_ansi.cpp similarity index 100% rename from src/dwarfs/terminal_ansi.cpp rename to src/terminal_ansi.cpp diff --git a/src/dwarfs/thread_pool.cpp b/src/thread_pool.cpp similarity index 100% rename from src/dwarfs/thread_pool.cpp rename to src/thread_pool.cpp diff --git a/src/dwarfs/tool/iolayer.cpp b/src/tool/iolayer.cpp similarity index 100% rename from src/dwarfs/tool/iolayer.cpp rename to src/tool/iolayer.cpp diff --git a/src/dwarfs/tool/main_adapter.cpp b/src/tool/main_adapter.cpp similarity index 100% rename from src/dwarfs/tool/main_adapter.cpp rename to src/tool/main_adapter.cpp diff --git a/src/dwarfs/tool/pager.cpp b/src/tool/pager.cpp similarity index 100% rename from src/dwarfs/tool/pager.cpp rename to src/tool/pager.cpp diff --git a/src/dwarfs/tool/render_manpage.cpp b/src/tool/render_manpage.cpp similarity index 100% rename from src/dwarfs/tool/render_manpage.cpp rename to src/tool/render_manpage.cpp diff --git a/src/dwarfs/tool/safe_main.cpp b/src/tool/safe_main.cpp similarity index 100% rename from src/dwarfs/tool/safe_main.cpp rename to src/tool/safe_main.cpp diff --git a/src/dwarfs/tool/sys_char.cpp b/src/tool/sys_char.cpp similarity index 100% rename from src/dwarfs/tool/sys_char.cpp rename to src/tool/sys_char.cpp diff --git a/src/dwarfs/tool/tool.cpp b/src/tool/tool.cpp similarity index 100% rename from src/dwarfs/tool/tool.cpp rename to src/tool/tool.cpp diff --git a/src/dwarfs/util.cpp b/src/util.cpp similarity index 100% rename from src/dwarfs/util.cpp rename to src/util.cpp diff --git a/src/dwarfs/utility/filesystem_extractor.cpp b/src/utility/filesystem_extractor.cpp similarity index 100% rename from src/dwarfs/utility/filesystem_extractor.cpp rename to src/utility/filesystem_extractor.cpp diff --git a/src/dwarfs/utility/rewrite_filesystem.cpp b/src/utility/rewrite_filesystem.cpp similarity index 100% rename from src/dwarfs/utility/rewrite_filesystem.cpp rename to src/utility/rewrite_filesystem.cpp diff --git a/src/dwarfs/writer/categorizer.cpp b/src/writer/categorizer.cpp similarity index 100% rename from src/dwarfs/writer/categorizer.cpp rename to src/writer/categorizer.cpp diff --git a/src/dwarfs/writer/categorizer/binary_categorizer.cpp b/src/writer/categorizer/binary_categorizer.cpp similarity index 100% rename from src/dwarfs/writer/categorizer/binary_categorizer.cpp rename to src/writer/categorizer/binary_categorizer.cpp diff --git a/src/dwarfs/writer/categorizer/fits_categorizer.cpp b/src/writer/categorizer/fits_categorizer.cpp similarity index 100% rename from src/dwarfs/writer/categorizer/fits_categorizer.cpp rename to src/writer/categorizer/fits_categorizer.cpp diff --git a/src/dwarfs/writer/categorizer/incompressible_categorizer.cpp b/src/writer/categorizer/incompressible_categorizer.cpp similarity index 100% rename from src/dwarfs/writer/categorizer/incompressible_categorizer.cpp rename to src/writer/categorizer/incompressible_categorizer.cpp diff --git a/src/dwarfs/writer/categorizer/libmagic_categorizer.cpp b/src/writer/categorizer/libmagic_categorizer.cpp similarity index 100% rename from src/dwarfs/writer/categorizer/libmagic_categorizer.cpp rename to src/writer/categorizer/libmagic_categorizer.cpp diff --git a/src/dwarfs/writer/categorizer/pcmaudio_categorizer.cpp b/src/writer/categorizer/pcmaudio_categorizer.cpp similarity index 100% rename from src/dwarfs/writer/categorizer/pcmaudio_categorizer.cpp rename to src/writer/categorizer/pcmaudio_categorizer.cpp diff --git a/src/dwarfs/writer/category_parser.cpp b/src/writer/category_parser.cpp similarity index 100% rename from src/dwarfs/writer/category_parser.cpp rename to src/writer/category_parser.cpp diff --git a/src/dwarfs/writer/chmod_entry_transformer.cpp b/src/writer/chmod_entry_transformer.cpp similarity index 100% rename from src/dwarfs/writer/chmod_entry_transformer.cpp rename to src/writer/chmod_entry_transformer.cpp diff --git a/src/dwarfs/writer/compression_metadata_requirements.cpp b/src/writer/compression_metadata_requirements.cpp similarity index 100% rename from src/dwarfs/writer/compression_metadata_requirements.cpp rename to src/writer/compression_metadata_requirements.cpp diff --git a/src/dwarfs/writer/console_writer.cpp b/src/writer/console_writer.cpp similarity index 100% rename from src/dwarfs/writer/console_writer.cpp rename to src/writer/console_writer.cpp diff --git a/src/dwarfs/writer/entry_factory.cpp b/src/writer/entry_factory.cpp similarity index 100% rename from src/dwarfs/writer/entry_factory.cpp rename to src/writer/entry_factory.cpp diff --git a/src/dwarfs/writer/filesystem_block_category_resolver.cpp b/src/writer/filesystem_block_category_resolver.cpp similarity index 100% rename from src/dwarfs/writer/filesystem_block_category_resolver.cpp rename to src/writer/filesystem_block_category_resolver.cpp diff --git a/src/dwarfs/writer/filesystem_writer.cpp b/src/writer/filesystem_writer.cpp similarity index 100% rename from src/dwarfs/writer/filesystem_writer.cpp rename to src/writer/filesystem_writer.cpp diff --git a/src/dwarfs/writer/filter_debug.cpp b/src/writer/filter_debug.cpp similarity index 100% rename from src/dwarfs/writer/filter_debug.cpp rename to src/writer/filter_debug.cpp diff --git a/src/dwarfs/writer/fragment_category.cpp b/src/writer/fragment_category.cpp similarity index 100% rename from src/dwarfs/writer/fragment_category.cpp rename to src/writer/fragment_category.cpp diff --git a/src/dwarfs/writer/fragment_order_parser.cpp b/src/writer/fragment_order_parser.cpp similarity index 100% rename from src/dwarfs/writer/fragment_order_parser.cpp rename to src/writer/fragment_order_parser.cpp diff --git a/src/dwarfs/writer/inode_fragments.cpp b/src/writer/inode_fragments.cpp similarity index 100% rename from src/dwarfs/writer/inode_fragments.cpp rename to src/writer/inode_fragments.cpp diff --git a/src/dwarfs/writer/internal/block_manager.cpp b/src/writer/internal/block_manager.cpp similarity index 100% rename from src/dwarfs/writer/internal/block_manager.cpp rename to src/writer/internal/block_manager.cpp diff --git a/src/dwarfs/writer/internal/chmod_transformer.cpp b/src/writer/internal/chmod_transformer.cpp similarity index 100% rename from src/dwarfs/writer/internal/chmod_transformer.cpp rename to src/writer/internal/chmod_transformer.cpp diff --git a/src/dwarfs/writer/internal/entry.cpp b/src/writer/internal/entry.cpp similarity index 100% rename from src/dwarfs/writer/internal/entry.cpp rename to src/writer/internal/entry.cpp diff --git a/src/dwarfs/writer/internal/file_scanner.cpp b/src/writer/internal/file_scanner.cpp similarity index 100% rename from src/dwarfs/writer/internal/file_scanner.cpp rename to src/writer/internal/file_scanner.cpp diff --git a/src/dwarfs/writer/internal/fragment_chunkable.cpp b/src/writer/internal/fragment_chunkable.cpp similarity index 100% rename from src/dwarfs/writer/internal/fragment_chunkable.cpp rename to src/writer/internal/fragment_chunkable.cpp diff --git a/src/dwarfs/writer/internal/global_entry_data.cpp b/src/writer/internal/global_entry_data.cpp similarity index 100% rename from src/dwarfs/writer/internal/global_entry_data.cpp rename to src/writer/internal/global_entry_data.cpp diff --git a/src/dwarfs/writer/internal/inode_element_view.cpp b/src/writer/internal/inode_element_view.cpp similarity index 100% rename from src/dwarfs/writer/internal/inode_element_view.cpp rename to src/writer/internal/inode_element_view.cpp diff --git a/src/dwarfs/writer/internal/inode_manager.cpp b/src/writer/internal/inode_manager.cpp similarity index 100% rename from src/dwarfs/writer/internal/inode_manager.cpp rename to src/writer/internal/inode_manager.cpp diff --git a/src/dwarfs/writer/internal/inode_ordering.cpp b/src/writer/internal/inode_ordering.cpp similarity index 100% rename from src/dwarfs/writer/internal/inode_ordering.cpp rename to src/writer/internal/inode_ordering.cpp diff --git a/src/dwarfs/writer/internal/metadata_freezer.cpp b/src/writer/internal/metadata_freezer.cpp similarity index 100% rename from src/dwarfs/writer/internal/metadata_freezer.cpp rename to src/writer/internal/metadata_freezer.cpp diff --git a/src/dwarfs/writer/internal/nilsimsa.cpp b/src/writer/internal/nilsimsa.cpp similarity index 100% rename from src/dwarfs/writer/internal/nilsimsa.cpp rename to src/writer/internal/nilsimsa.cpp diff --git a/src/dwarfs/writer/internal/progress.cpp b/src/writer/internal/progress.cpp similarity index 100% rename from src/dwarfs/writer/internal/progress.cpp rename to src/writer/internal/progress.cpp diff --git a/src/dwarfs/writer/internal/scanner_progress.cpp b/src/writer/internal/scanner_progress.cpp similarity index 100% rename from src/dwarfs/writer/internal/scanner_progress.cpp rename to src/writer/internal/scanner_progress.cpp diff --git a/src/dwarfs/writer/internal/similarity.cpp b/src/writer/internal/similarity.cpp similarity index 100% rename from src/dwarfs/writer/internal/similarity.cpp rename to src/writer/internal/similarity.cpp diff --git a/src/dwarfs/writer/internal/similarity_ordering.cpp b/src/writer/internal/similarity_ordering.cpp similarity index 100% rename from src/dwarfs/writer/internal/similarity_ordering.cpp rename to src/writer/internal/similarity_ordering.cpp diff --git a/src/dwarfs/writer/rule_based_entry_filter.cpp b/src/writer/rule_based_entry_filter.cpp similarity index 100% rename from src/dwarfs/writer/rule_based_entry_filter.cpp rename to src/writer/rule_based_entry_filter.cpp diff --git a/src/dwarfs/writer/scanner.cpp b/src/writer/scanner.cpp similarity index 100% rename from src/dwarfs/writer/scanner.cpp rename to src/writer/scanner.cpp diff --git a/src/dwarfs/writer/segmenter.cpp b/src/writer/segmenter.cpp similarity index 100% rename from src/dwarfs/writer/segmenter.cpp rename to src/writer/segmenter.cpp diff --git a/src/dwarfs/writer/segmenter_factory.cpp b/src/writer/segmenter_factory.cpp similarity index 100% rename from src/dwarfs/writer/segmenter_factory.cpp rename to src/writer/segmenter_factory.cpp diff --git a/src/dwarfs/writer/writer_progress.cpp b/src/writer/writer_progress.cpp similarity index 100% rename from src/dwarfs/writer/writer_progress.cpp rename to src/writer/writer_progress.cpp diff --git a/src/dwarfs/xattr.cpp b/src/xattr.cpp similarity index 100% rename from src/dwarfs/xattr.cpp rename to src/xattr.cpp diff --git a/src/dwarfs/xattr_posix.cpp b/src/xattr_posix.cpp similarity index 100% rename from src/dwarfs/xattr_posix.cpp rename to src/xattr_posix.cpp diff --git a/src/dwarfs/xattr_win.cpp b/src/xattr_win.cpp similarity index 100% rename from src/dwarfs/xattr_win.cpp rename to src/xattr_win.cpp diff --git a/test/manpage_test.cpp b/test/manpage_test.cpp index 7822bfdf..61d25868 100644 --- a/test/manpage_test.cpp +++ b/test/manpage_test.cpp @@ -27,6 +27,7 @@ #include #include +#include #include "test_helpers.h" diff --git a/include/dwarfs_tool_main.h b/tools/include/dwarfs_tool_main.h similarity index 100% rename from include/dwarfs_tool_main.h rename to tools/include/dwarfs_tool_main.h diff --git a/tools/include/dwarfs_tool_manpage.h b/tools/include/dwarfs_tool_manpage.h new file mode 100644 index 00000000..d2f55023 --- /dev/null +++ b/tools/include/dwarfs_tool_manpage.h @@ -0,0 +1,33 @@ +/* vim:set ts=2 sw=2 sts=2 et: */ +/** + * \author Marcus Holland-Moritz (github@mhxnet.de) + * \copyright Copyright (c) Marcus Holland-Moritz + * + * This file is part of dwarfs. + * + * dwarfs is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * dwarfs is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with dwarfs. If not, see . + */ + +#pragma once + +#include + +namespace dwarfs::tool::manpage { + +document get_mkdwarfs_manpage(); +document get_dwarfs_manpage(); +document get_dwarfsck_manpage(); +document get_dwarfsextract_manpage(); + +} // namespace dwarfs::tool::manpage diff --git a/src/dwarfs.cpp b/tools/src/dwarfs.cpp similarity index 100% rename from src/dwarfs.cpp rename to tools/src/dwarfs.cpp diff --git a/src/dwarfs_main.cpp b/tools/src/dwarfs_main.cpp similarity index 99% rename from src/dwarfs_main.cpp rename to tools/src/dwarfs_main.cpp index dbf42d5d..7ce1f9db 100644 --- a/src/dwarfs_main.cpp +++ b/tools/src/dwarfs_main.cpp @@ -106,6 +106,7 @@ #include #include #include +#include namespace { diff --git a/src/dwarfsck.cpp b/tools/src/dwarfsck.cpp similarity index 100% rename from src/dwarfsck.cpp rename to tools/src/dwarfsck.cpp diff --git a/src/dwarfsck_main.cpp b/tools/src/dwarfsck_main.cpp similarity index 99% rename from src/dwarfsck_main.cpp rename to tools/src/dwarfsck_main.cpp index 6f3a8231..ac811427 100644 --- a/src/dwarfsck_main.cpp +++ b/tools/src/dwarfsck_main.cpp @@ -51,6 +51,7 @@ #include #include #include +#include namespace dwarfs::tool { diff --git a/src/dwarfsextract.cpp b/tools/src/dwarfsextract.cpp similarity index 100% rename from src/dwarfsextract.cpp rename to tools/src/dwarfsextract.cpp diff --git a/src/dwarfsextract_main.cpp b/tools/src/dwarfsextract_main.cpp similarity index 99% rename from src/dwarfsextract_main.cpp rename to tools/src/dwarfsextract_main.cpp index a7c64774..e6a093db 100644 --- a/src/dwarfsextract_main.cpp +++ b/tools/src/dwarfsextract_main.cpp @@ -41,6 +41,7 @@ #include #include #include +#include namespace po = boost::program_options; diff --git a/src/mkdwarfs.cpp b/tools/src/mkdwarfs.cpp similarity index 100% rename from src/mkdwarfs.cpp rename to tools/src/mkdwarfs.cpp diff --git a/src/mkdwarfs_main.cpp b/tools/src/mkdwarfs_main.cpp similarity index 99% rename from src/mkdwarfs_main.cpp rename to tools/src/mkdwarfs_main.cpp index 353abef9..5f22b3de 100644 --- a/src/mkdwarfs_main.cpp +++ b/tools/src/mkdwarfs_main.cpp @@ -90,6 +90,7 @@ #include #include #include +#include namespace po = boost::program_options; diff --git a/src/pxattr.cpp b/tools/src/pxattr.cpp similarity index 100% rename from src/pxattr.cpp rename to tools/src/pxattr.cpp diff --git a/src/universal.cpp b/tools/src/universal.cpp similarity index 100% rename from src/universal.cpp rename to tools/src/universal.cpp