]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Small improvement
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Thu, 28 Feb 2013 21:35:59 +0000 (21:35 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Thu, 28 Feb 2013 21:35:59 +0000 (21:35 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_cmake@28651 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/GNUmakefile

index 042d420fe77abab00e8f28793ff0d4aa5d628ab0..72f058eecff3c1dfbe772b69116a2c75c04da944 100644 (file)
@@ -52,16 +52,20 @@ cmake:
 TMPDIR=/tmp
 CMAKE=cmake
 
-random:= $(shell echo "$$RANDOM$$RANDOM")
-builddir:= "$(TMPDIR)"/deal-build.$(random)
-installdir:= "$(TMPDIR)"/deal-install.$(random)
+date:= $(shell date +%s)
+random:=$(shell echo "$$RANDOM")
+testdir:= "$(TMPDIR)"/deal-build-test.$(date)-$(random)
+builddir:= $(testdir)/build
+installdir:= $(testdir)/install
 
 .PHONY: build-test
 build-test:
        @mkdir -p $(builddir)
        @mkdir -p $(installdir)
-       @cd $(builddir) && "$(CMAKE)" -C "$(CONFIGFILE)" -DCMAKE_INSTALL_PREFIX=$(installdir) $(PWD) >$(builddir)/configuration.log 2>&1
-       @cd $(builddir) && make $(MAKEOPTS) install >$(builddir)/build.log 2>&1
+       @cd $(builddir) && "$(CMAKE)" -C "$(CONFIGFILE)" -DCMAKE_INSTALL_PREFIX=$(installdir) $(PWD) >$(testdir)/configure.log 2>&1
+       @cp $(builddir)/summary.log $(testdir)
        @cd $(builddir) && make log >/dev/null 2>&1
+       @cp $(builddir)/cmake.log $(testdir)
+       @cd $(builddir) && make $(MAKEOPTS) install >$(testdir)/build.log 2>&1
 
 

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.