From bf90f2f162d3dded0137368227b54a18ff504464 Mon Sep 17 00:00:00 2001
From: Hrvoje Jasak <h.jasak@wikki.co.uk>
Date: Mon, 10 Aug 2015 10:21:20 +0100
Subject: [PATCH] Windows porting changes

---
 .gitignore                               |  1 +
 doc/buildInstructions/Windows/README.txt |  8 +++++++-
 etc/bashrc.mingw                         | 10 ++++++----
 etc/prefs.sh.mingw                       |  6 +++---
 4 files changed, 17 insertions(+), 8 deletions(-)
 mode change 100644 => 100755 etc/bashrc.mingw

diff --git a/.gitignore b/.gitignore
index 2c91d7832..3d544f53a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,6 +41,7 @@ lnInclude
 # build folders - anywhere
 linux*Gcc*/
 linux*Icc*/
+MINGW32*Gcc*/
 darwin*Gcc*/
 darwin*Intel*/
 linuxming*/
diff --git a/doc/buildInstructions/Windows/README.txt b/doc/buildInstructions/Windows/README.txt
index 5836f5f3a..dc8d1d933 100644
--- a/doc/buildInstructions/Windows/README.txt
+++ b/doc/buildInstructions/Windows/README.txt
@@ -51,7 +51,13 @@ already have some of these system tools.
    may already be available in other packages (such as Strawberry Perl), although
    you need to be careful of the version numbers.
 
-3) Download and install MSYS (see reference list below).
+3) Download and install MSYS (see reference list below).  If this is your first
+   use of MSYS, create a file fstab in cMinGW/1.0/etc with single-line contents:
+
+   c/mingw /mingw
+
+   to mount your home directory.  From Windows, you will find your home directory
+   under c:/MinGW/msys/1.0/home/<user name>
 
 4) Download the foam-extend source code from http://sourceforge.net/projects/openfoam-extend/
 
diff --git a/etc/bashrc.mingw b/etc/bashrc.mingw
old mode 100644
new mode 100755
index 6a1028cee..08f7c9b82
--- a/etc/bashrc.mingw
+++ b/etc/bashrc.mingw
@@ -47,8 +47,8 @@ set_system_paths() {
     export PARAVIEW_HOME=$PROGRAMS_HOME/ParaView-4.3.1
     #export PERL_HOME=$PROGRAMS_HOME/strawberry-perl-5.20.2.1-64bit/perl
     export PEXPORTS_HOME=$PROGRAMS_HOME/pexports
-    #export PYTHON_HOME=$PROGRAMS_HOME/Python27
-    #export SUBVERSION_HOME=$PROGRAMS_HOME/svn-win32-1.8.13
+    export PYTHON_HOME=$PROGRAMS_HOME/Python27
+    export SUBVERSION_HOME=$PROGRAMS_HOME/svn-win32-1.8.13
     export WGET_HOME=$PROGRAMS_HOME/wget-1.11.4-1
     export ZIP_HOME="/c/Program Files/7-Zip"
 }
@@ -58,14 +58,15 @@ add_to_path() {
     echo "Adding user-defined installed system tools to PATH ..." 
     export PATH=$ZIP_HOME:$PATH
     export PATH=$WGET_HOME/bin:$PATH
-    #export PATH=$PYTHON_HOME:$PATH
-    #export PATH=$SUBVERSION_HOME/bin:$PATH
+    export PATH=$PYTHON_HOME:$PATH
+    export PATH=$SUBVERSION_HOME/bin:$PATH
     export PATH=$GIT_HOME/cmd:$PATH
     #export PATH=$PERL_HOME/bin:$PATH
     export PATH=$CMAKE_HOME/bin:$PATH
     export PATH=$MPI_ROOTDIR/bin:$PATH
     export PATH=$PEXPORTS_HOME/bin:$PATH
     export PATH=$MINGW_HOME/bin:$PATH
+    export PATH=$PARAVIEW_HOME/bin:$PATH
 }
 # }}}
 
@@ -119,6 +120,7 @@ check_versions() {
 }
 
 finish() {
+    export PATH=$PATH:$LD_LIBRARY_PATH
     echo
     echo
     echo "FOAM_INST_DIR=$FOAM_INST_DIR"
diff --git a/etc/prefs.sh.mingw b/etc/prefs.sh.mingw
index 4cebc8770..e8963b6f0 100644
--- a/etc/prefs.sh.mingw
+++ b/etc/prefs.sh.mingw
@@ -151,9 +151,9 @@ export SCOTCH_INCLUDE_DIR=$SCOTCH_DIR/include
 #export QT_BIN_DIR=$QT_DIR/bin
 
 # System installed ParaView
-#export PARAVIEW_SYSTEM=1
-#export PARAVIEW_DIR=path_to_system_installed_paraview
-#export PARAVIEW_BIN_DIR=$PARAVIEW_DIR/bin
+export PARAVIEW_SYSTEM=1
+export PARAVIEW_DIR=/c/Programs/ParaView-4.3.1
+export PARAVIEW_BIN_DIR=$PARAVIEW_DIR/bin
 
 # System installed bison
 #export BISON_SYSTEM=1