From 932fb2d2d7a9ae90ab00b3c73ae7f6852dd118cb Mon Sep 17 00:00:00 2001 From: maier Date: Tue, 3 Dec 2013 15:49:34 +0000 Subject: [PATCH] Cleanup: Remove report_features and the old build test facility git-svn-id: https://svn.dealii.org/trunk@31856 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/cmake/scripts/CMakeLists.txt | 51 +----- deal.II/cmake/scripts/report_features.cc.in | 175 -------------------- deal.II/contrib/utilities/build_test | 128 -------------- deal.II/doc/users/cmakelists.html | 1 - 4 files changed, 3 insertions(+), 352 deletions(-) delete mode 100644 deal.II/cmake/scripts/report_features.cc.in delete mode 100755 deal.II/contrib/utilities/build_test diff --git a/deal.II/cmake/scripts/CMakeLists.txt b/deal.II/cmake/scripts/CMakeLists.txt index 82e0bb4eff..55aae26c1a 100644 --- a/deal.II/cmake/scripts/CMakeLists.txt +++ b/deal.II/cmake/scripts/CMakeLists.txt @@ -20,66 +20,21 @@ SET_TARGET_PROPERTIES(expand_instantiations_exe ) IF(DEAL_II_COMPONENT_COMPAT_FILES) - # - # Build and install the old dependency_resolution and report_features - # executables: + # Also build and install the old dependency_resolution executable: # - INCLUDE_DIRECTORIES( - BEFORE # Ensure deal.II include directories come first - # - # Reverse order due to BEFORE: - # - ${CMAKE_SOURCE_DIR}/include/ - ${CMAKE_BINARY_DIR}/include/ - ) - ADD_EXECUTABLE(make_dependencies make_dependencies.cc) - IF(BUILD_SHARED_LIBS) - SET(_shared_libs "true") - ELSE() - SET(_shared_libs "false") - ENDIF() - CONFIGURE_FILE( - ${CMAKE_CURRENT_SOURCE_DIR}/report_features.cc.in - ${CMAKE_CURRENT_BINARY_DIR}/report_features.cc - ) - - ADD_EXECUTABLE(report_features - ${CMAKE_CURRENT_BINARY_DIR}/report_features.cc - ) - - # - # Link report_features in the same way as the library/final executable: - # - TARGET_LINK_LIBRARIES(report_features ${DEAL_II_EXTERNAL_LIBRARIES}) - SET_TARGET_PROPERTIES(report_features - PROPERTIES - LINK_FLAGS "${DEAL_II_LINKER_FLAGS}" - COMPILE_DEFINITIONS "${DEAL_II_DEFINITIONS}" - ) - IF(DEAL_II_STATIC_EXECUTABLE) - SET_PROPERTY(TARGET report_features PROPERTY - LINK_SEARCH_END_STATIC TRUE - ) - ENDIF() - - IF(NOT CMAKE_CROSSCOMPILING) - ADD_CUSTOM_TARGET(run_report_features COMMAND report_features) - ENDIF() - ADD_DEPENDENCIES(compat_files expand_instantiations_exe make_dependencies - report_features ) - SET_TARGET_PROPERTIES(expand_instantiations_exe make_dependencies report_features + SET_TARGET_PROPERTIES(expand_instantiations_exe make_dependencies PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${DEAL_II_COMMON_RELDIR}/scripts ) - INSTALL(TARGETS expand_instantiations_exe make_dependencies report_features + INSTALL(TARGETS expand_instantiations_exe make_dependencies DESTINATION ${DEAL_II_COMMON_RELDIR}/scripts COMPONENT compat_files ) diff --git a/deal.II/cmake/scripts/report_features.cc.in b/deal.II/cmake/scripts/report_features.cc.in deleted file mode 100644 index 457d226e04..0000000000 --- a/deal.II/cmake/scripts/report_features.cc.in +++ /dev/null @@ -1,175 +0,0 @@ -// --------------------------------------------------------------------- -// $Id$ -// -// Copyright (C) 2010 - 2013 by the deal.II authors -// -// This file is part of the deal.II library. -// -// The deal.II library is free software; you can use it, redistribute -// it, and/or modify it under the terms of the GNU Lesser General -// Public License as published by the Free Software Foundation; either -// version 2.1 of the License, or (at your option) any later version. -// The full text of the license can be found in the file LICENSE at -// the top level of the deal.II distribution. -// -// --------------------------------------------------------------------- - -#include - -#include - -#include - -#ifdef DEAL_II_WITH_UMFPACK -extern "C" { -#include -} -#endif - -#if defined(DEAL_II_WITH_MPI) -#include -#endif - -#ifdef DEAL_II_WITH_TRILINOS -# include -#endif - -#ifdef DEAL_II_WITH_MUMPS -# include -# include -#endif - -#ifdef DEAL_II_WITH_PETSC -# include -#endif - -#ifdef DEAL_II_WITH_SLEPC -# include -#endif - -// Output configuration options from config.h. -// The format of each line is -// -// deal-feature: FEATURE=value -// -// no spaces in any token! - -int main() -{ - std::cout << "dealii-feature: target=" - << "@CMAKE_SYSTEM_NAME@" << std::endl; - std::cout << "dealii-feature: compiler=" - << "@CMAKE_CXX_COMPILER_ID@@CMAKE_CXX_COMPILER_VERSION@" - << std::endl; - if(${_shared_libs}) - std::cout << "dealii-feature: shared_libs=yes" << std::endl; - else - std::cout << "dealii-feature: shared_libs=no" << std::endl; - -#ifdef DEAL_II_WITH_ARPACK - std::cout << "dealii-feature: ARPACK=yes" << std::endl; -#endif - -std::cout << "dealii-feature: BOOST=" - << BOOST_VERSION / 100000 << "." - << BOOST_VERSION / 100 % 1000 - << std::endl; - -#ifdef DEAL_II_WITH_FUNCTIONPARSER - std::cout << "dealii-feature: parser=yes" << std::endl; -#else - std::cout << "dealii-feature: parser=no" << std::endl; -#endif - -#ifdef DEAL_II_WITH_HDF5 - std::cout << "dealii-feature: HDF5=yes" << std::endl; -#endif - -#ifdef DEAL_II_WITH_LAPACK - std::cout << "dealii-feature: BLAS=yes" << std::endl; - std::cout << "dealii-feature: LAPACK=yes" << std::endl; -#endif - -#ifdef DEAL_II_WITH_METIS - std::cout << "dealii-feature: METIS=yes" << std::endl; -#endif - -#if defined(DEAL_II_WITH_MPI) -# ifdef OMPI_MAJOR_VERSION - std::cout << "dealii-feature: MPI=OpenMPI-" - << OMPI_MAJOR_VERSION << '.' - << OMPI_MINOR_VERSION << '.' - << OMPI_RELEASE_VERSION << std::endl; -# else - std::cout << "dealii-feature: MPI=" - << MPI_VERSION << '.' - << MPI_SUBVERSION << std::endl; -# endif -#endif - -#ifdef DEAL_II_WITH_MUMPS - std::cout << "dealii-feature: MUMPS=yes" << std::endl; -#endif - -#ifdef DEAL_II_WITH_P4EST - std::cout << "dealii-feature: P4est=yes" << std::endl; -#endif - -#ifdef DEAL_II_WITH_PETSC - std::cout << "dealii-feature: PETSc=" - << PETSC_VERSION_MAJOR << '.' - << PETSC_VERSION_MINOR << '.' - << PETSC_VERSION_SUBMINOR << "-p" - << PETSC_VERSION_PATCH << std::endl; -#endif - -#ifdef DEAL_II_WITH_SLEPC - std::cout << "dealii-feature: SLEPc=" - << SLEPC_VERSION_MAJOR << '.' - << SLEPC_VERSION_MINOR << '.' - << SLEPC_VERSION_SUBMINOR << "-p" - << SLEPC_VERSION_PATCH << std::endl; -#endif - -#ifdef DEAL_II_WITH_NETCDF - std::cout << "dealii-feature: NetCDF=yes" << std::endl; -#endif - -#ifdef DEAL_II_WITH_TECPLOT - std::cout << "dealii-feature: Tecplot=yes" << std::endl; -#endif - -#ifdef DEAL_II_WITH_THREADS - std::cout << "dealii-feature: multithreading=yes" << std::endl; -#else - std::cout << "dealii-feature: multithreading=no" << std::endl; -#endif - -#ifdef DEAL_II_WITH_TRILINOS -# ifdef TRILINOS_VERSION_STRING - std::cout << "dealii-feature: Trilinos=" << TRILINOS_VERSION_STRING << std::endl; -# else - const unsigned int trilinos_subminor = TRILINOS_MAJOR_MINOR_VERSION % 100; - const unsigned int trilinos_minor = (TRILINOS_MAJOR_MINOR_VERSION/100) % 100; - std::cout << "dealii-feature: Trilinos=" - << TRILINOS_MAJOR_VERSION << '.' - << trilinos_minor << '.' - << trilinos_subminor << std::endl; -# endif -#endif - -#ifdef DEAL_II_WITH_UMFPACK - std::cout << "dealii-feature: UMFPACK=" - << UMFPACK_MAIN_VERSION << '.' - << UMFPACK_SUB_VERSION << '.' - << UMFPACK_SUBSUB_VERSION << std::endl; -#endif - -#ifdef DEAL_II_WITH_ZLIB - std::cout << "dealii-feature: LibZ=yes" << std::endl; -#endif - -#ifdef DEAL_II_WITH_64BIT_INDICES - std::cout << "dealii-feature: 64bit_indices=yes" <.log -# -# CMAKE - the cmake executable to use -# SVN - svn info command to use -# TMPDIR - defaults to "/tmp" -# CLEAN_TMPDIR - defaults to "true" -# RUN_EXAMPLES - defaults to "true" -# - -# -# Specify default values: -# -SOURCEDIR=$(CURDIR) -LOGDIR=$(PWD) -TMPDIR?=/tmp -CMAKE=cmake -SVN=svn info $(SOURCEDIR) - -branch:=$(shell $(SVN) | perl -ne 'print "$$1" if m/svn\.dealii\.org.*\/(.+?)\/deal.II/;') -revision:=$(shell $(SVN) | perl -ne 'print "$$_" if s/Last Changed Rev: //;') - -date:= $(shell date +%s) -random:=$(shell echo "$$RANDOM") -testdir:= "$(TMPDIR)"/deal-build-test.$(date)-$(random) -builddir:= $(testdir)/build -installdir:= $(testdir)/install -LOGFILE=$(LOGDIR)/$(firstword $(branch) unknown_branch).$(firstword $(notdir $(CONFIGFILE)) no_configuration).$(date).log -CLEAN_TMPDIR=true -RUN_EXAMPLES=true - -PIPEnTRAP:= >>$(LOGFILE) 2>&1 || (if ${CLEAN_TMPDIR}; then rm -rf $(testdir); fi; false) - -.PHONY: main -main: - @if test ! -f $(SOURCEDIR)/CMakeLists.txt; then echo "ERROR: $(SOURCEDIR) doesn't seem to be a top-level source directory"; false; fi - mkdir -p $(LOGDIR) - mkdir -p $(builddir) - mkdir -p $(installdir) - @echo "AUTOMATED DEAL.II BUILD TEST" | tee $(LOGFILE) - @echo "BEGIN HEADER `date -u '+%Y-%m-%d %T'`" | tee -a $(LOGFILE) - @echo "dealii-feature: branch=$(branch)" | tee -a $(LOGFILE) - @echo "dealii-feature: revision=$(revision)" | tee -a $(LOGFILE) - @echo "dealii-feature: user=$(USER)" | tee -a $(LOGFILE) - @echo "dealii-feature: host=`hostname`" | tee -a $(LOGFILE) - @echo "dealii-feature: configuration=`basename \"$(CONFIGFILE)\"`" | tee -a $(LOGFILE) - @echo END HEADER `date -u '+%Y-%m-%d %T'`\n | tee -a $(LOGFILE) - @echo "BEGIN CONFIGURE OUTPUT `date -u '+%Y-%m-%d %T'`" | tee -a $(LOGFILE) - cd $(builddir) && $(CMAKE) -C "$(CONFIGFILE)" -DCMAKE_INSTALL_PREFIX=$(installdir) $(SOURCEDIR) $(PIPEnTRAP) - @echo "END CONFIGURE OUTPUT `date -u '+%Y-%m-%d %T'`" | tee -a $(LOGFILE) - @echo "BEGIN REPORT FEATURES `date -u '+%Y-%m-%d %T'`" | tee -a $(LOGFILE) - cd $(builddir) && make $(MAKEOPTS) run_report_features $(PIPEnTRAP) - @echo "END REPORT FEATURES `date -u '+%Y-%m-%d %T'`" | tee -a $(LOGFILE) - @echo "BEGIN BUILD INSTALL OUTPUT `date -u '+%Y-%m-%d %T'`" | tee -a $(LOGFILE) - cd $(builddir) && make $(MAKEOPTS) install $(PIPEnTRAP) - @echo "END BUILD INSTALL OUTPUT `date -u '+%Y-%m-%d %T'`" | tee -a $(LOGFILE) - @echo "BEGIN BUILD EXAMPLES OUTPUT `date -u '+%Y-%m-%d %T'`" | tee -a $(LOGFILE) - cd $(installdir)/examples && make -f $(SOURCEDIR)/contrib/utilities/build_test DEAL_II_DIR=$(installdir) build_examples $(PIPEnTRAP) - @echo "END BUILD EXAMPLES OUTPUT `date -u '+%Y-%m-%d %T'`" | tee -a $(LOGFILE) - @echo "BEGIN RUN EXAMPLES OUTPUT `date -u '+%Y-%m-%d %T'`" | tee -a $(LOGFILE) - cd $(installdir)/examples && make -f $(SOURCEDIR)/contrib/utilities/build_test run_examples $(PIPEnTRAP) - @echo "END RUN EXAMPLES OUTPUT `date -u '+%Y-%m-%d %T'`" | tee -a $(LOGFILE) - @echo "BUILD TEST SUCCESSFUL `date -u '+%Y-%m-%d %T'`" | tee -a $(LOGFILE) - if ${CLEAN_TMPDIR}; then rm -rf $(testdir); fi - - -# -# Recipes used for testing the example steps -# - -steps:= $(wildcard step-*) - -%/%: - -cd $(@D) && $(CMAKE) . >/dev/null 2>&1 - cd $(@D) && if [ -f Makefile ]; then make; fi - -.PHONY: build_examples -build_examples: $(steps:%=%/%) - - -# Run a minimalistic set of steps in debug configuration: -runsteps_debug:= step-1 step-2 step-3 step-4 step-5 step-6 step-47 - -# Run all configuration independent steps in release configuration: -runsteps_release= step-1 step-2 step-3 step-4 step-5 step-6 step-7 step-8 step-9 step-10 step-11 step-12 step-13 step-14 step-16 step-20 step-23 step-25 step-26 step-27 step-28 step-30 step-38 step-39 step-44 step-45 step-47 step-48 step-49 -# step-15 step-21 step-24 - - -%/OK_DEBUG: - cd $(@D) && $(CMAKE) -DCMAKE_BUILD_TYPE=Debug . >/dev/null 2>&1 - cd $(@D) && if $(RUN_EXAMPLES); then make run; fi && touch OK_DEBUG - -%/OK_RELEASE: - cd $(@D) && $(CMAKE) -DCMAKE_BUILD_TYPE=Release . >/dev/null 2>&1 - cd $(@D) && if $(RUN_EXAMPLES); then make run; fi && touch OK_RELEASE - -.PHONY: run_examples -run_examples: $(runsteps_debug:%=%/OK_DEBUG) $(runsteps_release:%=%/OK_RELEASE) - diff --git a/deal.II/doc/users/cmakelists.html b/deal.II/doc/users/cmakelists.html index 19d5686899..e6a45736ff 100644 --- a/deal.II/doc/users/cmakelists.html +++ b/deal.II/doc/users/cmakelists.html @@ -822,7 +822,6 @@ ${CMAKE_INSTALL_PREFIX}/ common/Make.global_options common/scripts/expand_instantiations common/scripts/make_dependencies - common/scripts/report_features Therefore, it should be sufficient to set D in the old -- 2.39.5