From: Matthias Maier Date: Wed, 27 Mar 2013 19:41:14 +0000 (+0000) Subject: Merge branch 'trunk' into branch_cmake X-Git-Tag: v8.0.0~861^2~3 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5977aac8997983bada73431b1bd6d14260f96f33;p=dealii.git Merge branch 'trunk' into branch_cmake git-svn-id: https://svn.dealii.org/branches/branch_cmake@29086 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/contrib/utilities/build_test b/deal.II/contrib/utilities/build_test index b1c5e25697..954d241441 100755 --- a/deal.II/contrib/utilities/build_test +++ b/deal.II/contrib/utilities/build_test @@ -29,10 +29,10 @@ SOURCEDIR=$(CURDIR) LOGDIR=$(PWD) TMPDIR=/tmp CMAKE=cmake -SVN=svn info +SVN=svn info $(SOURCEDIR) -branch:=$(shell $(SVN) $(SOURCEDIR) | perl -ne 'print "$$1" if m/svn\.dealii\.org\/(.+)\/deal.II/;') -revision:=$(shell $(SVN) $(SOURCEDIR) | perl -ne 'print "$$_" if s/Last Changed Rev: //;') +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")