Merge branch 'master' of ssh://noisy/home/noisy3/OpenFOAM/OpenFOAM-dev

README

@@ -112,7 +112,7 @@
   which may be obtained from http://gcc.gnu.org/.
 
   Install the compiler in
-  $WM_THIRD_PARTY_DIR/platform/$WM_ARCH$WM_COMPILER_ARCH/gcc-<GCC_VERSION>
+  $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/gcc-<GCC_VERSION>
   and change the gcc version number in $WM_PROJECT_DIR/etc/settings.sh and
   $WM_PROJECT_DIR/etc/settings.csh appropriately and finally update the
   environment variables as in section 3.

etc/apps/paraview3/bashrc

@@ -39,7 +39,7 @@ cleaned=`$WM_PROJECT_DIR/bin/foamCleanPath "$PATH" "$WM_THIRD_PARTY_DIR/platform
 
 # determine the cmake to be used
 unset CMAKE_HOME
-for cmake in cmake-2.8.1 cmake-2.8.0 cmake-2.6.4 cmake-2.6.2 cmake-2.4.6
+for cmake in cmake-2.8.1 cmake-2.8.0 cmake-2.6.4
 do
     cmake=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$cmake
     if [ -r $cmake ]
@@ -52,20 +52,22 @@ done
 
 
 # set VERSION and MAJOR (version) variables if not already set
-[ -z "$ParaView_VERSION" ] && export ParaView_VERSION=3.6.1
+[ -n "$ParaView_VERSION" ] || ParaView_VERSION=3.6.1
+[ -n "$ParaView_MAJOR" ]   || ParaView_MAJOR=unknown
 
 # if needed, set MAJOR version to correspond to VERSION
 # ParaView_MAJOR is "<digits>.<digits>" from ParaView_VERSION
 case "$ParaView_VERSION" in
-"${ParaView_MAJOR}.*" )
+"$ParaView_MAJOR".* )
     # version and major appear to correspond
     ;;
 
-*)
-    [ -z ${ParaView_MAJOR} ] && ParaView_MAJOR=`echo $ParaView_VERSION | sed -e 's/^\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/'`
+[0-9]*)
+    # extract major from the version
+    ParaView_MAJOR=`echo $ParaView_VERSION | sed -e 's/^\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/'`
     ;;
 esac
-export ParaView_MAJOR
+export ParaView_VERSION ParaView_MAJOR
 
 paraviewInstDir=$WM_THIRD_PARTY_DIR/paraview-$ParaView_VERSION
 export ParaView_DIR=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/paraview-$ParaView_VERSION

etc/apps/paraview3/cshrc

@@ -40,7 +40,7 @@ if ( $status == 0 ) set path=($cleaned)
 
 # determine the cmake to be used
 unsetenv CMAKE_HOME
-foreach cmake ( cmake-2.8.1 cmake-2.8.0 cmake-2.6.4 cmake-2.6.2 cmake-2.4.6 )
+foreach cmake ( cmake-2.8.1 cmake-2.8.0 cmake-2.6.4 )
     set cmake=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$cmake
     if ( -r $cmake ) then
         setenv CMAKE_HOME $cmake
@@ -51,16 +51,17 @@ end
 
 # set VERSION and MAJOR (version) variables if not already set
 if ( ! $?ParaView_VERSION || "x$ParaView_VERSION" == "x" ) setenv ParaView_VERSION 3.6.1
-if ( ! $?ParaView_MAJOR )   setenv ParaView_MAJOR unknown
+if ( ! $?ParaView_MAJOR ) setenv ParaView_MAJOR unknown
 
 # if needed, set MAJOR version to correspond to VERSION
 # ParaView_MAJOR is "<digits>.<digits>" from ParaView_VERSION
 switch ("$ParaView_VERSION")
-case "${ParaView_MAJOR}.*":
+case "$ParaView_MAJOR".*:
     # version and major appear to correspond
     breaksw
 
-default:
+case [0-9]*:
+    # extract major from the version
     setenv ParaView_MAJOR `echo ${ParaView_VERSION} | \
         sed -e 's/^\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/'`
     breaksw