From ad198e0854399014792ea1901f1ade5634c0518b Mon Sep 17 00:00:00 2001
From: Bernhard Gschaider <bgschaid@ice-sf.at>
Date: Mon, 10 Feb 2014 15:12:04 +0100
Subject: [PATCH] Fixes and a script to compile Foam in one go

--HG--
extra : amend_source : 367e251b7df6b13cda03ddf956dbbfa9bec4b51d
---
 .gitignore                             |  3 +++
 .hgignore                              |  3 +++
 vagrantSandbox/README                  | 11 +++++++++--
 vagrantSandbox/initCentOSRHELScript.sh |  2 +-
 vagrantSandbox/skel/.bashrc            |  1 +
 vagrantSandbox/skel/bootstrapFoam.sh   | 22 ++++++++++++++++++++++
 6 files changed, 39 insertions(+), 3 deletions(-)
 create mode 100755 vagrantSandbox/skel/bootstrapFoam.sh

diff --git a/.gitignore b/.gitignore
index 8f9f44c1c..2c91d7832 100644
--- a/.gitignore
+++ b/.gitignore
@@ -119,4 +119,7 @@ src/lduSolvers/amg/amgPolicy/samgPolicy.H
 src/lduSolvers/amg/amgPolicy/aamgPolicy.C
 src/lduSolvers/amg/amgPolicy/aamgPolicy.H
 
+# vagrant stuff
+vagrantSandbox/.vagrant/
+
 # end-of-file
diff --git a/.hgignore b/.hgignore
index 922d0258d..8a5db6955 100644
--- a/.hgignore
+++ b/.hgignore
@@ -108,4 +108,7 @@ src/lduSolvers/amg/amgPolicy/samgPolicy.H
 src/lduSolvers/amg/amgPolicy/aamgPolicy.C
 src/lduSolvers/amg/amgPolicy/aamgPolicy.H
 
+# vagrant stuff
+vagrantSandbox/.vagrant/
+
 # end-of-file
diff --git a/vagrantSandbox/README b/vagrantSandbox/README
index 37057362a..9393d8ffa 100644
--- a/vagrantSandbox/README
+++ b/vagrantSandbox/README
@@ -16,11 +16,11 @@
   One can then connect to the virtual machine with
 : vagrant ssh <machinName>
   and will be in the =$HOME= directory of the user =vagrant= where in
-  the directory =~/OpenFOAM/OpenFOAM-1.6-ext= the sources are
+  the directory =~/foam/foam-extend-3.0= the sources are
   available. Modifications can be pushed "outside" the virtual machine
   with
 : hg push
-  There is also a symbolic link =~/OpenFOAM/OpenFOAM-1.6-ext-parent=
+  There is also a symbolic link =~/foam/foam-extend-3.0-parent=
   to the sources if you want to edit there directly. Use with care
   and don't compile in that directory unless you know what you're
   doing
@@ -32,3 +32,10 @@
              =postfix=-package)
   - maverick :: Tries to fix the problems with the
                 =lucid=-machine. Not yet working
+  - centos65 :: A CentOS 6.5 machine with preinstalled development
+                tools
+* Scripts
+  In the home directory these scripts are found
+  - bootstrapFoam.sh :: A script whose aim it is to compile Foam and
+       the ThirdParty-packages in one go (no paraview and QT). If this
+       works the box is considered operational
diff --git a/vagrantSandbox/initCentOSRHELScript.sh b/vagrantSandbox/initCentOSRHELScript.sh
index 08ccf9fc3..11cf62072 100755
--- a/vagrantSandbox/initCentOSRHELScript.sh
+++ b/vagrantSandbox/initCentOSRHELScript.sh
@@ -8,7 +8,7 @@ echo
 
 # some of these packages are already installed. But lets be sure
 
-neededPackages=(gcc-g++ mercurial git flex bison make ccache rpm-build)
+neededPackages=(gcc-g++ mercurial git flex bison make ccache rpm-build wget zlib-devel)
 bonusPackages=(emacs csh tcsh zsh)
 
 for p in ${neededPackages[@]}; do
diff --git a/vagrantSandbox/skel/.bashrc b/vagrantSandbox/skel/.bashrc
index fd2c4a1bf..6aa500ab5 100644
--- a/vagrantSandbox/skel/.bashrc
+++ b/vagrantSandbox/skel/.bashrc
@@ -7,4 +7,5 @@ fi
 
 # User specific aliases and functions
 
+export WM_SCHEDULER=ccache
 export CCACHE_DIR=/vagrant/ccache4vm
diff --git a/vagrantSandbox/skel/bootstrapFoam.sh b/vagrantSandbox/skel/bootstrapFoam.sh
new file mode 100755
index 000000000..c589bb4cc
--- /dev/null
+++ b/vagrantSandbox/skel/bootstrapFoam.sh
@@ -0,0 +1,22 @@
+#! /bin/bash
+
+# Just to be sure
+export WM_SCHEDULER=ccache
+export CCACHE_DIR=/vagrant/ccache4vm
+
+cd foam/foam-extend-3.0
+source etc/bashrc
+
+( cd wmake/src && make )
+cd $WM_THIRD_PARTY_DIR
+
+./AllMake.stage0
+./AllMake.stage1
+./AllMake.stage2
+./AllMake.stage3
+
+cd $WM_PROJECT_DIR
+# pick up installed packages
+source etc/bashrc
+
+./Allwmake