Steffen Möller pushed to branch master at Debian Med / xenium
Commits: d5cdb227 by Steffen Möller at 2020-07-21T19:52:09+02:00 Preparing for eliminating privacy violation with local svg - - - - - 77134fc5 by Steffen Möller at 2020-07-21T20:00:35+02:00 Added patch description - - - - - aa59b594 by Steffen Möller at 2020-07-21T20:13:54+02:00 Merge branch 'master' of salsa.debian.org:med-team/xenium - - - - - d39fdde3 by Steffen Möller at 2020-07-21T20:17:05+02:00 Testing works. - - - - - 6 changed files: - debian/control - debian/copyright - debian/patches/AdjustCMake.patch - debian/rules - + debian/svg/docs-doxygen-purple.svg - + debian/svg/license-mit-blue.svg Changes: ===================================== debian/control ===================================== @@ -4,7 +4,8 @@ Priority: optional Maintainer: Debian Med Packaging Team <[email protected]> Uploaders: Steffen Moeller <[email protected]> Build-Depends: debhelper-compat (= 13), - libcds-dev, + libboost-dev, +# OPTIONAL libcds-dev, tao-json-dev, tao-config-dev, cmake, ===================================== debian/copyright ===================================== @@ -8,6 +8,11 @@ Files: * Copyright: 2018-2020 Manuel Pöter License: MIT +Files: debian/svg/* +Copyright: 2018-2020 Manuel Pöter + Generated via https://img.shields.io +License: MIT + Files: debian/* Copyright: 2020 Steffen Moeller <[email protected]> License: MIT ===================================== debian/patches/AdjustCMake.patch ===================================== @@ -1,17 +1,10 @@ +Description: Adjusting for non-inclusion of 3rdParty tools +Author: Steffen Moeller <[email protected]> Index: xenium/CMakeLists.txt =================================================================== --- xenium.orig/CMakeLists.txt +++ xenium/CMakeLists.txt -@@ -6,7 +6,7 @@ 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 +@@ -21,9 +21,6 @@ file(GLOB_RECURSE BENCHMARK_FILES benchm include_directories( . @@ -20,21 +13,8 @@ Index: xenium/CMakeLists.txt - ./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) + add_executable(gtest ${TEST_FILES} ${XENIUM_FILES}) +@@ -44,7 +41,7 @@ if(WITH_LIBCDS) endif() if(MSVC) @@ -42,30 +22,7 @@ Index: xenium/CMakeLists.txt +# 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) + target_compile_options(gtest PRIVATE -Wall -Wextra -Werror -Wno-error=cpp) Index: xenium/gtest.cmake =================================================================== --- xenium.orig/gtest.cmake ===================================== debian/rules ===================================== @@ -16,8 +16,10 @@ override_dh_auto_build: override_dh_auto_test: ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) - echo Not testing - who knows how to execute the benchmark properly? + echo "I: Executing benchmark - who knows how to execute it properly?" obj-$$(dpkg-architecture -qDEB_TARGET_GNU_TYPE)/benchmark || true + echo "I: gtest" + obj-$$(dpkg-architecture -qDEB_TARGET_GNU_TYPE)/gtest endif override_dh_auto_clean: ===================================== debian/svg/docs-doxygen-purple.svg ===================================== @@ -0,0 +1 @@ +<svg xmlns="http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink"; width="92" height="20" role="img" aria-label="docs: doxygen"><title>docs: doxygen</title><linearGradient id="s" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><clipPath id="r"><rect width="92" height="20" rx="3" fill="#fff"/></clipPath><g clip-path="url(#r)"><rect width="35" height="20" fill="#555"/><rect x="35" width="57" height="20" fill="purple"/><rect width="92" height="20" fill="url(#s)"/></g><g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" text-rendering="geometricPrecision" font-size="110"><text aria-hidden="true" x="185" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="250">docs</text><text x="185" y="140" transform="scale(.1)" fill="#fff" textLength="250">docs</text><text aria-hidden="true" x="625" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="470">doxygen</text><text x="625" y="140" transform="scale(.1)" fill="#fff" textLength="470">doxygen</text></g></svg> \ No newline at end of file ===================================== debian/svg/license-mit-blue.svg ===================================== @@ -0,0 +1 @@ +<svg xmlns="http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink"; width="76" height="20" role="img" aria-label="license: mit"><title>license: mit</title><linearGradient id="s" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><clipPath id="r"><rect width="76" height="20" rx="3" fill="#fff"/></clipPath><g clip-path="url(#r)"><rect width="47" height="20" fill="#555"/><rect x="47" width="29" height="20" fill="#007ec6"/><rect width="76" height="20" fill="url(#s)"/></g><g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" text-rendering="geometricPrecision" font-size="110"><text aria-hidden="true" x="245" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="370">license</text><text x="245" y="140" transform="scale(.1)" fill="#fff" textLength="370">license</text><text aria-hidden="true" x="605" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="190">mit</text><text x="605" y="140" transform="scale(.1)" fill="#fff" textLength="190">mit</text></g></svg> \ No newline at end of file View it on GitLab: https://salsa.debian.org/med-team/xenium/-/compare/9452ad60ca3d05bb251bac28a12ee916c7bf975d...d39fdde30582ac964d1197a9f68f9886c4abd7cf -- View it on GitLab: https://salsa.debian.org/med-team/xenium/-/compare/9452ad60ca3d05bb251bac28a12ee916c7bf975d...d39fdde30582ac964d1197a9f68f9886c4abd7cf You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ debian-med-commit mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-med-commit
