Fix portable packaging

Author: synacker

CMakeLists.txt

@@ -11,9 +11,7 @@ endif()
 
 project(daggy_dev)
 
-option(CONAN_BUILD "build with conan" ON)
-add_definitions(-DCONAN_BUILD)
-option(PACKAGE_DEPS "include daggy deps into package" ON)
+set(PORTABLE_BUILD ON)
 
 include(CTest)
 add_subdirectory(src)

conanfile.py

@@ -63,10 +63,9 @@ def config_options(self):
         if self.settings.os == "Windows":
             del self.options.fPIC
 
-        self.options["qt"].shared = True
-        
-        if self.settings.os == "Windows":
-            self.options["libssh2"].shared = True
+        self.options["qt"].shared = self.options.shared
+        self.options["libssh2"].shared = self.options.shared
+        self.options["yaml-cpp"].shared = self.options.shared
 
     def build_requirements(self):
         self.tool_requires("cmake/3.30.1")
@@ -109,10 +108,11 @@ def generate(self):
         tc.cache_variables["YAML_SUPPORT"] = True
         tc.cache_variables["CONSOLE"] = True
         tc.cache_variables["PCAPNG_SUPPORT"] = False
-        tc.cache_variables["PACKAGE_DEPS"] = True
+        tc.cache_variables["PORTABLE_BUILD"] = True
         tc.cache_variables["BUILD_TESTING"] = True
         tc.cache_variables["CONAN_BUILD"] = True
         tc.cache_variables["VERSION"] = GitVersion().version
+        tc.cache_variables["VERSION_EXTENDED"] = GitVersion().extended
 
         if self.options.shared:
             tc.cache_variables["CMAKE_C_VISIBILITY_PRESET"] = "hidden"

git_version.py

@@ -58,16 +58,23 @@ def branch(self):
         stream = os.popen("git branch --show-current")
         return stream.read().strip()
 
+    @property
+    def short(self):
+        stream = os.popen("git rev-parse --short=6 HEAD")
+        return stream.read().strip()
+    
     @property
     def full(self):
-        return f"{self.version}-{self.branch}"
+        return f"{self.version}-{self.short}"
+
 
     @property
-    def standard(self):
-        standard = f"{self.version}-{self.branch}"
-        if self.branch == self.default_branch or re.match("release/.*", self.branch):
-            standard = f"{self.version}"
-        return standard
+    def extended(self):
+        if self.build == 0:
+            extended = f"{self.version}"
+        else:
+            extended = f"{self.version}-{self.short}"
+        return extended
 
     @property
     def commit(self):
@@ -82,7 +89,7 @@ def __str__(self):
         Full: {self.full}
         Branch: {self.branch}
         Build: {self.build}
-        Standard: {self.standard}
+        Extended: {self.extended}
         Commit: {self.commit}
         """
 

src/CMakeLists.txt

@@ -18,10 +18,23 @@ include_directories(${CMAKE_BINARY_EXPORTS_DIR})
 set(PROJECT_VENDOR synacker)
 set(PROJECT_COPYRIGTH "Copyright \\251 2025 Mikhail Milovidov. Some Rights Reserved")
 
+option(PORTABLE_BUILD "portable install packages" OFF)
+option(APPONLY_BUILD "build only application with static deps linkage" OFF)
+option(CONAN_BUILD "build with conan specific changes" OFF)
+
 option(SSH2_SUPPORT "ssh2 data provider support" ON)
 option(YAML_SUPPORT "yaml data sources support" ON)
 option(CONSOLE "daggy console application" ON)
-option(BUILD_SHARED_LIBS ON)
+
+if (APPONLY_BUILD)
+    set(BUILD_SHARED_LIBS OFF)
+    set(CONSOLE ON)
+endif()
+
+if (PORTABLE_BUILD)
+    set(CONAN_BUILD ON)
+    set(BUILD_SHARED_LIBS ON)
+endif()
 
 if(SSH2_SUPPORT)
     add_definitions(-DSSH2_SUPPORT)
@@ -31,14 +44,9 @@ if(YAML_SUPPORT)
     add_definitions(-DYAML_SUPPORT)
 endif()
 
-if(CONAN_BUILD)
-    add_definitions(-DCONAN_BUILD)
-endif()
-
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 
 include(compiler)
-
 include(CTest)
 
 add_subdirectory(DaggyCore)

src/DaggyCore/CMakeLists.txt

@@ -3,7 +3,6 @@ set(TARGET DaggyCore)
 find_package(Qt6 COMPONENTS Core Network REQUIRED)
 add_library(${TARGET})
 include(rpath_lib)
-
 set_target_properties(${TARGET} PROPERTIES AUTOMOC ON)
 
 target_sources(${TARGET}

src/cmake/pack.cmake

@@ -60,9 +60,8 @@ set(CPACK_IFW_PACKAGE_STYLE_SHEET ${CMAKE_CURRENT_LIST_DIR}/installer.qss)
 set(CPACK_IFW_PACKAGE_TITLE_COLOR "#007A5C")
 set(CPACK_IFW_PACKAGE_NAME ${CPACK_PACKAGE_NAME})
 
-if(PACKAGE_DEPS)
-    include(package_deps)
-endif()
+
+include(package_deps)
 
 IF(${CPACK_SYSTEM_NAME} MATCHES Windows)
     IF(CMAKE_CL_64)

src/cmake/package_deps.cmake

@@ -1,4 +1,4 @@
-if (PACKAGE_DEPS)
+if (PORTABLE_BUILD AND CONAN_BUILD)
     install(TARGETS ${TARGET}
             RUNTIME_DEPENDENCY_SET ${TARGET}_deps
     )
@@ -13,5 +13,6 @@ if (PACKAGE_DEPS)
                 [=[.*system32\/.*\.dll]=]
                 [=[^\/(lib|usr\/lib|usr\/local\/lib\/lib64)]=]
             DIRECTORIES ${CONAN_RUNTIME_LIB_DIRS} ${CONAN_LIB_DIRS}
+            DESTINATION ${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}
     )
 endif()

src/cmake/rpath_bin.cmake

@@ -1,7 +1,7 @@
-if(CONAN_BUILD)
+if(PORTABLE_BUILD)
     if(APPLE)
-        set_target_properties(${TARGET} PROPERTIES INSTALL_RPATH "@executable_path/../${CMAKE_INSTALL_LIBDIR}")
+        set_target_properties(${TARGET} PROPERTIES INSTALL_RPATH "@executable_path/../${CMAKE_INSTALL_LIBDIR};@executable_path/../${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}")
     elseif(UNIX)
-        set_target_properties(${TARGET} PROPERTIES INSTALL_RPATH "$ORIGIN/../${CMAKE_INSTALL_LIBDIR}")
+        set_target_properties(${TARGET} PROPERTIES INSTALL_RPATH "$ORIGIN/../${CMAKE_INSTALL_LIBDIR};$ORIGIN/../${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}")
     endif()
 endif()

src/cmake/rpath_lib.cmake

@@ -1,7 +1,7 @@
-if(CONAN_BUILD)
+if(PORTABLE_BUILD)
     if(APPLE)
-        set_target_properties(${TARGET} PROPERTIES INSTALL_RPATH "@loader_path")
+        set_target_properties(${TARGET} PROPERTIES INSTALL_RPATH "@loader_path/${PROJECT_NAME}")
     elseif(UNIX)
-        set_target_properties(${TARGET} PROPERTIES INSTALL_RPATH "$ORIGIN")
+        set_target_properties(${TARGET} PROPERTIES INSTALL_RPATH "$ORIGIN/${PROJECT_NAME}")
     endif()
 endif()