From: maier Date: Fri, 1 Mar 2013 17:53:34 +0000 (+0000) Subject: Cleanup X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bd14d635f4366c554a54772edb3b74ee13716ac9;p=dealii-svn.git Cleanup git-svn-id: https://svn.dealii.org/branches/branch_cmake@28699 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/GNUmakefile b/deal.II/GNUmakefile index dd73202ea1..138b419ff2 100644 --- a/deal.II/GNUmakefile +++ b/deal.II/GNUmakefile @@ -64,17 +64,14 @@ cmake: # TMPDIR=/tmp CMAKE=cmake +SVN=svn info . date:= $(shell date +%s) random:=$(shell echo "$$RANDOM") testdir:= "$(TMPDIR)"/deal-build-test.$(date)-$(random) builddir:= $(testdir)/build installdir:= $(testdir)/install LOGDIR=$(testdir) -ifeq "$(CONFIGFILE)" "" - logfile:=$(LOGDIR)/$(date).automatic.log -else - logfile:=$(LOGDIR)/$(date).$(shell basename "$(CONFIGFILE)").log -endif +logfile:=$(LOGDIR)/$(date).$(firstword $(notdir $(CONFIGFILE)) automatic).log .PHONY: build_test build_test: @@ -83,7 +80,7 @@ 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=$$_" if s/Last Changed Rev: //; print "dealii-feature: branch=$$1\n" if m/svn\.dealii\.org\/(.+)\/deal.II/;' | tee -a $(logfile) + @$(SVN) | 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)\"`"