From f972c83eedc2683d7b26837a7e5cfec290acef4a Mon Sep 17 00:00:00 2001 From: sagitter Date: Oct 20 2019 12:22:11 +0000 Subject: Pre-release 2.4.2 --- diff --git a/.gitignore b/.gitignore index 4c7f739..c635620 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /openmeeg-2.4-rc1.tar.gz /openmeeg-2.4-rc4.tar.gz /openmeeg-2.4.1.tar.gz +/openmeeg-2.4.2.tar.gz diff --git a/openmeeg-bug385.patch b/openmeeg-bug385.patch new file mode 100644 index 0000000..23d0e38 --- /dev/null +++ b/openmeeg-bug385.patch @@ -0,0 +1,184 @@ +From 2cbde92533c48e0370480d2edc0c262460be27ee Mon Sep 17 00:00:00 2001 +From: Theodore Papadopoulo +Date: Fri, 11 Oct 2019 10:28:25 +0200 +Subject: [PATCH 1/4] Minor style tweaks. + +--- + documentation/CMakeLists.txt | 8 +++---- + documentation/reference/CMakeLists.txt | 30 ++++++++++++-------------- + wrapping/src/CMakeLists.txt | 5 ++--- + 3 files changed, 19 insertions(+), 24 deletions(-) + +diff --git a/documentation/CMakeLists.txt b/documentation/CMakeLists.txt +index 520627d1..96d24252 100644 +--- a/documentation/CMakeLists.txt ++++ b/documentation/CMakeLists.txt +@@ -4,8 +4,6 @@ + # # OPTIONAL_COMPONENTS mscgen dia) + + +-IF (BUILD_REFERENCE_DOC)# XXX: the right condition should be (BUILD_REFERENCE_DOC and DOXYGEN_FOUND) therefore, Doxygen should be found ind documentation rather than its subdirectories +- SUBDIRS(reference) +-ENDIF (BUILD_REFERENCE_DOC) +- +-# XXX: Add a test to ensure that documentation is generated properly ++if (BUILD_REFERENCE_DOC)# XXX: the right condition should be (BUILD_REFERENCE_DOC and DOXYGEN_FOUND) therefore, Doxygen should be found in documentation rather than its subdirectories ++ subdirs(reference) ++endif() +diff --git a/documentation/reference/CMakeLists.txt b/documentation/reference/CMakeLists.txt +index 01ebb8a6..669a2641 100644 +--- a/documentation/reference/CMakeLists.txt ++++ b/documentation/reference/CMakeLists.txt +@@ -2,9 +2,9 @@ + # Build the documentation + # + +-INCLUDE (Documentation OPTIONAL) ++include(Documentation OPTIONAL) + +-IF (BUILD_DOCUMENTATION) ++if (BUILD_DOCUMENTATION) + + # + # Configure the script and the doxyfile, then add target +@@ -20,30 +20,28 @@ IF (BUILD_DOCUMENTATION) + # Consider installing this package.") + # endif(NOT DOXYGEN_DOT_FOUND) + # +- IF(NOT DOT_PATH) +- GET_FILENAME_COMPONENT(DOT_PATH ${DOT} PATH) +- ENDIF(NOT DOT_PATH) ++ if (NOT DOT_PATH) ++ get_filename_component(DOT_PATH ${DOT} PATH) ++ endif() + + +- IF (NOT USE_CGAL) +- SET(OpenMEEG_EXCLUDE_FROM_DOCUMENTATION ++ if (NOT USE_CGAL) ++ set(OpenMEEG_EXCLUDE_FROM_DOCUMENTATION + "${OpenMEEG_EXCLUDE_FROM_DOCUMENTATION} ${CMAKE_SOURCE_DIR}/tools/cgal_mesh_create.cpp ${CMAKE_SOURCE_DIR}/tools/cgal_mesh_include.h") +- ENDIF() +- CONFIGURE_FILE( ++ endif() ++ configure_file( + ${OpenMEEG_SOURCE_DIR}/documentation/reference/doxyfile.in + ${OpenMEEG_BINARY_DIR}/documentation/reference/doxyfile) + + # The ALL in the next directive is necessary to cope with a CMake bug !!! + # Otherwise the target is never activated. + +- ADD_CUSTOM_TARGET(OpenMEEG-documentation ALL) +- +- ADD_DEPENDENCIES(OpenMEEG-documentation OpenMEEG-doxygen_outputs) +- +- ADD_CUSTOM_TARGET(OpenMEEG-doxygen_outputs ++ add_custom_target(OpenMEEG-documentation ALL) ++ add_dependencies(OpenMEEG-documentation OpenMEEG-doxygen_outputs) ++ add_custom_target(OpenMEEG-doxygen_outputs + COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/doxyfile + DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/doxyfile) + +- INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html/ DESTINATION share/doc/OpenMEEG/reference) ++ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html/ DESTINATION share/doc/OpenMEEG/reference) + +-ENDIF (BUILD_DOCUMENTATION) ++endif() +diff --git a/wrapping/src/CMakeLists.txt b/wrapping/src/CMakeLists.txt +index 1be66348..47258644 100644 +--- a/wrapping/src/CMakeLists.txt ++++ b/wrapping/src/CMakeLists.txt +@@ -33,7 +33,6 @@ else() + include(${SWIG_USE_FILE}) + endif() + +- + if (BUILD_DOCUMENTATION) + # In order to generate python docstrings we use doxy2swig (which is bundled in our codebase) + # doxy2swig takes xml output from doxygen and generates a .i file that can be include in openmeeg.i +@@ -116,9 +115,9 @@ if (BUILD_TESTING) + endif() + endforeach() + +- if(BUILD_REFERENCE_DOC) ++ if (BUILD_REFERENCE_DOC) + execute_process(COMMAND ${CMAKE_COMMAND} -E copy ${OpenMEEG_SOURCE_DIR}/wrapping/src/test_doc.py ${OpenMEEG_BINARY_DIR}/wrapping/src/) + add_test(openmeeg_python_doc ${PYTHON_EXECUTABLE} ${OpenMEEG_BINARY_DIR}/wrapping/src/test_doc.py) +- endif(BUILD_REFERENCE_DOC) ++ endif() + + endif() + +From 985d515e7adbc60e3f4bf86c6e1e868940a54a8d Mon Sep 17 00:00:00 2001 +From: Theodore Papadopoulo +Date: Fri, 11 Oct 2019 10:29:07 +0200 +Subject: [PATCH 2/4] Include docstrings.i when available. + +--- + wrapping/src/openmeeg.i | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/wrapping/src/openmeeg.i b/wrapping/src/openmeeg.i +index 9a91cb4f..fc1ee595 100644 +--- a/wrapping/src/openmeeg.i ++++ b/wrapping/src/openmeeg.i +@@ -13,6 +13,9 @@ + %include + #endif + ++#ifdef DOCSTRINGS ++%include ++#endif + + %include + %include + +From 6bb5238112b67c2ce31d5d1cc4cbc1c38bedf75e Mon Sep 17 00:00:00 2001 +From: Joan Massich +Date: Fri, 11 Oct 2019 13:12:50 +0200 +Subject: [PATCH 3/4] add doc to travis + +--- + .travis.yml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/.travis.yml b/.travis.yml +index a7954142..0b7ac71b 100644 +--- a/.travis.yml ++++ b/.travis.yml +@@ -28,7 +28,7 @@ matrix: + - ENABLE_PYTHON=ON + - ANALYSE=ON + - ENABLE_COVERAGE=ON +- - BUILD_DOCUMENTATION=OFF ++ - BUILD_DOCUMENTATION=ON + - MATRIX_EVAL="CC=gcc-7 && CXX=g++-7" + addons: + apt: + +From 1ada3bcd567b8173214a1590b0106b07de8bcddf Mon Sep 17 00:00:00 2001 +From: Theodore Papadopoulo +Date: Fri, 11 Oct 2019 14:16:25 +0200 +Subject: [PATCH 4/4] Add a dependency of docstring.i when necessary. + +--- + wrapping/src/CMakeLists.txt | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/wrapping/src/CMakeLists.txt b/wrapping/src/CMakeLists.txt +index 47258644..d97f5208 100644 +--- a/wrapping/src/CMakeLists.txt ++++ b/wrapping/src/CMakeLists.txt +@@ -50,10 +50,11 @@ if (BUILD_DOCUMENTATION) + list(APPEND CMAKE_SWIG_FLAGS "-DDOCSTRINGS") + add_custom_target(docstrings DEPENDS docstrings.i) + add_dependencies(OpenMEEG-documentation docstrings) ++ set(DOCSTRING_DEPS DEPENDS docstrings) + endif() + + list(APPEND CMAKE_SWIG_FLAGS -v -O) +-set_source_files_properties(openmeeg.i PROPERTIES CPLUSPLUS ON) ++set_source_files_properties(openmeeg.i PROPERTIES CPLUSPLUS ON ${DOCSTRING_DEPS}) + swig_add_library(openmeeg LANGUAGE python SOURCES openmeeg.i) + swig_link_libraries(openmeeg ${PYTHON_LIBRARIES} OpenMEEG::OpenMEEG) + diff --git a/openmeeg-python_install_destination.patch b/openmeeg-python_install_destination.patch index f876b31..b7aa860 100644 --- a/openmeeg-python_install_destination.patch +++ b/openmeeg-python_install_destination.patch @@ -1,6 +1,6 @@ --- a/wrapping/src/CMakeLists.orig.txt 2018-03-23 11:05:27.000000000 +0100 +++ b/wrapping/src/CMakeLists.txt 2018-03-24 11:07:54.578700304 +0100 -@@ -46,12 +46,12 @@ +@@ -65,12 +65,12 @@ string(REGEX MATCH "[Ll]ib.*packages" PYTHON_REL_SITE_ARCH ${PYTHON_SITE_ARCH}) install(TARGETS "_openmeeg" @@ -15,4 +15,4 @@ + DESTINATION ${PYTHON_REL_SITE_ARCH}/openmeeg PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ) - # Test Python wrapping + set(PYTHON_TEST_FILES diff --git a/openmeeg.spec b/openmeeg.spec index 8532e92..0b7c2ca 100644 --- a/openmeeg.spec +++ b/openmeeg.spec @@ -14,18 +14,20 @@ ExcludeArch: s390x #%%global relsuf rc4 Name: openmeeg -Version: 2.4.1 -Release: 7%{?dist} +Version: 2.4.2 +Release: 0.1%{?dist} Summary: Low-frequency bio-electromagnetism solving forward problems in the field of EEG and MEG License: CeCILL-B URL: http://openmeeg.github.io/ -Source0: https://github.com/openmeeg/openmeeg/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz +Source0: https://github.com/%{name}/%{name}/archive/%{version}/%{name}-%{version}.tar.gz # Do not require lapacke library -Patch0: openmeeg-openblas_libraries.patch +Patch0: %{name}-openblas_libraries.patch # Set private directory for Python files -Patch1: openmeeg-python_install_destination.patch +Patch1: %{name}-python_install_destination.patch + +Patch2: %{name}-bug385.patch BuildRequires: cmake3 BuildRequires: gcc-c++, git, chrpath @@ -204,6 +206,9 @@ ctest3 --force-new-ctest-process --parallel %{?_smp_mflags} %endif %changelog +* Thu Oct 17 2019 Antonio Trande - 2.4.2-0.1 +- Pre-release 2.4.2 + * Thu Oct 03 2019 Miro Hrončok - 2.4.1-7 - Rebuilt for Python 3.8.0rc1 (#1748018) diff --git a/sources b/sources index 02e4305..7acc9de 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (openmeeg-2.4.1.tar.gz) = 9d2e44ab745f432c716bbaa8d7615bfe544041c67ebe4039652dfce75a92039bd40f57feb5f94d54ca266b8349b7ee701d2584451a2e768d5c2e441aa23df793 +SHA512 (openmeeg-2.4.2.tar.gz) = 24ce0e9ea0557a5dc66937870ec0a887b810a849a8ac75badb61aeef2f79425ebe8d4141e8042900b767342d2f5fdf9618c12c32fd88bb3e5fc8b55dff17d329