From a98ba580215aa2f324291042366f7567934660c4 Mon Sep 17 00:00:00 2001
From: Sergey Yakubov <sergey.yakubov@desy.de>
Date: Fri, 16 Oct 2020 14:55:47 +0200
Subject: [PATCH] update readme, added python producer source dist for windows
---
CHANGELOG.md | 9 +++++++++
producer/api/python/CMakeLists_Windows.cmake | 1 +
producer/api/python/source_dist_linux/CMakeLists.txt | 1 -
producer/api/python/source_dist_linux/setup.py.in | 2 +-
4 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 05f33531d..ee760aaee 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,12 @@
+##20.09.1
+
+IMPROVEMENTS
+* Each data tuple automatically gets a timestamp (nanoseconds from Linux epoch) at the moment it is being inserted to a database
+* GetSubstreamList/get_substream_list returns now sorted (by timestamp of the earliest data tuple) list of substreams. Parameter `from` allows to limit the list
+
+BREAKING CHANGES
+* GetSubstreamList/get_substream_list returns now not an array of strings, but array of StreamInfos/dictionaries
+
##20.09.0
FEATURES
diff --git a/producer/api/python/CMakeLists_Windows.cmake b/producer/api/python/CMakeLists_Windows.cmake
index c9b58cda8..6ccb7978f 100644
--- a/producer/api/python/CMakeLists_Windows.cmake
+++ b/producer/api/python/CMakeLists_Windows.cmake
@@ -28,3 +28,4 @@ target_include_directories(${TARGET_NAME} PUBLIC include ${Python3_INCLUDE_DIRS
add_subdirectory(binary_dist_windows)
+add_subdirectory(source_dist_linux)
diff --git a/producer/api/python/source_dist_linux/CMakeLists.txt b/producer/api/python/source_dist_linux/CMakeLists.txt
index 89a61bd74..1db8414f9 100644
--- a/producer/api/python/source_dist_linux/CMakeLists.txt
+++ b/producer/api/python/source_dist_linux/CMakeLists.txt
@@ -16,7 +16,6 @@ ADD_CUSTOM_TARGET(copy_python_dist-producer ALL
COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/lib
COMMAND ${CMAKE_COMMAND} -E copy ${CURL_LIBRARIES} ${CMAKE_CURRENT_BINARY_DIR}/lib
COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:asapo-producer> ${CMAKE_CURRENT_BINARY_DIR}/lib
-
)
diff --git a/producer/api/python/source_dist_linux/setup.py.in b/producer/api/python/source_dist_linux/setup.py.in
index 10cec57a0..7da5f362e 100644
--- a/producer/api/python/source_dist_linux/setup.py.in
+++ b/producer/api/python/source_dist_linux/setup.py.in
@@ -4,7 +4,7 @@ import numpy
ext_modules = [
Extension("asapo_producer", ["asapo_producer.cpp"],
- extra_objects=['lib/libasapo-producer.a', 'lib/libcurl.a'],
+ extra_objects=['lib/libasapo-producer@CMAKE_STATIC_LIBRARY_SUFFIX@', 'lib/libcurl@CMAKE_STATIC_LIBRARY_SUFFIX@'],
include_dirs=["include/common","include",numpy.get_include()],
extra_compile_args=@EXTRA_COMPILE_ARGS@,
extra_link_args=@EXTRA_LINK_ARGS@,
--
GitLab