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..3cee17b --- /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-06-27 + +### 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..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) 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}") diff --git a/src/acquire-core-libs b/src/acquire-core-libs index 6b8fb65..140a117 160000 --- a/src/acquire-core-libs +++ b/src/acquire-core-libs @@ -1 +1 @@ -Subproject commit 6b8fb65f76a44c69e57917525345652c2b83f74c +Subproject commit 140a117ccd8e85b2f9c337e109ff812bd437ac45 diff --git a/tests/acquire-driver-common b/tests/acquire-driver-common index 7419f82..da4ef3c 160000 --- a/tests/acquire-driver-common +++ b/tests/acquire-driver-common @@ -1 +1 @@ -Subproject commit 7419f8251abc062cc62224a4d3564776e9f3ab99 +Subproject commit da4ef3c0e3b9b48ecaf40be8b48f9bd9fd986bc8 diff --git a/tests/acquire-driver-zarr b/tests/acquire-driver-zarr index 5b00515..98a89b3 160000 --- a/tests/acquire-driver-zarr +++ b/tests/acquire-driver-zarr @@ -1 +1 @@ -Subproject commit 5b005153167d393eaa4d73c5a5f5fdfadeb87b51 +Subproject commit 98a89b38c1f39ab51b923a6d7fee4e451c54a571 diff --git a/tests/acquire-video-runtime b/tests/acquire-video-runtime index 0479673..22f62aa 160000 --- a/tests/acquire-video-runtime +++ b/tests/acquire-video-runtime @@ -1 +1 @@ -Subproject commit 0479673fa755531d594a1def765e97faacfaf449 +Subproject commit 22f62aafb4a0ce77157c4437f6db7835736d5bb6 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));