From b51584a0134821c63a3fbb704482c8cb63cb8c02 Mon Sep 17 00:00:00 2001 From: maier Date: Fri, 1 Mar 2013 16:19:44 +0000 Subject: [PATCH] Small bugfixes git-svn-id: https://svn.dealii.org/branches/branch_cmake@28691 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/GNUmakefile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/deal.II/GNUmakefile b/deal.II/GNUmakefile index ab60e44310..dd73202ea1 100644 --- a/deal.II/GNUmakefile +++ b/deal.II/GNUmakefile @@ -83,10 +83,10 @@ build_test: mkdir -p $(LOGDIR) @echo "AUTOMATED DEAL.II BUILD TEST" | tee $(logfile) @echo "BEGIN HEADER `date -u '+%Y-%m-%d %T'`" | tee -a $(logfile) - @svn info . | perl -ne 'print "dealii-feature: revision=$$_\n" if s/Last Changed Rev: //; print "dealii-feature: branch=$$1\n" if m/svn\.dealii\.org\/(.+)\/deal.II/;' | tee -a $(logfile) + @svn info . | perl -ne 'print "dealii-feature: revision=$$_" if s/Last Changed Rev: //; print "dealii-feature: branch=$$1\n" if m/svn\.dealii\.org\/(.+)\/deal.II/;' | tee -a $(logfile) @echo "dealii-feature: user=$(USER)" @echo "dealii-feature: host=`hostname`" - @echo "dealii-feature: configuration=`basename $(CONFIGFILE)`" + @echo "dealii-feature: configuration=`basename \"$(CONFIGFILE)\"`" @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) $(PWD) >>$(logfile) 2>&1 @@ -95,8 +95,7 @@ build_test: cd $(builddir) && "$(CMAKE)" --system-information >>$(logfile) 2>&1 @echo "END CMAKE SYSTEM INFORMATION `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) report_features >>$(logfile) 2>&1 - cd $(builddir) && make $(MAKEOPTS) run_report_features | tee -a $(logfile) + cd $(builddir) && make $(MAKEOPTS) run_report_features >>$(logfile) 2>&1 @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 >>$(logfile) 2>&1 -- 2.39.5