Skip to content

Commit

Permalink
Adapt vagrant-stuff for new version number
Browse files Browse the repository at this point in the history
  • Loading branch information
bgschaid authored and Hrvoje Jasak committed Aug 24, 2015
1 parent 403fda0 commit b2518dd
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions vagrantSandbox/README
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,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 =~/foam/foam-extend-3.1= the sources are
the directory =~/foam/foam-extend-3.2= the sources are
available. Modifications can be pushed "outside" the virtual machine
with
: hg push
There is also a symbolic link =~/foam/foam-extend-3.1-parent=
There is also a symbolic link =~/foam/foam-extend-3.2-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
Expand Down
2 changes: 1 addition & 1 deletion vagrantSandbox/initGeneralScript.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ chown -R vagrant:vagrant $OFDIR
# for distros that don't have group vagrant
chown -R vagrant $OFDIR

OFClone=$OFDIR/foam-extend-3.1
OFClone=$OFDIR/foam-extend-3.2
OFReference=$OFClone-parent

OFParent=/FOAM-sources
Expand Down
4 changes: 2 additions & 2 deletions vagrantSandbox/skel/bootstrapAndTest.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

/home/vagrant/bootstrapFoam.sh

cd foam/foam-extend-3.1
cd foam/foam-extend-3.2
source etc/bashrc

cd testHarness/foam-extend/3.1/runDir
cd testHarness/foam-extend/3.2/runDir

./Allclean

Expand Down
2 changes: 1 addition & 1 deletion vagrantSandbox/skel/bootstrapFoam.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ export CCACHE_DIR=/vagrant/ccache4vm

BOOTSTRAPLOG=/home/vagrant/bootstrapFoam.log

cd foam/foam-extend-3.1
cd foam/foam-extend-3.2
source etc/bashrc

( cd wmake/src && make )
Expand Down

0 comments on commit b2518dd

Please sign in to comment.