From 413be1bbc185ec9659f549f8efdb8655a2f056aa Mon Sep 17 00:00:00 2001 From: Alan Liddell Date: Wed, 10 May 2023 10:58:18 -0400 Subject: [PATCH 1/8] update submodules --- src/acquire-core-libs | 2 +- tests/acquire-driver-common | 2 +- tests/acquire-driver-zarr | 2 +- tests/acquire-video-runtime | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/acquire-core-libs b/src/acquire-core-libs index 51fb31f..59943f6 160000 --- a/src/acquire-core-libs +++ b/src/acquire-core-libs @@ -1 +1 @@ -Subproject commit 51fb31ffb53ab6d121268e62f1c4ec5359d3dcff +Subproject commit 59943f6380f639ed6bff928f1627001e854839ae diff --git a/tests/acquire-driver-common b/tests/acquire-driver-common index d2560d0..5ec4481 160000 --- a/tests/acquire-driver-common +++ b/tests/acquire-driver-common @@ -1 +1 @@ -Subproject commit d2560d0bd828cc75dd60e8a272fdf74905bc85f0 +Subproject commit 5ec4481b81a95be26560ab713e6f5592374bfdfc diff --git a/tests/acquire-driver-zarr b/tests/acquire-driver-zarr index 8033b9d..0ebd55c 160000 --- a/tests/acquire-driver-zarr +++ b/tests/acquire-driver-zarr @@ -1 +1 @@ -Subproject commit 8033b9d24a2620180f66189ebe9815b77b42e081 +Subproject commit 0ebd55c666f29381c7b47613e443945b245c82d8 diff --git a/tests/acquire-video-runtime b/tests/acquire-video-runtime index 9b9c215..5718b0f 160000 --- a/tests/acquire-video-runtime +++ b/tests/acquire-video-runtime @@ -1 +1 @@ -Subproject commit 9b9c215938f7cc61057cfc620dc15b0a49dfeb0d +Subproject commit 5718b0fcc393fa136149df1a66a0420a15c9690f From d81afda3215cd1430fbb5f45f283dc3b655e0ff4 Mon Sep 17 00:00:00 2001 From: Alan Liddell Date: Tue, 16 May 2023 16:59:33 -0400 Subject: [PATCH 2/8] fix test --- tests/one-video-stream.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/one-video-stream.cpp b/tests/one-video-stream.cpp index 7108516..1f2ceeb 100644 --- a/tests/one-video-stream.cpp +++ b/tests/one-video-stream.cpp @@ -70,8 +70,7 @@ main() SIZED("out.zarr"), 0, 0, - { 0 }, - 1ULL << 30); + { 0 }); OK(acquire_configure(runtime, &props)); From 560c64613d07f4aca45d2d3685ec0c8427fe3c58 Mon Sep 17 00:00:00 2001 From: Alan Liddell Date: Wed, 24 May 2023 16:19:47 -0400 Subject: [PATCH 3/8] Fix CI job names. Bump version. Add a changelog. --- .github/workflows/build.yml | 2 +- .github/workflows/nightly-release.yml | 2 +- CHANGELOG.md | 20 ++++++++++++++++++++ CMakeLists.txt | 2 +- cmake/cpack.cmake | 5 +++++ 5 files changed, 28 insertions(+), 3 deletions(-) create mode 100644 CHANGELOG.md create mode 100644 cmake/cpack.cmake diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9a53bf7..a7644dc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -8,7 +8,7 @@ on: jobs: windows-build: - name: "Build on Windows with DCAM SDK" + name: "Build on Windows with eGrabber SDK" runs-on: [ self-hosted, egrabber ] permissions: diff --git a/.github/workflows/nightly-release.yml b/.github/workflows/nightly-release.yml index 01e32e2..3104230 100644 --- a/.github/workflows/nightly-release.yml +++ b/.github/workflows/nightly-release.yml @@ -6,7 +6,7 @@ on: jobs: nightly-windows-build: - name: "Nightly build on Windows with EGrabber SDK" + name: "Nightly build on Windows with eGrabber SDK" runs-on: [ self-hosted, egrabber ] diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..e05638e --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,20 @@ +# Changelog + +All notable changes to this project will be documented in this file. + +The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), +and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). + +## [Unreleased] + +## [0.1.2](https://github.com/acquire-project/acquire-driver-egrabber/compare/v0.1.1...v0.1.2) - 2023-05-24 + +### Added + +- Nightly releases. + +### Changes + +- Updates call to `storage_properties_init` for the new function signature. + +## 0.1.1 - 2023-05-11 diff --git a/CMakeLists.txt b/CMakeLists.txt index d566812..62b3fac 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,4 +15,4 @@ set(CMAKE_CXX_STANDARD 20) add_subdirectory(src) add_subdirectory(tests) -include(CPack) +include(cmake/cpack.cmake) diff --git a/cmake/cpack.cmake b/cmake/cpack.cmake new file mode 100644 index 0000000..5a49a51 --- /dev/null +++ b/cmake/cpack.cmake @@ -0,0 +1,5 @@ +SET(CPACK_PACKAGE_VERSION_MAJOR 0) +SET(CPACK_PACKAGE_VERSION_MINOR 1) +SET(CPACK_PACKAGE_VERSION_PATCH 2) + +include(CPack) From 82819263ce926aeff742ab3e006281f78b47709d Mon Sep 17 00:00:00 2001 From: Alan Liddell Date: Thu, 25 May 2023 11:02:37 -0400 Subject: [PATCH 4/8] bump release date --- CHANGELOG.md | 2 +- tests/acquire-driver-common | 2 +- tests/acquire-driver-zarr | 2 +- tests/acquire-video-runtime | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e05638e..86eb9fd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] -## [0.1.2](https://github.com/acquire-project/acquire-driver-egrabber/compare/v0.1.1...v0.1.2) - 2023-05-24 +## [0.1.2](https://github.com/acquire-project/acquire-driver-egrabber/compare/v0.1.1...v0.1.2) - 2023-05-25 ### Added diff --git a/tests/acquire-driver-common b/tests/acquire-driver-common index f2bb321..3974a87 160000 --- a/tests/acquire-driver-common +++ b/tests/acquire-driver-common @@ -1 +1 @@ -Subproject commit f2bb32105cb20655dd6dd472769b8d84d5f68624 +Subproject commit 3974a872c88a394cd967fdfd08f53e544d1b0f56 diff --git a/tests/acquire-driver-zarr b/tests/acquire-driver-zarr index 4224b3c..05d7587 160000 --- a/tests/acquire-driver-zarr +++ b/tests/acquire-driver-zarr @@ -1 +1 @@ -Subproject commit 4224b3c563951fd951e38bf3ff78246eb04ae95e +Subproject commit 05d75878adcea0113da82d4906db409fa3aaaa9c diff --git a/tests/acquire-video-runtime b/tests/acquire-video-runtime index 6ebbb79..9cc7f87 160000 --- a/tests/acquire-video-runtime +++ b/tests/acquire-video-runtime @@ -1 +1 @@ -Subproject commit 6ebbb792605f11b9304ffba2a645d25f286b2145 +Subproject commit 9cc7f8745dddb3c996e2d0dff12e864e0237d1a6 From d6fb766b69f074228ee8fc21c82d2e38b7bfebb3 Mon Sep 17 00:00:00 2001 From: Alan Liddell Date: Fri, 2 Jun 2023 09:46:01 -0400 Subject: [PATCH 5/8] update submodules --- src/acquire-core-libs | 2 +- tests/acquire-driver-common | 2 +- tests/acquire-driver-zarr | 2 +- tests/acquire-video-runtime | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/acquire-core-libs b/src/acquire-core-libs index 59640dc..e1839d5 160000 --- a/src/acquire-core-libs +++ b/src/acquire-core-libs @@ -1 +1 @@ -Subproject commit 59640dc82bff24ea28b98a23dd693b80570a5499 +Subproject commit e1839d54dc28d418419249bc595a7a52524deac8 diff --git a/tests/acquire-driver-common b/tests/acquire-driver-common index 3974a87..babd9c3 160000 --- a/tests/acquire-driver-common +++ b/tests/acquire-driver-common @@ -1 +1 @@ -Subproject commit 3974a872c88a394cd967fdfd08f53e544d1b0f56 +Subproject commit babd9c35e2330940cddb1d7e54de92607a666d37 diff --git a/tests/acquire-driver-zarr b/tests/acquire-driver-zarr index 05d7587..b7242b4 160000 --- a/tests/acquire-driver-zarr +++ b/tests/acquire-driver-zarr @@ -1 +1 @@ -Subproject commit 05d75878adcea0113da82d4906db409fa3aaaa9c +Subproject commit b7242b499de907697b2a886793b50fb088dfd317 diff --git a/tests/acquire-video-runtime b/tests/acquire-video-runtime index 9cc7f87..f81c57d 160000 --- a/tests/acquire-video-runtime +++ b/tests/acquire-video-runtime @@ -1 +1 @@ -Subproject commit 9cc7f8745dddb3c996e2d0dff12e864e0237d1a6 +Subproject commit f81c57de1dec84a041a8b5cbffecae8e423f55cf From ec1e9f336e671e300699d41189484492eb22f5c5 Mon Sep 17 00:00:00 2001 From: Alan Liddell Date: Fri, 2 Jun 2023 09:47:52 -0400 Subject: [PATCH 6/8] use git versioning --- CMakeLists.txt | 3 ++- cmake/cpack.cmake | 5 ----- cmake/git-versioning.cmake | 30 ++++++++++++++++++++++++++++++ 3 files changed, 32 insertions(+), 6 deletions(-) delete mode 100644 cmake/cpack.cmake create mode 100644 cmake/git-versioning.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index 62b3fac..991be8a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,6 +4,7 @@ cmake_policy(SET CMP0079 NEW) # allows use with targets in other directories enable_testing() include(cmake/aq_require.cmake) +include(cmake/git-versioning.cmake) include(cmake/euresys.egrabber.cmake) include(cmake/ide.cmake) include(cmake/install-prefix.cmake) @@ -15,4 +16,4 @@ set(CMAKE_CXX_STANDARD 20) add_subdirectory(src) add_subdirectory(tests) -include(cmake/cpack.cmake) +include(CPack) diff --git a/cmake/cpack.cmake b/cmake/cpack.cmake deleted file mode 100644 index 5a49a51..0000000 --- a/cmake/cpack.cmake +++ /dev/null @@ -1,5 +0,0 @@ -SET(CPACK_PACKAGE_VERSION_MAJOR 0) -SET(CPACK_PACKAGE_VERSION_MINOR 1) -SET(CPACK_PACKAGE_VERSION_PATCH 2) - -include(CPack) diff --git a/cmake/git-versioning.cmake b/cmake/git-versioning.cmake new file mode 100644 index 0000000..60581f8 --- /dev/null +++ b/cmake/git-versioning.cmake @@ -0,0 +1,30 @@ +find_program(GIT git) +set(GIT_TAG "v0") +set(GIT_HASH "") + +if(GIT) + execute_process(COMMAND ${GIT} describe --tags --abbrev=0 + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} + OUTPUT_VARIABLE _GIT_TAG + OUTPUT_STRIP_TRAILING_WHITESPACE + ERROR_QUIET + ) + execute_process(COMMAND ${GIT} describe --always + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} + OUTPUT_VARIABLE GIT_HASH + OUTPUT_STRIP_TRAILING_WHITESPACE + ERROR_QUIET + ) + + string(FIND "${_GIT_TAG}" "fatal" find_result) + + if(${find_result} EQUAL -1) + set(GIT_TAG "${_GIT_TAG}") + endif() +endif() + +# Output +add_definitions(-DGIT_TAG=${GIT_TAG}) +add_definitions(-DGIT_HASH=${GIT_HASH}) +set(CPACK_PACKAGE_VERSION ${GIT_TAG}) +message(STATUS "Version ${GIT_TAG} ${GIT_HASH}") From 0cab60175ff825b13329c8b19dab6c67979e74da Mon Sep 17 00:00:00 2001 From: Alan Liddell Date: Tue, 27 Jun 2023 06:59:27 -0700 Subject: [PATCH 7/8] update submodules --- src/acquire-core-libs | 2 +- tests/acquire-driver-common | 2 +- tests/acquire-driver-zarr | 2 +- tests/acquire-video-runtime | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/acquire-core-libs b/src/acquire-core-libs index e1839d5..140a117 160000 --- a/src/acquire-core-libs +++ b/src/acquire-core-libs @@ -1 +1 @@ -Subproject commit e1839d54dc28d418419249bc595a7a52524deac8 +Subproject commit 140a117ccd8e85b2f9c337e109ff812bd437ac45 diff --git a/tests/acquire-driver-common b/tests/acquire-driver-common index babd9c3..da4ef3c 160000 --- a/tests/acquire-driver-common +++ b/tests/acquire-driver-common @@ -1 +1 @@ -Subproject commit babd9c35e2330940cddb1d7e54de92607a666d37 +Subproject commit da4ef3c0e3b9b48ecaf40be8b48f9bd9fd986bc8 diff --git a/tests/acquire-driver-zarr b/tests/acquire-driver-zarr index b7242b4..98a89b3 160000 --- a/tests/acquire-driver-zarr +++ b/tests/acquire-driver-zarr @@ -1 +1 @@ -Subproject commit b7242b499de907697b2a886793b50fb088dfd317 +Subproject commit 98a89b38c1f39ab51b923a6d7fee4e451c54a571 diff --git a/tests/acquire-video-runtime b/tests/acquire-video-runtime index f81c57d..22f62aa 160000 --- a/tests/acquire-video-runtime +++ b/tests/acquire-video-runtime @@ -1 +1 @@ -Subproject commit f81c57de1dec84a041a8b5cbffecae8e423f55cf +Subproject commit 22f62aafb4a0ce77157c4437f6db7835736d5bb6 From 93b7a1c9111441dfcc04c5ab832a6a3315e7d411 Mon Sep 17 00:00:00 2001 From: Alan Liddell Date: Tue, 27 Jun 2023 07:03:39 -0700 Subject: [PATCH 8/8] Fix release date --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 86eb9fd..3cee17b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] -## [0.1.2](https://github.com/acquire-project/acquire-driver-egrabber/compare/v0.1.1...v0.1.2) - 2023-05-25 +## [0.1.2](https://github.com/acquire-project/acquire-driver-egrabber/compare/v0.1.1...v0.1.2) - 2023-06-27 ### Added