From 103509bf6f0c9483c3e3b4643ad67a46a7691cb4 Mon Sep 17 00:00:00 2001 From: dengzhongyuan Date: Tue, 20 Jan 2026 14:00:01 +0800 Subject: [PATCH] refactor: Remove pzip plugin and update CMake configuration - Deleted the pzip plugin directory and its associated files, including CMakeLists.txt, source, and header files. - Updated CMakeLists.txt to reflect the removal of the pzip plugin, ensuring proper build configuration without it. - Adjusted the add_subdirectory command for pzip to use the correct source and binary directories. Log: Clean up project structure by removing the pzip plugin and updating build configurations accordingly. --- 3rdparty/CMakeLists.txt | 3 +-- 3rdparty/clipzipplugin/clipzipplugin.cpp | 4 ++-- src/CMakeLists.txt | 5 +++++ {3rdparty => src}/pzip/CMakeLists.txt | 0 {3rdparty => src}/pzip/cmd/punzip_main.cpp | 0 {3rdparty => src}/pzip/cmd/pzip_main.cpp | 0 {3rdparty => src}/pzip/include/pzip/archiver.h | 0 {3rdparty => src}/pzip/include/pzip/common.h | 0 {3rdparty => src}/pzip/include/pzip/extractor.h | 0 {3rdparty => src}/pzip/include/pzip/fast_deflate.h | 0 {3rdparty => src}/pzip/include/pzip/file_task.h | 0 {3rdparty => src}/pzip/include/pzip/pzip.h | 0 {3rdparty => src}/pzip/include/pzip/utils.h | 0 {3rdparty => src}/pzip/include/pzip/worker_pool.h | 0 {3rdparty => src}/pzip/include/pzip/zip_reader.h | 0 {3rdparty => src}/pzip/include/pzip/zip_writer.h | 0 {3rdparty => src}/pzip/src/archiver.cpp | 0 {3rdparty => src}/pzip/src/extractor.cpp | 0 {3rdparty => src}/pzip/src/fast_deflate.cpp | 0 {3rdparty => src}/pzip/src/file_task.cpp | 0 {3rdparty => src}/pzip/src/utils.cpp | 0 {3rdparty => src}/pzip/src/worker_pool.cpp | 0 {3rdparty => src}/pzip/src/zip_reader.cpp | 0 {3rdparty => src}/pzip/src/zip_writer.cpp | 0 24 files changed, 8 insertions(+), 4 deletions(-) rename {3rdparty => src}/pzip/CMakeLists.txt (100%) rename {3rdparty => src}/pzip/cmd/punzip_main.cpp (100%) rename {3rdparty => src}/pzip/cmd/pzip_main.cpp (100%) rename {3rdparty => src}/pzip/include/pzip/archiver.h (100%) rename {3rdparty => src}/pzip/include/pzip/common.h (100%) rename {3rdparty => src}/pzip/include/pzip/extractor.h (100%) rename {3rdparty => src}/pzip/include/pzip/fast_deflate.h (100%) rename {3rdparty => src}/pzip/include/pzip/file_task.h (100%) rename {3rdparty => src}/pzip/include/pzip/pzip.h (100%) rename {3rdparty => src}/pzip/include/pzip/utils.h (100%) rename {3rdparty => src}/pzip/include/pzip/worker_pool.h (100%) rename {3rdparty => src}/pzip/include/pzip/zip_reader.h (100%) rename {3rdparty => src}/pzip/include/pzip/zip_writer.h (100%) rename {3rdparty => src}/pzip/src/archiver.cpp (100%) rename {3rdparty => src}/pzip/src/extractor.cpp (100%) rename {3rdparty => src}/pzip/src/fast_deflate.cpp (100%) rename {3rdparty => src}/pzip/src/file_task.cpp (100%) rename {3rdparty => src}/pzip/src/utils.cpp (100%) rename {3rdparty => src}/pzip/src/worker_pool.cpp (100%) rename {3rdparty => src}/pzip/src/zip_reader.cpp (100%) rename {3rdparty => src}/pzip/src/zip_writer.cpp (100%) diff --git a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt index 478b0b47..950b0fca 100644 --- a/3rdparty/CMakeLists.txt +++ b/3rdparty/CMakeLists.txt @@ -16,10 +16,9 @@ add_subdirectory(libzipplugin) add_subdirectory(libminizipplugin) -# pzip 高性能并行压缩工具（仅 x86/ARM + Qt6 环境启用） +# clipzipplugin（仅 x86/ARM + Qt6 环境启用，依赖 src/pzip） if((CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|arm|x86_64|amd64") AND (QT_VERSION_MAJOR EQUAL 6)) message(STATUS "x86/ARM + Qt6 环境，启用 pzip 高性能压缩插件") - add_subdirectory(pzip) add_subdirectory(clipzipplugin) else() message(STATUS "非 x86/ARM + Qt6 环境，使用默认 libzip 插件") diff --git a/3rdparty/clipzipplugin/clipzipplugin.cpp b/3rdparty/clipzipplugin/clipzipplugin.cpp index fce25140..985b5b21 100644 --- a/3rdparty/clipzipplugin/clipzipplugin.cpp +++ b/3rdparty/clipzipplugin/clipzipplugin.cpp @@ -67,7 +67,7 @@ QString CliPzipPlugin::getPzipPath() const // 开发环境：尝试从应用程序目录查找 QString appDir = QCoreApplication::applicationDirPath(); - QString devPath = appDir + "/../3rdparty/pzip/pzip"; + QString devPath = appDir + "/../src/pzip/pzip"; if (QFileInfo::exists(devPath)) { return devPath; } @@ -91,7 +91,7 @@ QString CliPzipPlugin::getPunzipPath() const // 开发环境：尝试从应用程序目录查找 QString appDir = QCoreApplication::applicationDirPath(); - QString devPath = appDir + "/../3rdparty/pzip/punzip"; + QString devPath = appDir + "/../src/pzip/punzip"; if (QFileInfo::exists(devPath)) { return devPath; } diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index b8cb15a7..1f07fc2f 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -143,3 +143,8 @@ install(FILES ${CMAKE_CURRENT_LIST_DIR}/com.deepin.Compressor.service # Install DBus interface XML file install(FILES ${CMAKE_CURRENT_LIST_DIR}/com.deepin.Compressor.xml DESTINATION ${CMAKE_INSTALL_DATADIR}/dbus-1/interfaces/) + +# pzip 高性能并行压缩工具（仅 x86/ARM + Qt6 环境启用） +if((CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|arm|x86_64|amd64") AND (QT_VERSION_MAJOR EQUAL 6)) + add_subdirectory(pzip) +endif() diff --git a/3rdparty/pzip/CMakeLists.txt b/src/pzip/CMakeLists.txt similarity index 100% rename from 3rdparty/pzip/CMakeLists.txt rename to src/pzip/CMakeLists.txt diff --git a/3rdparty/pzip/cmd/punzip_main.cpp b/src/pzip/cmd/punzip_main.cpp similarity index 100% rename from 3rdparty/pzip/cmd/punzip_main.cpp rename to src/pzip/cmd/punzip_main.cpp diff --git a/3rdparty/pzip/cmd/pzip_main.cpp b/src/pzip/cmd/pzip_main.cpp similarity index 100% rename from 3rdparty/pzip/cmd/pzip_main.cpp rename to src/pzip/cmd/pzip_main.cpp diff --git a/3rdparty/pzip/include/pzip/archiver.h b/src/pzip/include/pzip/archiver.h similarity index 100% rename from 3rdparty/pzip/include/pzip/archiver.h rename to src/pzip/include/pzip/archiver.h diff --git a/3rdparty/pzip/include/pzip/common.h b/src/pzip/include/pzip/common.h similarity index 100% rename from 3rdparty/pzip/include/pzip/common.h rename to src/pzip/include/pzip/common.h diff --git a/3rdparty/pzip/include/pzip/extractor.h b/src/pzip/include/pzip/extractor.h similarity index 100% rename from 3rdparty/pzip/include/pzip/extractor.h rename to src/pzip/include/pzip/extractor.h diff --git a/3rdparty/pzip/include/pzip/fast_deflate.h b/src/pzip/include/pzip/fast_deflate.h similarity index 100% rename from 3rdparty/pzip/include/pzip/fast_deflate.h rename to src/pzip/include/pzip/fast_deflate.h diff --git a/3rdparty/pzip/include/pzip/file_task.h b/src/pzip/include/pzip/file_task.h similarity index 100% rename from 3rdparty/pzip/include/pzip/file_task.h rename to src/pzip/include/pzip/file_task.h diff --git a/3rdparty/pzip/include/pzip/pzip.h b/src/pzip/include/pzip/pzip.h similarity index 100% rename from 3rdparty/pzip/include/pzip/pzip.h rename to src/pzip/include/pzip/pzip.h diff --git a/3rdparty/pzip/include/pzip/utils.h b/src/pzip/include/pzip/utils.h similarity index 100% rename from 3rdparty/pzip/include/pzip/utils.h rename to src/pzip/include/pzip/utils.h diff --git a/3rdparty/pzip/include/pzip/worker_pool.h b/src/pzip/include/pzip/worker_pool.h similarity index 100% rename from 3rdparty/pzip/include/pzip/worker_pool.h rename to src/pzip/include/pzip/worker_pool.h diff --git a/3rdparty/pzip/include/pzip/zip_reader.h b/src/pzip/include/pzip/zip_reader.h similarity index 100% rename from 3rdparty/pzip/include/pzip/zip_reader.h rename to src/pzip/include/pzip/zip_reader.h diff --git a/3rdparty/pzip/include/pzip/zip_writer.h b/src/pzip/include/pzip/zip_writer.h similarity index 100% rename from 3rdparty/pzip/include/pzip/zip_writer.h rename to src/pzip/include/pzip/zip_writer.h diff --git a/3rdparty/pzip/src/archiver.cpp b/src/pzip/src/archiver.cpp similarity index 100% rename from 3rdparty/pzip/src/archiver.cpp rename to src/pzip/src/archiver.cpp diff --git a/3rdparty/pzip/src/extractor.cpp b/src/pzip/src/extractor.cpp similarity index 100% rename from 3rdparty/pzip/src/extractor.cpp rename to src/pzip/src/extractor.cpp diff --git a/3rdparty/pzip/src/fast_deflate.cpp b/src/pzip/src/fast_deflate.cpp similarity index 100% rename from 3rdparty/pzip/src/fast_deflate.cpp rename to src/pzip/src/fast_deflate.cpp diff --git a/3rdparty/pzip/src/file_task.cpp b/src/pzip/src/file_task.cpp similarity index 100% rename from 3rdparty/pzip/src/file_task.cpp rename to src/pzip/src/file_task.cpp diff --git a/3rdparty/pzip/src/utils.cpp b/src/pzip/src/utils.cpp similarity index 100% rename from 3rdparty/pzip/src/utils.cpp rename to src/pzip/src/utils.cpp diff --git a/3rdparty/pzip/src/worker_pool.cpp b/src/pzip/src/worker_pool.cpp similarity index 100% rename from 3rdparty/pzip/src/worker_pool.cpp rename to src/pzip/src/worker_pool.cpp diff --git a/3rdparty/pzip/src/zip_reader.cpp b/src/pzip/src/zip_reader.cpp similarity index 100% rename from 3rdparty/pzip/src/zip_reader.cpp rename to src/pzip/src/zip_reader.cpp diff --git a/3rdparty/pzip/src/zip_writer.cpp b/src/pzip/src/zip_writer.cpp similarity index 100% rename from 3rdparty/pzip/src/zip_writer.cpp rename to src/pzip/src/zip_writer.cpp