Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
d6ceb0c
Fix find package for linux
synacker Jun 7, 2025
ba06647
Merge pull request #99 from synacker/fix/deploy
synacker Jun 7, 2025
737043b
Fix windows
synacker Jun 7, 2025
9b535dc
Merge pull request #100 from synacker/fix-windows-package
synacker Jun 7, 2025
528b7fd
Erase duplicate
synacker Jun 8, 2025
9d6b741
Merge pull request #101 from synacker/fix/export_duplicate
synacker Jun 8, 2025
fe268c6
Daggy requires Qt Network due precompiled
uilianries Oct 16, 2025
d3dbd46
DaggyCore always requires Qt Network
uilianries Oct 16, 2025
fd7f460
Add missing noexcept for yaml method implementation
uilianries Oct 16, 2025
02b6f7a
Removed vars from repo for success pr from forks
synacker Oct 16, 2025
bd51f45
Merge pull request #105 from synacker/fix/remove_env_vars
synacker Oct 16, 2025
ec4f8ce
Merge branch 'master' of https://github.com/synacker/daggy into fix/y…
uilianries Oct 16, 2025
50395c5
Merge branch 'master' of https://github.com/synacker/daggy into fix/q…
uilianries Oct 16, 2025
af68eac
Removed wrong keywords when liking
uilianries Oct 16, 2025
47cc8e8
Disable attestation for pr
synacker Oct 16, 2025
65e5885
Merge pull request #106 from synacker/fix/disable_attestation_for_pr
synacker Oct 16, 2025
88a904b
Merge branch 'master' of https://github.com/synacker/daggy into fix/y…
uilianries Oct 16, 2025
7979ab2
Merge branch 'master' of https://github.com/synacker/daggy into fix/q…
uilianries Oct 16, 2025
38d7731
Merge pull request #104 from uilianries/fix/yaml-decl
synacker Oct 16, 2025
7dd0ffd
Merge pull request #103 from uilianries/fix/qt-cmake
synacker Oct 16, 2025
ebcf64c
Add Conan Center badge to README
synacker Nov 1, 2025
bd90a3c
Merge pull request #107 from synacker/synacker-patch-1
synacker Nov 2, 2025
70a2843
Fix badge links in README.md
synacker Nov 2, 2025
441c509
Merge pull request #108 from synacker/synacker-patch-2
synacker Nov 2, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 13 additions & 12 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,18 +32,18 @@ jobs:
- uses: ./.github/actions/enable_python
- uses: ./.github/actions/conan_build
with:
profile: ${{ vars.LINUX_X64_PROFILE }}
profile: linux-gcc12_x64

- uses: ./.github/actions/tests
with:
testdir: build/Release
name: ${{ vars.LINUX_X64_PROFILE }} tests
name: linux-gcc12_x64 tests

- uses: ./.github/actions/deploy
if: inputs.deploy
with:
builddir: build/Release
artifact: ${{ vars.LINUX_X64_PROFILE }}
artifact: linux-gcc12_x64
attestation: ${{inputs.attestation}}

macos-arm-build:
Expand All @@ -62,18 +62,18 @@ jobs:
- uses: ./.github/actions/enable_python_macos
- uses: ./.github/actions/conan_build
with:
profile: ${{vars.MACOS_ARM_PROFILE}}
profile: macos-clang15_arm

- uses: ./.github/actions/tests
with:
testdir: build/Release
name: ${{vars.MACOS_ARM_PROFILE}} tests
name: macos-clang15_arm tests

- uses: ./.github/actions/deploy
if: inputs.deploy
with:
builddir: build/Release
artifact: ${{vars.MACOS_ARM_PROFILE}}
artifact: macos-clang15_arm
attestation: ${{inputs.attestation}}

macos-x64-build:
Expand All @@ -92,17 +92,18 @@ jobs:
- uses: ./.github/actions/enable_python_macos
- uses: ./.github/actions/conan_build
with:
profile: ${{vars.MACOS_X64_PROFILE}}
profile: macos-clang15_x64

- uses: ./.github/actions/tests
with:
testdir: build/Release
name: ${{vars.MACOS_X64_PROFILE}} tests
name: macos-clang15_x64 tests

- uses: ./.github/actions/deploy
if: inputs.deploy
with:
builddir: build/Release
artifact: ${{vars.MACOS_X64_PROFILE}}
artifact: macos-clang15_x64
attestation: ${{inputs.attestation}}

win-x64-build:
Expand All @@ -121,16 +122,16 @@ jobs:
- uses: ./.github/actions/enable_python
- uses: ./.github/actions/conan_build
with:
profile: ${{vars.WIN_X64_PROFILE}}
profile: win-msvc194_x64

- uses: ./.github/actions/tests
with:
testdir: build
name: ${{vars.WIN_X64_PROFILE}} tests
name: win-msvc194_x64 tests

- uses: ./.github/actions/deploy
if: inputs.deploy
with:
builddir: build
artifact: ${{vars.WIN_X64_PROFILE}}
artifact: win-msvc194_x64
attestation: ${{inputs.attestation}}
8 changes: 4 additions & 4 deletions .github/workflows/check_cache.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- uses: ./.github/actions/check_cache
id: check-cache
with:
profile: ${{ vars.LINUX_X64_PROFILE }}
profile: linux-gcc12_x64

macos-arm-check-cache:
runs-on: macos-14
Expand All @@ -32,7 +32,7 @@ jobs:
- uses: ./.github/actions/check_cache
id: check-cache
with:
profile: ${{ vars.MACOS_ARM_PROFILE }}
profile: macos-clang15_arm

macos-x64-check-cache:
runs-on: macos-13
Expand All @@ -43,7 +43,7 @@ jobs:
- uses: ./.github/actions/check_cache
id: check-cache
with:
profile: ${{ vars.MACOS_X64_PROFILE }}
profile: macos-clang15_x64

win-x64-check-cache:
runs-on: windows-2022
Expand All @@ -54,4 +54,4 @@ jobs:
- uses: ./.github/actions/check_cache
id: check-cache
with:
profile: ${{ vars.WIN_X64_PROFILE }}
profile: win-msvc194_x64
8 changes: 4 additions & 4 deletions .github/workflows/make_cache.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- uses: ./.github/actions/enable_python
- uses: ./.github/actions/enable_conan
with:
profile: ${{vars.LINUX_X64_PROFILE}}
profile: linux-gcc12_x64

macos-arm-make-cache:
runs-on: macos-14
Expand All @@ -27,7 +27,7 @@ jobs:
- uses: ./.github/actions/enable_python_macos
- uses: ./.github/actions/enable_conan
with:
profile: ${{vars.MACOS_ARM_PROFILE}}
profile: macos-clang15_arm

macos-x64-make-cache:
runs-on: macos-13
Expand All @@ -38,7 +38,7 @@ jobs:
- uses: ./.github/actions/enable_python_macos
- uses: ./.github/actions/enable_conan
with:
profile: ${{vars.MACOS_X64_PROFILE}}
profile: macos-clang15_x64

win-x64-make-cache:
runs-on: windows-2022
Expand All @@ -49,4 +49,4 @@ jobs:
- uses: ./.github/actions/enable_python
- uses: ./.github/actions/enable_conan
with:
profile: ${{vars.WIN_X64_PROFILE}}
profile: win-msvc194_x64
2 changes: 1 addition & 1 deletion .github/workflows/pull_request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ jobs:
uses: ./.github/workflows/build.yaml
with:
deploy: true
attestation: true
attestation: false
secrets: inherit

6 changes: 3 additions & 3 deletions .github/workflows/sign_build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,18 +32,18 @@ jobs:
- uses: ./.github/actions/enable_python
- uses: ./.github/actions/conan_build
with:
profile: ${{vars.WIN_X64_APPONLY_PROFILE}}
profile: win-msvc194_x64_static
args: -o daggy/*:apponly=True

- uses: ./.github/actions/tests
with:
testdir: build
name: ${{vars.WIN_X64_APPONLY_PROFILE}} tests
name: win-msvc194_x64_static tests

- uses: ./.github/actions/deploy_with_sign
with:
builddir: build
artifact: ${{vars.WIN_X64_APPONLY_PROFILE}}
artifact: win-msvc194_x64_static
sign: ${{inputs.sign}}
signeddir: build/signed
token: ${{secrets.SIGNPATH_API_TOKEN}}
5 changes: 0 additions & 5 deletions conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,6 @@ def generate(self):
copy(self, "*.dylib", dep.cpp_info.libdirs[0], libdir)

tc = CMakeToolchain(self)
tc.cache_variables["CMAKE_INSTALL_LIBDIR"] = self.cpp.libdirs[0]
tc.cache_variables["SSH2_SUPPORT"] = True
tc.cache_variables["YAML_SUPPORT"] = True
tc.cache_variables["CONSOLE"] = True
Expand All @@ -134,7 +133,3 @@ def package(self):
cmake = CMake(self)
cmake.configure()
cmake.install()

def package_info(self):
self.cpp_info.libs = ["DaggyCore"]
self.cpp_info.libdirs = [self._libdir()]
3 changes: 2 additions & 1 deletion docs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@ description: Common information about Daggy and Getting Started

# About Daggy

![Daggy Workflow](https://github.com/synacker/daggy/actions/workflows/push.yaml/badge.svg)
[![Develop build](https://github.com/synacker/daggy/actions/workflows/push.yaml/badge.svg)](https://github.com/synacker/daggy/actions/workflows/push.yaml)
[![GitBook](https://img.shields.io/static/v1?message=Documented%20on%20GitBook&logo=gitbook&logoColor=ffffff&label=%20&labelColor=5c5c5c&color=3F89A1)](https://daggy.gitbook.io/docs)
[![Conan Center](https://img.shields.io/conan/v/daggy)](https://conan.io/center/recipes/daggy)

![Daggy](daggy_logo.svg)

Expand Down
4 changes: 2 additions & 2 deletions src/Daggy/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ set(TARGET daggy)

option(PCAPNG_SUPPORT "pcap to pcapng convertor" OFF)

find_package(Qt6 COMPONENTS Core REQUIRED)
find_package(Qt6 COMPONENTS Core Network CONFIG REQUIRED)

add_executable(${TARGET})
include(rpath_bin)
Expand All @@ -15,7 +15,7 @@ target_sources(${TARGET}
CConsoleDaggy.cpp
)

target_link_libraries(${TARGET} PRIVATE DaggyCore)
target_link_libraries(${TARGET} PRIVATE DaggyCore Qt6::Core Qt6::Network)

if (PCAPNG_SUPPORT)
add_compile_definitions(PCAPNG_SUPPORT)
Expand Down
12 changes: 3 additions & 9 deletions src/DaggyCore/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ target_sources(${TARGET}

target_link_libraries(${TARGET} PUBLIC Qt6::Core Qt6::Network)


if (SSH2_SUPPORT)
if(CONAN_BUILD)
find_package(Libssh2 REQUIRED)
Expand Down Expand Up @@ -82,10 +81,9 @@ endif()

if(YAML_SUPPORT)
find_package(yaml-cpp REQUIRED)
target_link_libraries(${TARGET} PUBLIC yaml-cpp)
target_link_libraries(${TARGET} PUBLIC yaml-cpp::yaml-cpp)
endif()


string(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UPPER)
configure_file(version.h.in ${CMAKE_CURRENT_LIST_DIR}/version.h @ONLY)

Expand All @@ -108,7 +106,7 @@ if (BUILD_TESTING)
endif()

if (NOT APPONLY_BUILD)
if(UNIX)
if (NOT PORTABLE_BUILD)
install(TARGETS ${TARGET}
EXPORT ${TARGET}Targets
PUBLIC_HEADER FILE_SET HEADERS
Expand All @@ -124,14 +122,10 @@ if (NOT APPONLY_BUILD)
INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${TARGET})
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${TARGET}Config.cmake
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${TARGET})

else()
install(TARGETS ${TARGET}
PUBLIC_HEADER FILE_SET HEADERS
ARCHIVE
RUNTIME)
LIBRARY)
endif()
include(package_deps)
endif()


2 changes: 1 addition & 1 deletion src/DaggyCore/Config.cmake.in
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@

include("${CMAKE_CURRENT_LIST_DIR}/@TARGET@Targets.cmake")

check_requred_compinents(@TARGET@)
check_required_components(@TARGET@)
include(CMakeFindDependencyMacro)
2 changes: 1 addition & 1 deletion src/DaggyCore/Sources.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -408,7 +408,7 @@ catch (const std::exception& exception) {
}

#else
std::optional<daggy::Sources> daggy::sources::convertors::yaml(const QString& data, QString& error)
std::optional<daggy::Sources> daggy::sources::convertors::yaml(const QString& data, QString& error) noexcept
{
error = "yaml not supported";
return {};
Expand Down
8 changes: 4 additions & 4 deletions test_package/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
cmake_minimum_required(VERSION 3.31)
project(DaggyPackageTest)

include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
conan_basic_setup()

find_package(daggy REQUIRED)
find_package(Qt6 COMPONENTS Core Network REQUIRED)
find_package(yaml-cpp REQUIRED)
find_package(DaggyCore REQUIRED)

add_subdirectory(testcpp)
add_subdirectory(testc)
26 changes: 0 additions & 26 deletions test_package/conanfile.py

This file was deleted.

2 changes: 1 addition & 1 deletion test_package/testc/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ set(CMAKE_C_STANDARD 11)
set(CMAKE_C_STANDARD_REQUIRED ON)

add_executable(testc ../../src/DaggyCore/tests/interface/testc/test.c)
target_link_libraries(testc daggy::daggy)
target_link_libraries(testc daggy::DaggyCore)
4 changes: 2 additions & 2 deletions test_package/testcpp/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
project(testcpp LANGUAGES CXX)

set(CMAKE_CXX_STANDARD 20)
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)

add_executable(testcpp ../../src/DaggyCore/tests/interface/testcpp/test.cpp)
target_link_libraries(testcpp daggy::daggy)
target_link_libraries(testcpp daggy::DaggyCore)
Loading