chore: [control] change package name prefix

Adapt to qt6, modify the deb package name prefix
to dfm6.

Log: Modify the deb package name prefix to dfm6.

CMakeLists.txt

@@ -16,9 +16,11 @@ include(GNUInstallDirs)
 
 if(OPT_ENABLE_QT6)
     find_package(QT NAMES Qt6 CONFIG REQUIRED Core)
+    set(DFM_VERSION_MAJOR 6)
 else()
     set(QT_MINIMUM_VERSION "5.6.3")
     find_package(QT NAMES Qt5 ${QT_MINIMUM_VERSION} CONFIG REQUIRED Core)
+    set(DFM_VERSION_MAJOR "")
 endif()
 
 find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core)

src/dfm-burn/dfm-burn-client/CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.1.0)
 
-project(dfm-burn-client)
+project(dfm${DFM_VERSION_MAJOR}-burn-client)
 
 set(SRCS
     main.cpp
@@ -17,5 +17,5 @@ include_directories(
 target_link_libraries(
     ${PROJECT_NAME}
     Qt${QT_VERSION_MAJOR}::Core
-    dfm-burn
+    dfm${DFM_VERSION_MAJOR}-burn
 )

src/dfm-burn/dfm-burn-lib/CMakeLists.txt

@@ -1,6 +1,7 @@
 cmake_minimum_required(VERSION 3.1.0)
 
-set(BIN_NAME dfm-burn)
+set(BIN_NAME dfm${DFM_VERSION_MAJOR}-burn)
+set(BASE_NAME dfm-burn)
 
 # Version
 if (NOT PROJECT_VERSION)
@@ -18,7 +19,7 @@ pkg_check_modules(isoburn REQUIRED libisoburn-1 IMPORTED_TARGET)
 
 # public include
 file(GLOB_RECURSE PUBLIC_INCLUDES  CONFIGURE_DEPENDS
-    "${PROJECT_SOURCE_DIR}/include/${BIN_NAME}/*")
+    "${PROJECT_SOURCE_DIR}/include/${BASE_NAME}/*")
 
 # udfclient
 FILE (GLOB_RECURSE UDFCLIENT_SRCS CONFIGURE_DEPENDS
@@ -48,7 +49,7 @@ target_link_libraries(${BIN_NAME}
 target_include_directories(
     ${BIN_NAME}
 PUBLIC
-    ${PROJECT_SOURCE_DIR}/include/${BIN_NAME}
+    ${PROJECT_SOURCE_DIR}/include/${BASE_NAME}
     ${CMAKE_CURRENT_SOURCE_DIR}/..
 )
 
@@ -72,15 +73,15 @@ target_compile_definitions(${BIN_NAME} PRIVATE
 )
 
 set_target_properties(
-    dfm-burn PROPERTIES
+    ${BIN_NAME} PROPERTIES
     VERSION ${PROJECT_VERSION}
     SOVERSION ${PROJECT_VERSION_MAJOR}
 )
 
 # Install
 install(DIRECTORY
-    ${PROJECT_SOURCE_DIR}/include/${BIN_NAME}
-    DESTINATION include
+    ${PROJECT_SOURCE_DIR}/include/${BASE_NAME}/${BASE_NAME}
+    DESTINATION include/${BIN_NAME}
     FILES_MATCHING PATTERN "*.h"
 )
 install(TARGETS ${BIN_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
@@ -91,11 +92,11 @@ set(PC_REQ_PRIVATE)
 set(PC_REQ_PUBLIC)
 
 # config pkgconfig file
-configure_file(${PROJECT_SOURCE_DIR}/misc/${BIN_NAME}/${BIN_NAME}.pc.in ${BIN_NAME}.pc @ONLY)
+configure_file(${PROJECT_SOURCE_DIR}/misc/${BASE_NAME}/${BASE_NAME}.pc.in ${BIN_NAME}.pc @ONLY)
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${BIN_NAME}.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
 
 # config cmake file
-configure_file(${PROJECT_SOURCE_DIR}/misc/${BIN_NAME}/${BIN_NAME}Config.cmake.in ${BIN_NAME}Config.cmake @ONLY)
+configure_file(${PROJECT_SOURCE_DIR}/misc/${BASE_NAME}/${BASE_NAME}Config.cmake.in ${BIN_NAME}Config.cmake @ONLY)
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${BIN_NAME}Config.cmake DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${BIN_NAME})
 
 

src/dfm-io/dfm-io/CMakeLists.txt

@@ -1,6 +1,7 @@
 cmake_minimum_required(VERSION 3.1.0)
 
-set(BIN_NAME dfm-io)
+set(BIN_NAME dfm${DFM_VERSION_MAJOR}-io)
+set(BASE_NAME dfm-io)
 
 # Version
 if (NOT PROJECT_VERSION)
@@ -25,7 +26,7 @@ add_definitions(-DQT_NO_KEYWORDS)
 
 # public include
 file(GLOB_RECURSE IO_PUBLIC_INCLUDES  CONFIGURE_DEPENDS
-    "${PROJECT_SOURCE_DIR}/include/${BIN_NAME}/*")
+    "${PROJECT_SOURCE_DIR}/include/${BASE_NAME}/*")
 # src
 FILE (GLOB_RECURSE IO_SRCS CONFIGURE_DEPENDS
     "./*.c"
@@ -40,7 +41,7 @@ add_library(${BIN_NAME} SHARED
 )
 
 set_target_properties(
-    dfm-io PROPERTIES
+    ${BIN_NAME} PROPERTIES
     VERSION ${PROJECT_VERSION}
     SOVERSION ${PROJECT_VERSION_MAJOR}
 )
@@ -56,13 +57,13 @@ target_link_libraries(${BIN_NAME}
 target_include_directories(${BIN_NAME}
 PUBLIC
     ${GLIB_INCLUDE_DIRS}
-    ${PROJECT_SOURCE_DIR}/include/${BIN_NAME}
+    ${PROJECT_SOURCE_DIR}/include/${BASE_NAME}
 )
 
 include(GNUInstallDirs)
 install(DIRECTORY
-    ${PROJECT_SOURCE_DIR}/include/${BIN_NAME}
-    DESTINATION include
+    ${PROJECT_SOURCE_DIR}/include/${BASE_NAME}/${BASE_NAME}
+    DESTINATION include/${BIN_NAME}
     FILES_MATCHING PATTERN "*.h"
 )
 install(TARGETS ${BIN_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
@@ -73,10 +74,10 @@ set(PC_REQ_PRIVATE)
 set(PC_REQ_PUBLIC)
 
 # config pkgconfig file
-configure_file(${PROJECT_SOURCE_DIR}/misc/${BIN_NAME}/${BIN_NAME}.pc.in ${BIN_NAME}.pc @ONLY)
+configure_file(${PROJECT_SOURCE_DIR}/misc/${BASE_NAME}/${BASE_NAME}.pc.in ${BIN_NAME}.pc @ONLY)
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${BIN_NAME}.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
 
 # config cmake file
-configure_file(${PROJECT_SOURCE_DIR}/misc/${BIN_NAME}/${BIN_NAME}Config.cmake.in ${BIN_NAME}Config.cmake @ONLY)
+configure_file(${PROJECT_SOURCE_DIR}/misc/${BASE_NAME}/${BASE_NAME}Config.cmake.in ${BIN_NAME}Config.cmake @ONLY)
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${BIN_NAME}Config.cmake DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${BIN_NAME})
 

src/dfm-io/tools/CMakeLists.txt

@@ -23,56 +23,56 @@ include_directories(
 )
 
 add_executable(dfm-list dfm-list.cpp)
-target_link_libraries(dfm-list dfm-io)
+target_link_libraries(dfm-list dfm${DFM_VERSION_MAJOR}-io)
 
 add_executable(dfm-sort-list dfm-sort-list.cpp)
-target_link_libraries(dfm-sort-list dfm-io)
+target_link_libraries(dfm-sort-list dfm${DFM_VERSION_MAJOR}-io)
 
 add_executable(dfm-info dfm-info.cpp)
-target_link_libraries(dfm-info dfm-io)
+target_link_libraries(dfm-info dfm${DFM_VERSION_MAJOR}-io)
 
 add_executable(dfm-copy dfm-copy.cpp)
-target_link_libraries(dfm-copy dfm-io)
+target_link_libraries(dfm-copy dfm${DFM_VERSION_MAJOR}-io)
 
 add_executable(dfm-copy-gio dfm-copy-gio.cpp)
-target_link_libraries(dfm-copy-gio dfm-io)
+target_link_libraries(dfm-copy-gio dfm${DFM_VERSION_MAJOR}-io)
 
 add_executable(dfm-copy3 dfm-copy3.cpp)
-target_link_libraries(dfm-copy3 dfm-io)
+target_link_libraries(dfm-copy3 dfm${DFM_VERSION_MAJOR}-io)
 
 add_executable(dfm-copy-system dfm-copy-system.cpp)
-target_link_libraries(dfm-copy-system dfm-io)
+target_link_libraries(dfm-copy-system dfm${DFM_VERSION_MAJOR}-io)
 
 add_executable(dfm-cat dfm-cat.cpp)
-target_link_libraries(dfm-cat dfm-io)
+target_link_libraries(dfm-cat dfm${DFM_VERSION_MAJOR}-io)
 
 add_executable(dfm-save dfm-save.cpp)
-target_link_libraries(dfm-save dfm-io)
+target_link_libraries(dfm-save dfm${DFM_VERSION_MAJOR}-io)
 
 add_executable(dfm-rename dfm-rename.cpp)
-target_link_libraries(dfm-rename dfm-io)
+target_link_libraries(dfm-rename dfm${DFM_VERSION_MAJOR}-io)
 
 add_executable(dfm-move dfm-move.cpp)
-target_link_libraries(dfm-move dfm-io)
+target_link_libraries(dfm-move dfm${DFM_VERSION_MAJOR}-io)
 
 add_executable(dfm-trash dfm-trash.cpp)
-target_link_libraries(dfm-trash dfm-io)
+target_link_libraries(dfm-trash dfm${DFM_VERSION_MAJOR}-io)
 
 add_executable(dfm-delete dfm-delete.cpp)
-target_link_libraries(dfm-delete dfm-io)
+target_link_libraries(dfm-delete dfm${DFM_VERSION_MAJOR}-io)
 
 add_executable(dfm-restore dfm-restore.cpp)
-target_link_libraries(dfm-restore dfm-io)
+target_link_libraries(dfm-restore dfm${DFM_VERSION_MAJOR}-io)
 
 add_executable(dfm-touch dfm-touch.cpp)
-target_link_libraries(dfm-touch dfm-io)
+target_link_libraries(dfm-touch dfm${DFM_VERSION_MAJOR}-io)
 
 add_executable(dfm-mkdir dfm-mkdir.cpp)
-target_link_libraries(dfm-mkdir dfm-io)
+target_link_libraries(dfm-mkdir dfm${DFM_VERSION_MAJOR}-io)
 
 add_executable(dfm-link dfm-link.cpp)
-target_link_libraries(dfm-link dfm-io)
+target_link_libraries(dfm-link dfm${DFM_VERSION_MAJOR}-io)
 
 add_executable(dfm-watcher dfm-watcher.cpp)
-target_link_libraries(dfm-watcher dfm-io)
+target_link_libraries(dfm-watcher dfm${DFM_VERSION_MAJOR}-io)
 

src/dfm-mount/CMakeLists.txt

@@ -1,6 +1,7 @@
 cmake_minimum_required(VERSION 3.0)
 
-set(BIN_NAME dfm-mount)
+set(BIN_NAME dfm${DFM_VERSION_MAJOR}-mount)
+set(BASE_NAME dfm-mount)
 
 # Version
 if (NOT PROJECT_VERSION)
@@ -31,7 +32,7 @@ pkg_check_modules(mount REQUIRED mount IMPORTED_TARGET)
 
 # public include
 file(GLOB_RECURSE PUBLIC_INCLUDES  CONFIGURE_DEPENDS
-    "${PROJECT_SOURCE_DIR}/include/${BIN_NAME}/*")
+    "${PROJECT_SOURCE_DIR}/include/${BASE_NAME}/*")
 # src
 FILE (GLOB_RECURSE SRCS CONFIGURE_DEPENDS
     "./*.cpp"
@@ -45,7 +46,7 @@ add_library(${BIN_NAME} SHARED
 )
 
 set_target_properties(
-    dfm-mount PROPERTIES
+    ${BIN_NAME} PROPERTIES
     VERSION ${PROJECT_VERSION}
     SOVERSION ${PROJECT_VERSION_MAJOR}
 )
@@ -65,15 +66,15 @@ target_link_libraries(${BIN_NAME}
 target_include_directories(
     ${BIN_NAME}
 PUBLIC
-    ${PROJECT_SOURCE_DIR}/include/${BIN_NAME}
+    ${PROJECT_SOURCE_DIR}/include/${BASE_NAME}
 )
 
 include(GNUInstallDirs)
 
 # Install lib
 install(DIRECTORY
-    ${PROJECT_SOURCE_DIR}/include/${BIN_NAME}
-    DESTINATION include
+    ${PROJECT_SOURCE_DIR}/include/${BASE_NAME}/${BASE_NAME}
+    DESTINATION include/${BIN_NAME}
     FILES_MATCHING PATTERN "*.h"
 )
 install(TARGETS ${BIN_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
@@ -84,11 +85,11 @@ set(PC_REQ_PRIVATE)
 set(PC_REQ_PUBLIC)
 
 # config pkgconfig file
-configure_file(${PROJECT_SOURCE_DIR}/misc/${BIN_NAME}/${BIN_NAME}.pc.in ${BIN_NAME}.pc @ONLY)
+configure_file(${PROJECT_SOURCE_DIR}/misc/${BASE_NAME}/${BASE_NAME}.pc.in ${BIN_NAME}.pc @ONLY)
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${BIN_NAME}.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
 
 # config cmake file
-configure_file(${PROJECT_SOURCE_DIR}/misc/${BIN_NAME}/${BIN_NAME}Config.cmake.in ${BIN_NAME}Config.cmake @ONLY)
+configure_file(${PROJECT_SOURCE_DIR}/misc/${BASE_NAME}/${BASE_NAME}Config.cmake.in ${BIN_NAME}Config.cmake @ONLY)
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${BIN_NAME}Config.cmake DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${BIN_NAME})
 
 # Build example