From 20693b96bddda69b7f86b8fae7d04f7f0be81bc6 Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Mon, 2 May 2011 14:52:11 +0200 Subject: [PATCH] CONF: move OpenFOAM etc/apps -> etc/config - use standard *.sh, *.csh endings --- .gitignore | 2 -- bin/tools/foamConfigurePaths | 2 +- etc/aliases.csh | 2 +- etc/aliases.sh | 2 +- etc/bashrc | 4 ++-- etc/{apps/ensight/cshrc => config/ensight.csh} | 2 +- etc/{apps/ensight/bashrc => config/ensight.sh} | 2 +- etc/config/{compiler.csh-EXAMPLE => example/compiler.csh} | 4 ++-- etc/config/{compiler.sh-EXAMPLE => example/compiler.sh} | 4 ++-- etc/config/{openmpi.csh-EXAMPLE => example/openmpi.csh} | 4 ++-- etc/config/{openmpi.sh-EXAMPLE => example/openmpi.sh} | 4 ++-- .../cshrc-EXAMPLE => config/example/paraview.csh} | 8 ++++---- .../bashrc-EXAMPLE => config/example/paraview.sh} | 8 ++++---- etc/{apps/paraview3/cshrc => config/paraview.csh} | 2 +- etc/{apps/paraview3/bashrc => config/paraview.sh} | 3 +-- etc/{apps/scotch/bashrc => config/scotch.sh} | 3 +-- etc/cshrc | 4 ++-- src/parallel/decompose/Allwmake | 4 ++-- 18 files changed, 30 insertions(+), 34 deletions(-) rename etc/{apps/ensight/cshrc => config/ensight.csh} (98%) rename etc/{apps/ensight/bashrc => config/ensight.sh} (98%) rename etc/config/{compiler.csh-EXAMPLE => example/compiler.csh} (94%) rename etc/config/{compiler.sh-EXAMPLE => example/compiler.sh} (94%) rename etc/config/{openmpi.csh-EXAMPLE => example/openmpi.csh} (93%) rename etc/config/{openmpi.sh-EXAMPLE => example/openmpi.sh} (93%) rename etc/{apps/paraview3/cshrc-EXAMPLE => config/example/paraview.csh} (86%) rename etc/{apps/paraview3/bashrc-EXAMPLE => config/example/paraview.sh} (86%) rename etc/{apps/paraview3/cshrc => config/paraview.csh} (99%) rename etc/{apps/paraview3/bashrc => config/paraview.sh} (99%) rename etc/{apps/scotch/bashrc => config/scotch.sh} (98%) diff --git a/.gitignore b/.gitignore index e2c6f9b41f..1b8ce3cde3 100644 --- a/.gitignore +++ b/.gitignore @@ -60,8 +60,6 @@ doc/[Dd]oxygen/man # untracked configuration files /etc/prefs.csh /etc/prefs.sh -/etc/config/*.csh -/etc/config/*.sh # source packages - anywhere *.tar.bz2 diff --git a/bin/tools/foamConfigurePaths b/bin/tools/foamConfigurePaths index f3948c3cc2..9526748f07 100755 --- a/bin/tools/foamConfigurePaths +++ b/bin/tools/foamConfigurePaths @@ -131,7 +131,7 @@ do paraviewInstall="$2" # replace ParaView_DIR=... _inlineSed \ - etc/apps/paraview3/bashrc \ + etc/config/paraview.sh \ '/^[^#]/s@ParaView_DIR=.*@ParaView_DIR='"$paraviewInstall@" \ "Replacing ParaView_DIR setting by '$paraviewInstall'" shift 2 diff --git a/etc/aliases.csh b/etc/aliases.csh index 558390b403..5c5b344497 100644 --- a/etc/aliases.csh +++ b/etc/aliases.csh @@ -49,7 +49,7 @@ alias wmSchedOFF 'unsetenv WM_SCHEDULER' # Change ParaView version # ~~~~~~~~~~~~~~~~~~~~~~~ -alias foamPV 'source `$WM_PROJECT_DIR/etc/apps/paraview3/cshrc` ParaView_VERSION=\!*; echo paraview-$ParaView_VERSION' +alias foamPV 'source `$WM_PROJECT_DIR/etc/config/paraview.csh` ParaView_VERSION=\!*; echo paraview-$ParaView_VERSION' # Change directory aliases diff --git a/etc/aliases.sh b/etc/aliases.sh index e9c1227004..df0fda7389 100644 --- a/etc/aliases.sh +++ b/etc/aliases.sh @@ -52,7 +52,7 @@ alias wmSchedOFF='unset WM_SCHEDULER' unset foamPV foamPV() { - . $WM_PROJECT_DIR/etc/apps/paraview3/bashrc ParaView_VERSION=$1 + . $WM_PROJECT_DIR/etc/config/paraview.sh ParaView_VERSION=$1 echo "paraview-$ParaView_VERSION (major: $ParaView_MAJOR)" } diff --git a/etc/bashrc b/etc/bashrc index d2539c5b50..3aaff82598 100644 --- a/etc/bashrc +++ b/etc/bashrc @@ -206,8 +206,8 @@ _foamSource $WM_PROJECT_DIR/etc/aliases.sh # Source user setup files for optional packages # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -_foamSource `$WM_PROJECT_DIR/bin/foamEtcFile apps/paraview3/bashrc` -_foamSource `$WM_PROJECT_DIR/bin/foamEtcFile apps/ensight/bashrc` +_foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config/paraview.sh` +_foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config/ensight.sh` # Clean environment paths again. Only remove duplicates diff --git a/etc/apps/ensight/cshrc b/etc/config/ensight.csh similarity index 98% rename from etc/apps/ensight/cshrc rename to etc/config/ensight.csh index 73a00884fc..b1ce4ba112 100644 --- a/etc/apps/ensight/cshrc +++ b/etc/config/ensight.csh @@ -22,7 +22,7 @@ # along with OpenFOAM. If not, see . # # File -# ensight/cshrc +# config/ensight.csh # # Description # Setup file for Ensight diff --git a/etc/apps/ensight/bashrc b/etc/config/ensight.sh similarity index 98% rename from etc/apps/ensight/bashrc rename to etc/config/ensight.sh index 0e6b981bc8..16ac2bd839 100644 --- a/etc/apps/ensight/bashrc +++ b/etc/config/ensight.sh @@ -22,7 +22,7 @@ # along with OpenFOAM. If not, see . # # File -# ensight/bashrc +# config/ensight.sh # # Description # Setup file for Ensight diff --git a/etc/config/compiler.csh-EXAMPLE b/etc/config/example/compiler.csh similarity index 94% rename from etc/config/compiler.csh-EXAMPLE rename to etc/config/example/compiler.csh index 6d54edbd47..6905daf8bd 100644 --- a/etc/config/compiler.csh-EXAMPLE +++ b/etc/config/example/compiler.csh @@ -22,10 +22,10 @@ # along with OpenFOAM. If not, see . # # File -# config/compiler.csh +# config/example/compiler.csh # # Description -# Fine tuning of ThirdParty compiler settings for OpenFOAM +# Example of fine tuning ThirdParty compiler settings for OpenFOAM # Sourced from OpenFOAM-/etc/settings.csh # #------------------------------------------------------------------------------ diff --git a/etc/config/compiler.sh-EXAMPLE b/etc/config/example/compiler.sh similarity index 94% rename from etc/config/compiler.sh-EXAMPLE rename to etc/config/example/compiler.sh index bc6aada36e..7dffdcc10c 100644 --- a/etc/config/compiler.sh-EXAMPLE +++ b/etc/config/example/compiler.sh @@ -22,10 +22,10 @@ # along with OpenFOAM. If not, see . # # File -# config/compiler.sh +# config/example/compiler.sh # # Description -# Fine tuning of ThirdParty compiler settings for OpenFOAM +# Example of fine tuning ThirdParty compiler settings for OpenFOAM # Sourced from OpenFOAM-/etc/settings.sh # #------------------------------------------------------------------------------ diff --git a/etc/config/openmpi.csh-EXAMPLE b/etc/config/example/openmpi.csh similarity index 93% rename from etc/config/openmpi.csh-EXAMPLE rename to etc/config/example/openmpi.csh index 94be702e9d..da07872d31 100644 --- a/etc/config/openmpi.csh-EXAMPLE +++ b/etc/config/example/openmpi.csh @@ -22,10 +22,10 @@ # along with OpenFOAM. If not, see . # # File -# config/openmpi.csh +# config/example/openmpi.csh # # Description -# Fine tuning of openmpi settings for OpenFOAM +# Example of fine tuning openmpi settings for OpenFOAM # Sourced from OpenFOAM-/etc/settings.csh # #------------------------------------------------------------------------------ diff --git a/etc/config/openmpi.sh-EXAMPLE b/etc/config/example/openmpi.sh similarity index 93% rename from etc/config/openmpi.sh-EXAMPLE rename to etc/config/example/openmpi.sh index b7c5035b04..7c0ed18543 100644 --- a/etc/config/openmpi.sh-EXAMPLE +++ b/etc/config/example/openmpi.sh @@ -22,10 +22,10 @@ # along with OpenFOAM. If not, see . # # File -# config/openmpi.sh +# config/example/openmpi.sh # # Description -# Fine tuning of openmpi settings for OpenFOAM +# Example of fine tuning openmpi settings for OpenFOAM # Sourced from OpenFOAM-/etc/settings.sh # #------------------------------------------------------------------------------ diff --git a/etc/apps/paraview3/cshrc-EXAMPLE b/etc/config/example/paraview.csh similarity index 86% rename from etc/apps/paraview3/cshrc-EXAMPLE rename to etc/config/example/paraview.csh index 475dbffce0..8509e924e3 100644 --- a/etc/apps/paraview3/cshrc-EXAMPLE +++ b/etc/config/example/paraview.csh @@ -22,10 +22,10 @@ # along with OpenFOAM. If not, see . # # File -# paraview3/cshrc-EXAMPLE +# config/example/paraview.csh # # Description -# Example of chaining to the standard paraview3/cshrc with a +# Example of chaining to the standard config/paraview.csh with a # different ParaView_VERSION # # Note @@ -35,10 +35,10 @@ #------------------------------------------------------------------------------ # -# Use other (shipped) cshrc with a different ParaView_VERSION +# Use other (shipped) paraview.csh with a different ParaView_VERSION # -set foamFile=`$WM_PROJECT_DIR/bin/foamEtcFile -mode o apps/paraview3/cshrc` +set foamFile=`$WM_PROJECT_DIR/bin/foamEtcFile -mode o config/paraview.csh` if ( $status == 0 ) source $foamFile ParaView_VERSION=3.9.0 unset foamFile diff --git a/etc/apps/paraview3/bashrc-EXAMPLE b/etc/config/example/paraview.sh similarity index 86% rename from etc/apps/paraview3/bashrc-EXAMPLE rename to etc/config/example/paraview.sh index 8db47a9ec7..09b300f137 100644 --- a/etc/apps/paraview3/bashrc-EXAMPLE +++ b/etc/config/example/paraview.sh @@ -22,10 +22,10 @@ # along with OpenFOAM. If not, see . # # File -# paraview3/bashrc-EXAMPLE +# config/example/paraview.sh # # Description -# Example of chaining to the standard paraview3/bashrc with a +# Example of chaining to the standard config/paraview.sh with a # different ParaView_VERSION # # Note @@ -35,10 +35,10 @@ #------------------------------------------------------------------------------ # -# Use other (shipped) bashrc with a different ParaView_VERSION +# Use other (shipped) paraview.sh with a different ParaView_VERSION # -foamFile=$($WM_PROJECT_DIR/bin/foamEtcFile -mode o apps/paraview3/bashrc 2>/dev/null) +foamFile=$($WM_PROJECT_DIR/bin/foamEtcFile -mode o config/paraview.sh 2>/dev/null) [ $? -eq 0 ] && . $foamFile ParaView_VERSION=3.9.0 unset foamFile diff --git a/etc/apps/paraview3/cshrc b/etc/config/paraview.csh similarity index 99% rename from etc/apps/paraview3/cshrc rename to etc/config/paraview.csh index 867353e843..c9adc6f198 100644 --- a/etc/apps/paraview3/cshrc +++ b/etc/config/paraview.csh @@ -22,7 +22,7 @@ # along with OpenFOAM. If not, see . # # File -# paraview3/cshrc +# config/paraview.csh # # Description # Setup file for paraview-3.x diff --git a/etc/apps/paraview3/bashrc b/etc/config/paraview.sh similarity index 99% rename from etc/apps/paraview3/bashrc rename to etc/config/paraview.sh index 1dd5386829..1c38b3dd3f 100644 --- a/etc/apps/paraview3/bashrc +++ b/etc/config/paraview.sh @@ -22,7 +22,7 @@ # along with OpenFOAM. If not, see . # # File -# paraview3/bashrc +# config/paraview.sh # # Description # Setup file for paraview-3.x @@ -113,7 +113,6 @@ else unset PV_PLUGIN_PATH fi - unset _foamParaviewEval unset cleaned cmake paraviewInstDir paraviewPython diff --git a/etc/apps/scotch/bashrc b/etc/config/scotch.sh similarity index 98% rename from etc/apps/scotch/bashrc rename to etc/config/scotch.sh index 0fb6952110..f32f62292c 100644 --- a/etc/apps/scotch/bashrc +++ b/etc/config/scotch.sh @@ -22,7 +22,7 @@ # along with OpenFOAM. If not, see . # # File -# scotch/bashrc +# config/scotch.sh # # Description # Setup file for scotch include/libraries. @@ -36,5 +36,4 @@ export SCOTCH_VERSION=scotch_5.1.11 export SCOTCH_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$SCOTCH_VERSION - # ----------------------------------------------------------------------------- diff --git a/etc/cshrc b/etc/cshrc index c2c1b12a9b..330fd66aa9 100644 --- a/etc/cshrc +++ b/etc/cshrc @@ -199,8 +199,8 @@ _foamSource $WM_PROJECT_DIR/etc/aliases.csh # Source user setup files for optional packages # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -_foamSource `$WM_PROJECT_DIR/bin/foamEtcFile apps/paraview3/cshrc` -_foamSource `$WM_PROJECT_DIR/bin/foamEtcFile apps/ensight/cshrc` +_foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config/paraview.csh` +_foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config/ensight.csh` # Clean environment paths again. Only remove duplicates diff --git a/src/parallel/decompose/Allwmake b/src/parallel/decompose/Allwmake index cded295a7e..b620b27791 100755 --- a/src/parallel/decompose/Allwmake +++ b/src/parallel/decompose/Allwmake @@ -3,13 +3,13 @@ cd ${0%/*} || exit 1 # run from this directory makeType=${1:-libso} # get SCOTCH_VERSION, SCOTCH_ARCH_PATH -if settings=`$WM_PROJECT_DIR/bin/foamEtcFile apps/scotch/bashrc` +if settings=`$WM_PROJECT_DIR/bin/foamEtcFile config/scotch.sh` then . $settings echo "using SCOTCH_ARCH_PATH=$SCOTCH_ARCH_PATH" else echo - echo "Error: no apps/scotch/bashrc settings" + echo "Error: no config/scotch.sh settings" echo fi