]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Figure out a bit more information and output it as a summary for build tests.
authorWolfgang Bangerth <bangerth@math.tamu.edu>
Mon, 28 Jun 2010 19:48:03 +0000 (19:48 +0000)
committerWolfgang Bangerth <bangerth@math.tamu.edu>
Mon, 28 Jun 2010 19:48:03 +0000 (19:48 +0000)
git-svn-id: https://svn.dealii.org/trunk@21395 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/Makefile
deal.II/aclocal.m4
deal.II/common/Make.global_options.in
deal.II/configure

index a0b7d1ae3dc8b0fbe37357d929f89463a04c5cd2..e5aa00129ef0e4ff565c80d8694531e0f9809463 100644 (file)
@@ -204,23 +204,11 @@ distclean: clean
 # whole thing over to the server
 build-test:
        echo AUTOMATED DEAL.II BUILD TEST          | tee    build-test-log
-       echo SUBVERSION INFO `svn info . | grep Revision` | tee -a build-test-log
-       echo BEGIN HEADER `date -u '+%Y-%m-%d %T'`        | tee -a build-test-log
-       echo USER=$(USER)                          | tee -a build-test-log
-       echo HOST=`hostname`                       | tee -a build-test-log
-       echo BUILDTESTFLAGS=$(BUILDTESTFLAGS)      | tee -a build-test-log
-       echo BUILDTESTNOTE=$(BUILDTESTNOTE)        | tee -a build-test-log
        -(./configure $(BUILDTESTFLAGS) 2>&1) > build-test-config
-       if test -f common/Make.global_options ; then \
-          grep '^enable-shared' common/Make.global_options | grep = ; \
-          grep enable-threads common/Make.global_options | grep = ; \
-          grep USE_CONTRIB_PETSC common/Make.global_options | grep = ; \
-          grep USE_CONTRIB_SLEPC common/Make.global_options | grep = ; \
-          grep USE_CONTRIB_METIS common/Make.global_options | grep = ; \
-          grep USE_CONTRIB_HSL common/Make.global_options | grep = ; \
-          grep USE_CONTRIB_UMFPACK common/Make.global_options | grep = ; \
-        fi    | tee -a build-test-log
+       echo BEGIN HEADER `date -u '+%Y-%m-%d %T'`        | tee -a build-test-log
+       @cd common ; make BUILDTEST=yes -f Make.global_options print-summary | tee -a build-test-log
        echo END HEADER `date -u '+%Y-%m-%d %T'`             | tee -a build-test-log
+       false
        echo                                  | tee -a build-test-log
        echo BEGIN CONFIGURE OUTPUT `date -u '+%Y-%m-%d %T'` | tee -a build-test-log
        cat build-test-config                 | tee -a build-test-log
@@ -236,15 +224,15 @@ build-test-do:
        @echo BEGIN MAKE LIB OUTPUT `date -u '+%Y-%m-%d %T'`
        $(MAKE) all
        @echo END MAKE LIB OUTPUT `date -u '+%Y-%m-%d %T'`
-       @echo 
+       @echo
        @echo BEGIN MAKE EXAMPLES OUTPUT `date -u '+%Y-%m-%d %T'`
        cd examples ; $(MAKE)
        @echo END MAKE EXAMPLES OUTPUT `date -u '+%Y-%m-%d %T'`
-       @echo 
+       @echo
        @echo BEGIN MAKE DOXYGENTUTORIALS OUTPUT `date -u '+%Y-%m-%d %T'`
        cd examples/doxygen ; $(MAKE)
        @echo END MAKE DOXYGENTUTORIALS OUTPUT `date -u '+%Y-%m-%d %T'`
-       @echo 
+       @echo
 #      if test -d tests ; then \
 #         @echo BEGIN MAKE TESTS OUTPUT `date -u '+%Y-%m-%d %T'` ; \
 #         cd tests ; $(MAKE) report+mail ; \
index 28c82c953e6bb7c44ab7c1057ba0e215f2051cd8..08c846779e8be9b57151d78d6de320531f43e9b0 100644 (file)
@@ -5951,6 +5951,7 @@ AC_DEFUN(DEAL_II_CONFIGURE_TRILINOS, dnl
     dnl we don't have no Trilinos, then it does not define this string.
     DEAL_II_DEFINE_DEAL_II_USE_TRILINOS=DEAL_II_USE_TRILINOS
 
+    DEAL_II_CONFIGURE_TRILINOS_VERSION
     DEAL_II_CHECK_TRILINOS_SHARED_STATIC
     DEAL_II_CHECK_TRILINOS_WARNINGS
     DEAL_II_CHECK_TRILINOS_HEADER_FILES
@@ -5980,6 +5981,34 @@ AC_DEFUN(DEAL_II_CONFIGURE_TRILINOS, dnl
 
 
 
+dnl ------------------------------------------------------------
+dnl Figure out the version numbers of Trilinos.
+dnl
+dnl Usage: DEAL_II_CONFIGURE_TRILINOS_VERSION
+dnl
+dnl ------------------------------------------------------------
+AC_DEFUN(DEAL_II_CONFIGURE_TRILINOS_VERSION, dnl
+[
+  AC_MSG_CHECKING([for Trilinos version])
+  DEAL_II_TRILINOS_VERSION_MAJOR=`cat $DEAL_II_TRILINOS_DIR/include/Trilinos_version.h \
+                               | grep "#define TRILINOS_MAJOR_VERSION" \
+                               | perl -pi -e 's/.*VERSION\s+//g;'`
+  DEAL_II_TRILINOS_VERSION_MINOR=`cat $DEAL_II_TRILINOS_DIR/include/Trilinos_version.h \
+                               | grep "#define TRILINOS_MAJOR_MINOR_VERSION" \
+                               | perl -pi -e 's/.*VERSION\s+\d?\d(\d\d)\d\d/\1/g;' \
+                              | perl -pi -e 's/0(\d)/\1/g;'`
+  DEAL_II_TRILINOS_VERSION_SUBMINOR=`cat $DEAL_II_TRILINOS_DIR/include/Trilinos_version.h \
+                               | grep "#define TRILINOS_MAJOR_MINOR_VERSION" \
+                               | perl -pi -e 's/.*VERSION\s+\d?\d\d\d(\d\d)/\1/g;' \
+                              | perl -pi -e 's/0(\d)/\1/g;'`
+  AC_MSG_RESULT([$DEAL_II_TRILINOS_VERSION_MAJOR.$DEAL_II_TRILINOS_VERSION_MINOR.$DEAL_II_TRILINOS_VERSION_SUBMINOR])
+  AC_SUBST(DEAL_II_TRILINOS_VERSION_MAJOR)
+  AC_SUBST(DEAL_II_TRILINOS_VERSION_MINOR)
+  AC_SUBST(DEAL_II_TRILINOS_VERSION_SUBMINOR)
+])
+
+
+
 dnl ------------------------------------------------------------
 dnl Check whether the installed version of Trilinos uses shared
 dnl or static libs, or both. Produce an error if this doesn't
@@ -6626,6 +6655,7 @@ AC_DEFUN(DEAL_II_WITH_LAPACK, dnl
       [ DEAL_II_ADD_EXTERNAL_LIBS_AT_FRONT(-l$lapack)
         AC_DEFINE([HAVE_LIBLAPACK], [1],
                   [Defined if deal.II was configured with LAPACK support])
+        AC_SUBST(DEAL_II_USE_LAPACK, "yes")
       ],
       [AC_MSG_ERROR([LAPACK library $lapack not found])]
     )
@@ -6730,6 +6760,7 @@ AC_DEFUN(DEAL_II_WITH_BLAS, dnl
                      AC_DEFINE([HAVE_LIBBLAS], [1],
                                [Defined if deal.II was configured with BLAS support])
                    ],,$F77LIBS)
+      AC_SUBST(DEAL_II_USE_BLAS, "yes")
       AC_SUBST(NEEDS_F77LIBS, "yes")
     else
       DEAL_II_CHECK_BLAS_FRAMEWORK
@@ -6742,6 +6773,7 @@ AC_DEFUN(DEAL_II_WITH_BLAS, dnl
                                  [Defined if deal.II was configured with BLAS support])
                      ],,$F77LIBS)
 
+        AC_SUBST(DEAL_II_USE_BLAS, "yes")
         AC_SUBST(NEEDS_F77LIBS, "yes")
       fi
     fi
index f8b43139ffc4a3efb8f956116a4c325e10d535a6..057b93406281a7a2c2def70f502fbe6e7183b7c9 100644 (file)
@@ -64,6 +64,9 @@ DEAL_II_TRILINOS_INCDIR = @DEAL_II_TRILINOS_INCDIR@
 DEAL_II_TRILINOS_LIBDIR = @DEAL_II_TRILINOS_LIBDIR@
 DEAL_II_TRILINOS_SHARED = @DEAL_II_TRILINOS_SHARED@
 DEAL_II_TRILINOS_STATIC = @DEAL_II_TRILINOS_STATIC@
+DEAL_II_TRILINOS_VERSION_MAJOR    = @DEAL_II_TRILINOS_VERSION_MAJOR@
+DEAL_II_TRILINOS_VERSION_MINOR    = @DEAL_II_TRILINOS_VERSION_MINOR@
+DEAL_II_TRILINOS_VERSION_SUBMINOR = @DEAL_II_TRILINOS_VERSION_SUBMINOR@
 
 USE_CONTRIB_MUMPS  = @USE_CONTRIB_MUMPS@
 DEAL_II_MUMPS_DIR  = @DEAL_II_MUMPS_DIR@
@@ -156,7 +159,7 @@ ifeq ($(USE_CONTRIB_PETSC),yes)
           lib-contrib-petsc.g = $(shell echo $(DEAL_II_PETSC_DIR)/$(DEAL_II_PETSC_ARCH)/lib/libpetsc$(lib-suffix))
           lib-contrib-petsc.o = $(shell echo $(DEAL_II_PETSC_DIR)/$(DEAL_II_PETSC_ARCH)/lib/libpetsc$(lib-suffix))
         endif
-      endif # if PETSC_VERSION 
+      endif # if PETSC_VERSION
     else
       # and finally this goes for static libraries
       lib-contrib-petsc.g = $(LIBDIR)/libpetscall.g$(lib-suffix)
@@ -217,7 +220,7 @@ endif
 ifeq ($(USE_CONTRIB_MUMPS),yes)
   lib-contrib-mumps  = $(DEAL_II_MUMPS_DIR)/lib/libdmumps.a \
                        $(DEAL_II_MUMPS_DIR)/lib/libmumps_common.a \
-                       $(DEAL_II_MUMPS_DIR)/lib/libpord.a 
+                       $(DEAL_II_MUMPS_DIR)/lib/libpord.a
   lib-contrib-mumps += $(DEAL_II_SCALAPACK_DIR)/libscalapack.a
   lib-contrib-mumps += $(DEAL_II_BLACS_DIR)/LIB/blacsCinit_$(DEAL_II_BLACS_ARCH).a \
                        $(DEAL_II_BLACS_DIR)/LIB/blacsF77init_$(DEAL_II_BLACS_ARCH).a \
@@ -359,3 +362,28 @@ ifneq ($(enable-threads),no)
 else
   MT = ==
 endif
+
+
+
+ifeq ($(BUILDTEST),yes)
+  print-summary:
+       @echo "dealii-feature: revision=`svn info .. | grep Revision | sed 's/Revision: //'`"
+       @echo "dealii-feature: user=$(USER)"
+       @echo "dealii-feature: host=`hostname`"
+       @echo "dealii-feature: target=$(TARGET)"
+       @echo "dealii-feature: compiler=$(GXX-VERSION-DETAILED)"
+       @echo "dealii-feature: BUILDTESTFLAGS=$(BUILDTESTFLAGS)"
+       @echo "dealii-feature: BUILDTESTNOTE=$(BUILDTESTNOTE)"
+       @echo "dealii-feature: multithreading=$(enable-threads)"
+       @echo "dealii-feature: shared_libs=$(enable-shared)"
+       @echo "dealii-feature: parser=$(subst no,,$(enable-parser))"
+       @echo "dealii-feature: PETSc=$(subst ..,,$(DEAL_II_PETSC_VERSION_MAJOR).$(DEAL_II_PETSC_VERSION_MINOR).$(DEAL_II_PETSC_VERSION_SUBMINOR))"
+       @echo "dealii-feature: SLEPc=$(subst no,,$(USE_CONTRIB_SLEPC))"
+       @echo "dealii-feature: Trilinos=$(subst ..,,$(DEAL_II_TRILINOS_VERSION_MAJOR).$(DEAL_II_TRILINOS_VERSION_MINOR).$(DEAL_II_TRILINOS_VERSION_SUBMINOR))"
+       @echo "dealii-feature: MUMPS=$(subst no,,$(USE_CONTRIB_MUMPS))"
+       @echo "dealii-feature: METIS=$(subst no,,$(USE_CONTRIB_METIS))"
+       @echo "dealii-feature: UMFPACK=$(USE_CONTRIB_UMFPACK)"
+       @echo "dealii-feature: HSL=$(subst no,,$(USE_CONTRIB_METIS))"
+       @echo "dealii-feature: BLAS=@DEAL_II_USE_BLAS@"
+       @echo "dealii-feature: LAPACK=@DEAL_II_USE_BLAS@"
+endif
index ca2fb0673c6ef6adf697ebf995434bd26785f567..e49394aaa3529e7b24b28522c0bae01256d6e230 100755 (executable)
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 21337 .
+# From configure.in Revision: 21360 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.63 for deal.II 6.4.pre.
 #
@@ -650,6 +650,7 @@ DEAL_II_HAVE_DOT
 DOXYGEN_OPTIONS
 DOT
 DOXYGEN
+DEAL_II_USE_LAPACK
 USE_CONTRIB_UMFPACK
 UMFPACK_INCLUDE_DIR
 UMFPACK_LIB
@@ -659,6 +660,7 @@ TECPLOT_INCLUDE_DIR
 USE_CONTRIB_HSL
 HSL_INCLUDE_DIR
 NEEDS_F77LIBS
+DEAL_II_USE_BLAS
 DEAL_II_DEFINE_DEAL_II_USE_MUMPS
 DEAL_II_BLACS_ARCH
 DEAL_II_BLACS_DIR
@@ -676,6 +678,9 @@ DEAL_II_EXPAND_TRILINOS_MPI_BLOCKVECTOR
 DEAL_II_EXPAND_TRILINOS_BLOCKVECTOR
 DEAL_II_EXPAND_TRILINOS_MPI_VECTOR
 DEAL_II_EXPAND_TRILINOS_VECTOR
+DEAL_II_TRILINOS_VERSION_SUBMINOR
+DEAL_II_TRILINOS_VERSION_MINOR
+DEAL_II_TRILINOS_VERSION_MAJOR
 DEAL_II_DEFINE_DEAL_II_USE_SLEPC
 DEAL_II_SLEPC_VERSION_SUBMINOR
 DEAL_II_SLEPC_VERSION_MINOR
@@ -13551,6 +13556,26 @@ _ACEOF
                         DEAL_II_DEFINE_DEAL_II_USE_TRILINOS=DEAL_II_USE_TRILINOS
 
 
+  { $as_echo "$as_me:$LINENO: checking for Trilinos version" >&5
+$as_echo_n "checking for Trilinos version... " >&6; }
+  DEAL_II_TRILINOS_VERSION_MAJOR=`cat $DEAL_II_TRILINOS_DIR/include/Trilinos_version.h \
+                               | grep "#define TRILINOS_MAJOR_VERSION" \
+                               | perl -pi -e 's/.*VERSION\s+//g;'`
+  DEAL_II_TRILINOS_VERSION_MINOR=`cat $DEAL_II_TRILINOS_DIR/include/Trilinos_version.h \
+                               | grep "#define TRILINOS_MAJOR_MINOR_VERSION" \
+                               | perl -pi -e 's/.*VERSION\s+\d?\d(\d\d)\d\d/\1/g;' \
+                              | perl -pi -e 's/0(\d)/\1/g;'`
+  DEAL_II_TRILINOS_VERSION_SUBMINOR=`cat $DEAL_II_TRILINOS_DIR/include/Trilinos_version.h \
+                               | grep "#define TRILINOS_MAJOR_MINOR_VERSION" \
+                               | perl -pi -e 's/.*VERSION\s+\d?\d\d\d(\d\d)/\1/g;' \
+                              | perl -pi -e 's/0(\d)/\1/g;'`
+  { $as_echo "$as_me:$LINENO: result: $DEAL_II_TRILINOS_VERSION_MAJOR.$DEAL_II_TRILINOS_VERSION_MINOR.$DEAL_II_TRILINOS_VERSION_SUBMINOR" >&5
+$as_echo "$DEAL_II_TRILINOS_VERSION_MAJOR.$DEAL_II_TRILINOS_VERSION_MINOR.$DEAL_II_TRILINOS_VERSION_SUBMINOR" >&6; }
+
+
+
+
+
 
   { $as_echo "$as_me:$LINENO: checking whether Trilinos uses shared libraries" >&5
 $as_echo_n "checking whether Trilinos uses shared libraries... " >&6; }
@@ -14264,6 +14289,8 @@ _ACEOF
 
 fi
 
+      DEAL_II_USE_BLAS="yes"
+
       NEEDS_F77LIBS="yes"
 
     else
@@ -14482,6 +14509,8 @@ _ACEOF
 fi
 
 
+        DEAL_II_USE_BLAS="yes"
+
         NEEDS_F77LIBS="yes"
 
       fi
@@ -16657,6 +16686,8 @@ cat >>confdefs.h <<\_ACEOF
 #define HAVE_LIBLAPACK 1
 _ACEOF
 
+        DEAL_II_USE_LAPACK="yes"
+
 
 else
   { { $as_echo "$as_me:$LINENO: error: LAPACK library $lapack not found" >&5

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.