merge revisions 5766:5781 from trunk

[[Imported from SVN: r5782]]

Makefile.am

@@ -9,8 +9,6 @@ AUTOMAKE_OPTIONS = foreign 1.5
 
 SUBDIRS = dune lib doc bin m4 am
 
-sourcescheck_NOSOURCES=aclocal.m4  dependencies.m4
-
 # use configured compiler for "make distcheck"
 DISTCHECK_CONFIGURE_FLAGS = CXX="$(CXX)" CC="$(CC)" --enable-parallel=@ENABLE_PARALLEL@ MPICC="$(MPICC)"
 

am/checklog

 # -*- Makefile -*-
 # $Id$
 
+#
+# check-log
+#
+# This file implements the build-rules needed by the automated tests.
+# "make check-log" will build the whole package and run all tests. For
+# each test a log file under $(topsrc_dir)/check-log is created which
+# contains the name of the test and what kind of test it was (build,
+# lib, run, ...). If a test fails this is logged, but all otehr tests
+# are still run.
+#
+# make OPTIONS:
+# LOG_TIMING - specific command to measure the time needed for each test
+#              example: "make LOG_TIMING='time -p' check-log"
+#
+# IMPLEMENTATION: check-log depends on different targets for different
+# kinds of tests. These can run idividually by calling check-log-XXX.
+# Possible variants are (in order of dependence)
+#   - libs    (build all libraries)
+#   - build   (build all applications and tests)
+#   - test    (run each test from $(TESTS))
+#   - sources (run sourcescheck in each directory)
+#   - headers (run headercheck for each header)
+#   - dir     (create dir entries for database, no actual tests are run)
+#
+
 LOG_FILE = $(top_srcdir)/check-log.log
 LOG_DIR = $(top_srcdir)/check-log
 LOG_STORE = $(SHELL) $(DUNE_COMMON_ROOT)/bin/check-log-store $(LOG_FILE) $(LOG_DIR)

am/doxygen

@@ -98,6 +98,8 @@ $(srcdir)/Doxyfile.in: FORCE
 	  cd $(top_srcdir) && $(DUNEDOXYNIZE); \
 	fi
 
+include $(top_srcdir)/am/webstuff
+
 if WML
 # how to install the doxygen documentation
 web-install-doxygen:
@@ -119,5 +121,3 @@ clean-doxygen:
 
 # nice trick from the GNU make infopage to force a rule to run
 FORCE:
-
-include $(top_srcdir)/am/webstuff

bin/dunecontrol

@@ -642,26 +642,12 @@ m4_define([DUNE_AC_INIT],[
   AC_SUBST([DUNE_MOD_NAME], [$name])
   AC_SUBST([DUNE_MAINTAINER_NAME], [$maintainer])
   DUNE_PARSE_MODULE_VERSION([$name], [$version])
-  # don't build shared libs per default, this is way better for debugging...
-  m4_ifdef([LT_INIT],
-    [LT_INIT([disable-shared])],
-    [AC_DEFUN([LT_OUTPUT])])
-  AC_DISABLE_SHARED
-#  LT_INIT([disable-shared])
-
   REQUIRES="$requires"
   AC_SUBST(REQUIRES, [$REQUIRES])
+  AC_CONFIG_MACRO_DIR([m4])
 ])
 
 AC_DEFUN([DUNE_CHECK_MOD_DEPENDENCIES], [
-  AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-  AC_REQUIRE([AC_PROG_CC])
-  AC_REQUIRE([AC_PROG_CPP])
-  AC_REQUIRE([AC_PROG_CXX])
-#  AC_REQUIRE([AC_PROG_CXXCPP])
-  AC_REQUIRE([AC_PROG_LIBTOOL])
-#  AC_REQUIRE([AC_LIBTOOL_LANG_CXX_CONFIG])
-#  m4_ifdef([],[AC_LIBTOOL_LANG_CXX_CONFIG])
 EOF
       ### initialize AM_CONDITIONAL for suggestions that were not found
       for name in $(eval echo \$SUGS_$mainmod); do

bin/duneproject

@@ -629,7 +629,7 @@ CLEANFILES = \$(PAGES)
 if ! BUILD_DOCS
 # add tag to notify that dist has been build without documentation
 dist-hook:
-        echo "# No documentation included in distribution! " > \$(distdir)/\$(DOCUMENTATION_TAG_FILE)
+	echo "# No documentation included in distribution! " > \$(distdir)/\$(DOCUMENTATION_TAG_FILE)
 endif
 
 include \$(top_srcdir)/am/global-rules

doc/doxygen/Makefile.am

@@ -3,11 +3,11 @@
 # setting like in dune-web
 BASEDIR=../..
 CURDIR=doc/doxygen
-WHAT=
+WHAT =
 
 if BUILD_DOCS
 if WML
-  WHAT = bestpractice.html
+  WHAT += bestpractice.html
 endif
 endif
 

dune/common/enumset.hh

@@ -73,15 +73,15 @@ namespace Dune
   /**
    * @brief A set representing a range including the borders.
    */
-  template<typename T,int from, int end>
+  template<typename TA,int from, int end>
   class EnumRange //: public PODSet<EnumRange<T,from,end>,T>
   {
   public:
     /**
      * @brief The type the set holds.
      */
-    typedef T Type;
-    static bool contains(const T& item);
+    typedef TA Type;
+    static bool contains(const TA& item);
   };
 
   /**

dune/common/helpertemplates.hh

@@ -5,8 +5,12 @@
 #ifndef DUNE_COMMON_HELPERTEMPLATES
 #define DUNE_COMMON_HELPERTEMPLATES
 
+// deprecated in dune 2.0
+#warning Header file dune/common/helpertemplates.hh is deprecated
+
 /** \file
     \brief Compile-time constraint checks from the Stroustrup FAQ
+    \deprecated
  */
 
 namespace Dune {

dune/common/poolallocator.hh

@@ -308,7 +308,7 @@ namespace Dune
      * @param hint Ignored hint.
      * @return A pointer tp the allocated elements.
      */
-    inline pointer allocate(size_t n, const_pointer hint=0);
+    inline pointer allocate(std::size_t n, const_pointer hint=0);
 
     /**
      * @brief Free objects.
@@ -555,7 +555,8 @@ namespace Dune
   { }
 
   template<class T, std::size_t s>
-  inline T* PoolAllocator<T,s>::allocate(std::size_t n, const T* hint)
+  inline typename PoolAllocator<T,s>::pointer
+  PoolAllocator<T,s>::allocate(std::size_t n, const_pointer hint)
   {
     if(n==1)
       return static_cast<T*>(memoryPool_.allocate());
@@ -571,7 +572,7 @@ namespace Dune
   }
 
   template<class T, std::size_t s>
-  inline void PoolAllocator<T,s>::construct(T* p, const T& value)
+  inline void PoolAllocator<T,s>::construct(pointer p, const_reference value)
   {
     ::new (static_cast<void*>(p))T(value);
   }

dune/common/test/.gitignore

+Makefile
+Makefile.in
+.deps
+.libs
+semantic.cache
+fvectortest
+mpicollcomm
+lrutest
+parsetest
+test-stack
+arraylisttest
+shared_ptrtest
+float_cmp
+bitsetvectortest
+iteratorfacadetest
+sllisttest
+tuplestest
+settest
+fmatrixtest
+poolallocatortest
+*.gcda
+*.gcno
+gmon.out
+gcdlcmtest
+streamtest
+exprtmpl
+timing_xpr
+timing_old
+timing_flt
+bigunsignedinttest
+mpihelpertest
+singletontest
+utilitytest
+testfassign_fail1
+testfassign_fail2
+testfassign_fail3
+testfassign_fail4
+testfassign_fail5
+testfassign_fail6
+testfassign1
+testfassign2
+testfassign3
+testfassign4
+smallobject
+conversiontest
+nullptr-test
+blockbitfieldtest
+deprtuplestest
+fassigntest
+iteratorfacadetest2
+static_assert_test

lib/.gitignore

+libdunecommon.la
+
+Makefile.in
+Makefile
+
+.deps
+.libs

lib/Makefile.am

@@ -5,6 +5,9 @@ lib_LTLIBRARIES = libdunecommon.la
 
 # this is just a renaming of libcommon to prevent name clashes
 libdunecommon_la_SOURCES =
+# This forces automake to use the C++ linker
+# (see the automake manual, section "Libtool Convenience Libraries")
+nodist_EXTRA_libdunecommon_la_SOURCES = dummy.cc
 libdunecommon_la_LIBADD = ../dune/common/libcommon.la
 
 include $(top_srcdir)/am/global-rules

m4/dune_all.m4

@@ -19,6 +19,20 @@ AC_DEFUN([DUNE_CHECK_ALL],[
   AS_IF([test "x$enabledist" = "xyes"],[
     AM_CONDITIONAL(DUNEWEB, false)])
 
+  # check the compilers (before using libtool !!!)
+  AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+  AC_REQUIRE([AC_PROG_CC])
+  AC_REQUIRE([AC_PROG_CPP])
+  AC_REQUIRE([AC_PROG_CXX])
+  AC_REQUIRE([AC_PROG_CXXCPP])
+  AC_REQUIRE([AC_PROG_F77])
+  # don't build shared libs per default, this is way better for debugging...
+  AC_REQUIRE([AC_DISABLE_SHARED])
+  # we need libtool
+dnl do not use LT_INIT since we want to be compatible with libtool 1.5
+  AC_REQUIRE([AC_PROG_LIBTOOL])
+  AC_REQUIRE([LT_COMPAT])
+
   dnl check dependencies of this module
   dnl this test is autogenerated for each module
   AC_REQUIRE([DUNE_CHECK_MOD_DEPENDENCIES])

m4/libtoolcompat.m4

+dnl Compatibility m4 to make dune work with
+dnl libtool 1.5 and libtool 2.x
+
+AC_DEFUN([LT_COMPAT],[
+  # LT_COMPAT
+  m4_ifdef([LT_OUTPUT],[],[AC_DEFUN([LT_OUTPUT])])
+])