[med-svn] [Git][med-team/xenium][master] Builds and installs - does not test
Steffen Möller
gitlab at salsa.debian.org
Mon Jul 20 20:16:09 BST 2020
Steffen Möller pushed to branch master at Debian Med / xenium
Commits:
a72daca2 by Steffen Möller at 2020-07-20T21:15:48+02:00
Builds and installs - does not test
- - - - -
7 changed files:
- debian/changelog
- debian/control
- + debian/libxenium-dev.install
- + debian/patches/AdjustCMake.patch
- + debian/patches/series
- debian/rules
- + debian/xenium-doc.docs
Changes:
=====================================
debian/changelog
=====================================
@@ -2,6 +2,6 @@ xenium (0.0+git20200603.5336adf-1) UNRELEASED; urgency=medium
* Initial release (Closes: #965347)
- TODO: Needs tao* dependencies in the distribution
+ BLOCKER: Needs tao* dependencies in the distribution
-- Steffen Moeller <moeller at debian.org> Mon, 20 Jul 2020 00:37:21 +0200
=====================================
debian/control
=====================================
@@ -4,9 +4,10 @@ Priority: optional
Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
Uploaders: Steffen Moeller <moeller at debian.org>
Build-Depends: debhelper-compat (= 13),
-# as a reminder - need to check out these libs are truly named
- libtao-cpp-dev,
- libtao-json-dev
+ libcds-dev,
+ tao-json-dev,
+ tao-config-dev,
+ doxygen
Standards-Version: 4.5.0
Vcs-Browser: https://salsa.debian.org/med-team/xenium
Vcs-Git: https://salsa.debian.org/med-team/xenium.git
@@ -27,3 +28,19 @@ Description: concurrent data structures and memory reclamation algorithms
* no initialization code needed
* supports dynamic number of threads (no fixed compile time
specification)
+
+Package: xenium-doc
+Architecture: all
+Depends: ${misc:Depends}
+Suggests: libxenium-dev
+Description: HTML documentation for the xenium library
+ xenium is a header-only library that provides a collection of concurrent
+ data structures and memory reclamation algorithms. The data structures
+ are parameterized so that they can be used with various reclamation
+ schemes (similar to how the STL allows customization of allocators).
+ .
+ * header only
+ * highly customizable
+ * no initialization code needed
+ * supports dynamic number of threads (no fixed compile time
+ specification)
=====================================
debian/libxenium-dev.install
=====================================
@@ -0,0 +1 @@
+xenium usr/include/
=====================================
debian/patches/AdjustCMake.patch
=====================================
@@ -0,0 +1,74 @@
+Index: xenium/CMakeLists.txt
+===================================================================
+--- xenium.orig/CMakeLists.txt
++++ xenium/CMakeLists.txt
+@@ -1,12 +1,12 @@
+ project(xenium)
+ cmake_minimum_required(VERSION 3.0)
+
+-include(gtest.cmake)
++#include(gtest.cmake)
+
+ set(CMAKE_CXX_STANDARD 17)
+ set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+-enable_testing()
++#enable_testing()
+
+ find_package(Threads REQUIRED)
+ find_package(Doxygen)
+@@ -21,19 +21,16 @@ file(GLOB_RECURSE BENCHMARK_FILES benchm
+
+ include_directories(
+ .
+- ${GTEST_INCLUDE_DIRS}
+- ./3rdParty/json/include
+- ./3rdParty/config/include
+ )
+
+-add_executable(gtest ${TEST_FILES} ${XENIUM_FILES})
++#add_executable(gtest ${TEST_FILES} ${XENIUM_FILES})
+
+ add_executable(benchmark ${BENCHMARK_FILES} ${XENIUM_FILES})
+
+-target_link_libraries(gtest googletest)
++#target_link_libraries(gtest googletest)
+
+ if(CMAKE_THREAD_LIBS_INIT)
+- target_link_libraries(gtest "${CMAKE_THREAD_LIBS_INIT}")
++# target_link_libraries(gtest "${CMAKE_THREAD_LIBS_INIT}")
+ target_link_libraries(benchmark "${CMAKE_THREAD_LIBS_INIT}")
+ endif()
+
+@@ -44,10 +41,10 @@ if(WITH_LIBCDS)
+ endif()
+
+ if(MSVC)
+- target_compile_options(gtest PRIVATE /bigobj /W4)# /WX)
++# target_compile_options(gtest PRIVATE /bigobj /W4)# /WX)
+ target_compile_options(benchmark PRIVATE /bigobj)# /W4 /WX)
+ else()
+- target_compile_options(gtest PRIVATE -Wall -Wextra -Werror -Wno-error=cpp)
++# target_compile_options(gtest PRIVATE -Wall -Wextra -Werror -Wno-error=cpp)
+ target_compile_options(benchmark PRIVATE -Wall -Wextra -Wno-error=cpp)
+ endif()
+
+@@ -59,16 +56,10 @@ elseif(CMAKE_BUILD_TYPE MATCHES Release)
+ add_definitions(-DNDEBUG)
+ endif()
+
+-if(BUILD_DOCUMENTATION)
+- if(NOT DOXYGEN_FOUND)
+- message(FATAL_ERROR "Doxygen is needed to build the documentation.")
+- endif()
+-
+- add_custom_target(doc
++add_custom_target(doc
+ COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/doc/Doxyfile
+ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/doc
+ COMMENT "Generating API documentation with Doxygen"
+ VERBATIM)
+-endif()
+
+-add_test(AllTests gtest)
++#add_test(AllTests gtest)
=====================================
debian/patches/series
=====================================
@@ -0,0 +1 @@
+AdjustCMake.patch
=====================================
debian/rules
=====================================
@@ -1,31 +1,25 @@
#!/usr/bin/make -f
-# DH_VERBOSE := 1
+DH_VERBOSE := 1
export LC_ALL=C.UTF-8
-
-include /usr/share/dpkg/default.mk
-# this provides:
-# DEB_SOURCE: the source package name
-# DEB_VERSION: the full version of the package (epoch + upstream vers. + revision)
-# DEB_VERSION_EPOCH_UPSTREAM: the package's version without the Debian revision
-# DEB_VERSION_UPSTREAM_REVISION: the package's version without the Debian epoch
-# DEB_VERSION_UPSTREAM: the package's upstream version
-# DEB_DISTRIBUTION: the distribution(s) listed in the current entry of debian/changelog
-# SOURCE_DATE_EPOCH: the source release date as seconds since the epoch, as
-# specified by <https://reproducible-builds.org/specs/source-date-epoch/>
-
-# for hardening you might like to uncomment this:
-# export DEB_BUILD_MAINT_OPTIONS=hardening=+all
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all
%:
dh $@
-### When overriding auto_test make sure DEB_BUILD_OPTIONS will be respected
-#override_dh_auto_test:
-#ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
-# do_stuff_for_testing
-#endif
+override_dh_auto_configure:
+ dh_auto_configure -- -DCMAKE_BUILD_TYPE="RelWithDebug"
+
+override_dh_auto_build:
+ dh_auto_build
+ $(MAKE) -C obj-$$(dpkg-architecture -qDEB_TARGET_GNU_TYPE) doc
+
+override_dh_auto_test:
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+ echo Not testing - who knows how to execute the benchmark properly?
+ obj-$$(dpkg-architecture -qDEB_TARGET_GNU_TYPE)/benchmark || true
+endif
-### If you **really** can not use uscan (even not with mode=git) use a debian/get-orig-script
-#get-orig-source:
-# . debian/get-orig-source
+override_dh_auto_clean:
+ dh_auto_clean
+ rm -rf doc/html/
=====================================
debian/xenium-doc.docs
=====================================
@@ -0,0 +1 @@
+doc/html/
View it on GitLab: https://salsa.debian.org/med-team/xenium/-/commit/a72daca25252eb80a3b8e143938503faeb584260
--
View it on GitLab: https://salsa.debian.org/med-team/xenium/-/commit/a72daca25252eb80a3b8e143938503faeb584260
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20200720/ede150b4/attachment-0001.html>
More information about the debian-med-commit
mailing list