Merge commit 'aaaea3559d21e0fe2369596de5fa2e45d3b15b61' into nextRelease

vagrantSandbox/README

@@ -48,8 +48,9 @@
    machine prepended with =vagrant.=
 * Virtual machines
   Currently existing virtual machines are
-  - precise :: Latest LTS Ubuntu. Currently the default machine to use
+  - trusty :: Latest LTS 14.04 Ubuntu. Currently the default machine to use
-  - lucid :: Previous LTS Ubuntu. Currently problems
+  - prescise :: Previous LTS Ubuntu.
+  - lucid :: Old LTS Ubuntu. Currently problems
              with automatic setting up (something with the
              =postfix=-package)
   - maverick :: Tries to fix the problems with the
@@ -75,6 +76,8 @@
        the ThirdParty-packages in one go (no paraview and QT). If this
        works the box is considered operational. The script leaves a
        log file =bootstrapFoam-log= in the home directory
+  - bootstrapAndTest.sh :: Calls =bootstrapFoam.sh= and then runs the
+       =testHarness= in the =foam=-installation
 * Provisioning scripts
   Every "family" of machines has a specific script that makes sure
   that the software packages necessary to compile =Foam= are installed

vagrantSandbox/Vagrantfile

@@ -4,7 +4,7 @@
 Vagrant.configure("2") do |config|
   config.vm.synced_folder "..", "/FOAM-sources"
 
-  config.vm.hostname="vagrant."+ENV["HOSTNAME"]
+  config.vm.hostname="vagrant_"+ (ENV["HOSTNAME"] || `hostname`.strip)
 
   nrCPU=1
   if ENV["WM_VAGRANT_CPUS"]
@@ -25,8 +25,17 @@ Vagrant.configure("2") do |config|
     #   # Use VBoxManage to customize the VM. For example to change memory:
     #     vb.customize ["modifyvm", :id, "--memory", "1024"]
     vb.cpus=nrCPU
-    # make sure each CPU has enough memory
+    # make sure each CPU has enough memory (at least 1.5 Gig)
-    vb.memory=512*(1+nrCPU)
+    vb.memory=512*[(1+nrCPU),4].max
+  end
+
+  config.vm.define :trusty do |trusty|
+    trusty.vm.box = "ubuntu/trusty64"
+    trusty.vm.box_check_update = true
+    trusty.vm.provision :shell do |s|
+      s.args   = "trusty"
+      s.path   = "initUbunutuScript.sh"
+    end
   end
 
   # default

vagrantSandbox/initUbunutuScript.sh

@@ -24,7 +24,7 @@ echo
 echo "Installing additional packages"
 echo
 
-neededPackages=(g++ bison flex mercurial git make ccache cmake rpm)
+neededPackages=(g++ bison flex mercurial git make ccache cmake rpm zlib1g-dev libiberty-dev)
 bonusPackages=(emacs csh tcsh zsh)
 
 for p in ${neededPackages[@]}; do

vagrantSandbox/skel/bootstrapAndTest.sh

@@ -0,0 +1,12 @@
+#! /usr/bin/env bash
+
+/home/vagrant/bootstrapFoam.sh
+
+cd foam/foam-extend-3.0
+source etc/bashrc
+
+cd testHarness/foam-extend/3.0/runDir 
+
+./Allclean
+
+./Allrun_Experimental

vagrantSandbox/skel/bootstrapFoam.sh

@@ -23,3 +23,6 @@ source etc/bashrc
 
 ./Allwmake  2>&1 | tee --append $BOOTSTRAPLOG
 
+# compile swak4Foam
+cd $WM_THIRD_PARTY_DIR
+./AllMake.stage5  2>&1 | tee --append $BOOTSTRAPLOG