[dune-grid] 01/03: Switch to CMake.
Ansgar Burchardt
ansgar at moszumanska.debian.org
Thu Nov 24 18:04:18 UTC 2016
This is an automated email from the git hooks/post-receive script.
ansgar pushed a commit to branch master
in repository dune-grid.
commit 55d0a032b46506728010697757d812acfb77cf59
Author: Ansgar Burchardt <Ansgar.Burchardt at tu-dresden.de>
Date: Thu Nov 24 12:59:59 2016 +0100
Switch to CMake.
---
debian/control | 4 +-
debian/libdune-grid-dev.install | 6 +--
debian/patches/disable-alberta3d-test.patch | 54 ++++++++++++--------
.../patches/do-not-install-amiramesh-grids.patch | 22 ++++----
debian/patches/series | 1 -
debian/patches/soname.patch | 58 ----------------------
debian/rules | 14 +-----
7 files changed, 46 insertions(+), 113 deletions(-)
diff --git a/debian/control b/debian/control
index f48b421..757f5eb 100644
--- a/debian/control
+++ b/debian/control
@@ -8,14 +8,14 @@ Vcs-Browser: https://anonscm.debian.org/cgit/debian-science/packages/dune-grid.g
Vcs-Git: https://anonscm.debian.org/git/debian-science/packages/dune-grid.git
Homepage: http://www.dune-project.org/
Build-Depends: debhelper (>= 9),
- automake, autoconf, gfortran, libtool, mpi-default-bin, mpi-default-dev, pkg-config,
+ cmake, gfortran, mpi-default-bin, mpi-default-dev, pkg-config, python3,
chrpath,
libdune-common-dev (>= 2.4.1),
libdune-geometry-dev (>= 2.4.1),
libalberta-dev (>= 2.0.1-5),
libgmp-dev,
libug-dev (>= 3.12.1)
-Build-Depends-Indep: doxygen, ghostscript, graphviz, texlive-latex-recommended, pgf
+Build-Depends-Indep: doxygen, ghostscript, graphviz, imagemagick, texlive-latex-recommended, pgf
Package: libdune-grid-dev
Section: libdevel
diff --git a/debian/libdune-grid-dev.install b/debian/libdune-grid-dev.install
index 52606e6..42fdbf0 100644
--- a/debian/libdune-grid-dev.install
+++ b/debian/libdune-grid-dev.install
@@ -1,8 +1,4 @@
usr/include
-usr/lib/*/cmake
-usr/lib/*/dunecontrol usr/lib
-usr/lib/*/libdune*.a
-usr/lib/*/libdune*.so
-usr/lib/*/pkgconfig
+usr/lib
usr/share/dune
usr/share/dune-grid
diff --git a/debian/patches/disable-alberta3d-test.patch b/debian/patches/disable-alberta3d-test.patch
index 8fcdd8e..f4c26b4 100644
--- a/debian/patches/disable-alberta3d-test.patch
+++ b/debian/patches/disable-alberta3d-test.patch
@@ -5,25 +5,37 @@ Forwarded: not-needed
Origin: vendor
Some tests need >8 GB RAM and thus should be disabled for the Debian packages.
---- a/dune/grid/albertagrid/test/Makefile.am
-+++ b/dune/grid/albertagrid/test/Makefile.am
-@@ -8,7 +8,7 @@
- if ALBERTA
- # test program will return the special exit code 77 ("skipped") if alberta is
- # not available
--TESTS += test-alberta3d-refine
-+#TESTS += test-alberta3d-refine
- check_PROGRAMS += test-alberta3d-refine
- test_alberta3d_refine_SOURCES = test-alberta3d-refine.cc
- test_alberta3d_refine_CPPFLAGS = $(AM_CPPFLAGS) \
---- a/dune/grid/test/Makefile.am
-+++ b/dune/grid/test/Makefile.am
-@@ -4,7 +4,7 @@
+--- a/dune/grid/albertagrid/test/CMakeLists.txt
++++ b/dune/grid/albertagrid/test/CMakeLists.txt
+@@ -1,5 +1,5 @@
+ if(ALBERTA_FOUND)
+- add_executable(test-alberta3d-refine test-alberta3d-refine.cc)
+- add_dune_alberta_flags(test-alberta3d-refine GRIDDIM 3)
+- dune_add_test(TARGET test-alberta3d-refine)
++ #add_executable(test-alberta3d-refine test-alberta3d-refine.cc)
++ #add_dune_alberta_flags(test-alberta3d-refine GRIDDIM 3)
++ #dune_add_test(TARGET test-alberta3d-refine)
+ endif(ALBERTA_FOUND)
+--- a/dune/grid/test/CMakeLists.txt
++++ b/dune/grid/test/CMakeLists.txt
+@@ -75,17 +75,17 @@
+ add_executable(test-alberta-1-3 EXCLUDE_FROM_ALL test-alberta.cc)
+ add_dune_alberta_flags(test-alberta-1-3 WORLDDIM 3)
+ target_compile_definitions(test-alberta-1-3 PUBLIC DUNE_GRID_EXAMPLE_GRIDS_PATH=\"${PROJECT_SOURCE_DIR}/doc/grids/\")
+- dune_add_test(TARGET test-alberta-1-3)
++# dune_add_test(TARGET test-alberta-1-3)
- if ALBERTA
- APROG = test-alberta-1-1 test-alberta-1-2 test-alberta-2-2 \
-- test-alberta-1-3 test-alberta-2-3 test-alberta-3-3 \
-+ test-alberta-1-3 test-alberta-2-3 \
- test-alberta-generic
- ALBERTA_EXTRA_PROGS = test-alberta
- endif
+ add_executable(test-alberta-2-3 EXCLUDE_FROM_ALL test-alberta.cc)
+ add_dune_alberta_flags(test-alberta-2-3 WORLDDIM 3)
+ target_compile_definitions(test-alberta-2-3 PUBLIC DUNE_GRID_EXAMPLE_GRIDS_PATH=\"${PROJECT_SOURCE_DIR}/doc/grids/\")
+- dune_add_test(TARGET test-alberta-2-3)
++# dune_add_test(TARGET test-alberta-2-3)
+
+ add_executable(test-alberta-3-3 EXCLUDE_FROM_ALL test-alberta.cc)
+ add_dune_alberta_flags(test-alberta-3-3 WORLDDIM 3)
+ target_compile_definitions(test-alberta-3-3 PUBLIC DUNE_GRID_EXAMPLE_GRIDS_PATH=\"${PROJECT_SOURCE_DIR}/doc/grids/\")
+- dune_add_test(TARGET test-alberta-3-3)
++# dune_add_test(TARGET test-alberta-3-3)
+
+ add_executable(test-alberta-generic EXCLUDE_FROM_ALL test-alberta.cc)
+ add_dune_alberta_flags(test-alberta-generic USE_GENERIC WORLDDIM 2)
diff --git a/debian/patches/do-not-install-amiramesh-grids.patch b/debian/patches/do-not-install-amiramesh-grids.patch
index b835a31..86a4dae 100644
--- a/debian/patches/do-not-install-amiramesh-grids.patch
+++ b/debian/patches/do-not-install-amiramesh-grids.patch
@@ -6,16 +6,12 @@ Forwarded: not-needed
The amiramesh example grids have been removed from the Debian source as they
are not usable without a non-free library.
---- a/doc/grids/amiramesh/Makefile.am
-+++ b/doc/grids/amiramesh/Makefile.am
-@@ -2,8 +2,8 @@
- simplex-testgrid-2d.am hybrid-testgrid-2d.am simplex-testgrid-3d.am
-
- amiragridsdir=$(docdir)/grids/amiramesh
--amiragrids_DATA = $(GRIDS)
--EXTRA_DIST = CMakeLists.txt $(GRIDS)
-+#amiragrids_DATA = $(GRIDS)
-+#EXTRA_DIST = CMakeLists.txt $(GRIDS)
-
- include $(top_srcdir)/am/webstuff
- include $(top_srcdir)/am/global-rules
+--- a/doc/grids/CMakeLists.txt
++++ b/doc/grids/CMakeLists.txt
+@@ -1,5 +1,5 @@
+ add_subdirectory(amc)
+-add_subdirectory(amiramesh)
++#add_subdirectory(amiramesh)
+ add_subdirectory(gridfactory)
+ add_subdirectory(gmsh)
+ add_subdirectory(starcd)
diff --git a/debian/patches/series b/debian/patches/series
index f44d6e4..cae31b7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-soname.patch
disable-alberta3d-test.patch
do-not-install-amiramesh-grids.patch
diff --git a/debian/patches/soname.patch b/debian/patches/soname.patch
deleted file mode 100644
index 54d6258..0000000
--- a/debian/patches/soname.patch
+++ /dev/null
@@ -1,58 +0,0 @@
---- a/lib/Makefile.am
-+++ b/lib/Makefile.am
-@@ -39,6 +39,7 @@
- nodist_EXTRA_libdunegrid_la_SOURCES = dummy.cc
- sourcescheck_DUMMY = dummy.cc
- libdunegrid_la_LIBADD = ../dune/grid/libgrid.la
-+libdunegrid_la_LDFLAGS = -release $(subst -,,$(PACKAGE_VERSION))
-
- # ../dune/grid/albertagrid/libalbertagrid_?d.la is a convenience library, so
- # its complete contents will be copied into libdunealbertagrid_?d.la.
-@@ -48,38 +49,47 @@
- libdunealbertagrid_1d_la_SOURCES =
- nodist_EXTRA_libdunealbertagrid_1d_la_SOURCES = dummy.cc
- libdunealbertagrid_1d_la_LIBADD = ../dune/grid/albertagrid/libalbertagrid_1d.la libdunegrid.la
-+libdunealbertagrid_1d_la_LDFLAGS = -release $(subst -,,$(PACKAGE_VERSION))
-
- libdunealbertagrid_2d_la_SOURCES =
- nodist_EXTRA_libdunealbertagrid_2d_la_SOURCES = dummy.cc
- libdunealbertagrid_2d_la_LIBADD = ../dune/grid/albertagrid/libalbertagrid_2d.la libdunegrid.la
-+libdunealbertagrid_2d_la_LDFLAGS = -release $(subst -,,$(PACKAGE_VERSION))
-
- libdunealbertagrid_3d_la_SOURCES =
- nodist_EXTRA_libdunealbertagrid_3d_la_SOURCES = dummy.cc
- libdunealbertagrid_3d_la_LIBADD = ../dune/grid/albertagrid/libalbertagrid_3d.la libdunegrid.la
-+libdunealbertagrid_3d_la_LDFLAGS = -release $(subst -,,$(PACKAGE_VERSION))
-
- libdunealbertagrid_4d_la_SOURCES =
- nodist_EXTRA_libdunealbertagrid_4d_la_SOURCES = dummy.cc
- libdunealbertagrid_4d_la_LIBADD = ../dune/grid/albertagrid/libalbertagrid_4d.la libdunegrid.la
-+libdunealbertagrid_4d_la_LDFLAGS = -release $(subst -,,$(PACKAGE_VERSION))
-
- libdunealbertagrid_5d_la_SOURCES =
- nodist_EXTRA_libdunealbertagrid_5d_la_SOURCES = dummy.cc
- libdunealbertagrid_5d_la_LIBADD = ../dune/grid/albertagrid/libalbertagrid_5d.la libdunegrid.la
-+libdunealtertagrid_5d_la_LDFLAGS = -release $(subst -,,$(PACKAGE_VERSION))
-
- libdunealbertagrid_6d_la_SOURCES =
- nodist_EXTRA_libdunealbertagrid_6d_la_SOURCES = dummy.cc
- libdunealbertagrid_6d_la_LIBADD = ../dune/grid/albertagrid/libalbertagrid_6d.la libdunegrid.la
-+libdunealbertagrid_6d_la_LDFLAGS = -release $(subst -,,$(PACKAGE_VERSION))
-
- libdunealbertagrid_7d_la_SOURCES =
- nodist_EXTRA_libdunealbertagrid_7d_la_SOURCES = dummy.cc
- libdunealbertagrid_7d_la_LIBADD = ../dune/grid/albertagrid/libalbertagrid_7d.la libdunegrid.la
-+libdunealbertagrid_7d_la_LDFLAGS = -release $(subst -,,$(PACKAGE_VERSION))
-
- libdunealbertagrid_8d_la_SOURCES =
- nodist_EXTRA_libdunealbertagrid_8d_la_SOURCES = dummy.cc
- libdunealbertagrid_8d_la_LIBADD = ../dune/grid/albertagrid/libalbertagrid_8d.la libdunegrid.la
-+libdunealbertagrid_8d_la_LDFLAGS = -release $(subst -,,$(PACKAGE_VERSION))
-
- libdunealbertagrid_9d_la_SOURCES =
- nodist_EXTRA_libdunealbertagrid_9d_la_SOURCES = dummy.cc
- libdunealbertagrid_9d_la_LIBADD = ../dune/grid/albertagrid/libalbertagrid_9d.la libdunegrid.la
-+libdunealbertagrid_9d_la_LDFLAGS = -release $(subst -,,$(PACKAGE_VERSION))
-
- dunemodulelibdir=$(libdir)
- dunemodulelib_DATA = dunegridam2cmake.lib
diff --git a/debian/rules b/debian/rules
index e2311f5..472e1f1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,19 +3,7 @@
include /usr/share/dune/dune-debian.mk
%:
- dh $@ --parallel
-
-override_dh_auto_install-arch:
- set -e; for d in cmake dune lib m4 src; do \
- $(MAKE) -C $$d install DESTDIR="$(CURDIR)/debian/tmp"; \
- done
- $(MAKE) install-data-am install-exec-am DESTDIR="$(CURDIR)/debian/tmp"
- mkdir doc/doxygen/html
- $(MAKE) -C doc/doxygen install-data-am DESTDIR="$(CURDIR)/debian/tmp"
- find debian/tmp -name "*.so" -exec chrpath --delete "{}" \;
-
-override_dh_auto_install-indep:
- $(MAKE) -C doc install DESTDIR="$(CURDIR)/debian/tmp"
+ dh $@ --parallel --builddirectory=build
override_dh_strip:
dh_strip --dbg-package=libdune-grid-dbg
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/dune-grid.git
More information about the debian-science-commits
mailing list