From 17a3e1276322eca9ea8e6ad3a1ea689f76e26e2d Mon Sep 17 00:00:00 2001 From: Martin Beaudoin Date: Wed, 27 Jun 2018 22:56:01 -0400 Subject: [PATCH] ThirdParty: add support for PyFoam version 0.6.6 and 0.6.9. Make PyFoam 0.6.9 the default version --- ThirdParty/AllMake.stage3 | 12 ++ ThirdParty/rpmBuild/SPECS/PyFoam-0.6.6.spec | 205 ++++++++++++++++++++ ThirdParty/rpmBuild/SPECS/PyFoam-0.6.9.spec | 205 ++++++++++++++++++++ etc/bashrc | 2 +- etc/cshrc | 2 +- etc/prefs.csh-EXAMPLE | 2 +- etc/prefs.sh-EXAMPLE | 2 +- etc/prefs.sh.mingw | 2 +- etc/settings.csh | 6 + etc/settings.sh | 6 + 10 files changed, 439 insertions(+), 5 deletions(-) create mode 100644 ThirdParty/rpmBuild/SPECS/PyFoam-0.6.6.spec create mode 100644 ThirdParty/rpmBuild/SPECS/PyFoam-0.6.9.spec diff --git a/ThirdParty/AllMake.stage3 b/ThirdParty/AllMake.stage3 index 4ce9fbab9..a54a1d3ac 100755 --- a/ThirdParty/AllMake.stage3 +++ b/ThirdParty/AllMake.stage3 @@ -183,6 +183,18 @@ then echo "Building PyFoam 0.6.4" ( rpm_make -p PyFoam-0.6.4 -s PyFoam-0.6.4.spec -u http://openfoamwiki.net/images/3/3b/PyFoam-0.6.4.tar.gz -n PyFoam-0.6.4-1.noarch -a noarch) } + # PyFoam 0.6.6 + # + [ ! -z "$WM_THIRD_PARTY_USE_PYFOAM_066" ] && { + echo "Building PyFoam 0.6.6" + ( rpm_make -p PyFoam-0.6.6 -s PyFoam-0.6.6.spec -u https://openfoamwiki.net/images/a/af/PyFoam-0.6.6.tar.gz -n PyFoam-0.6.6-1.noarch -a noarch) + } + # PyFoam 0.6.9 + # + [ ! -z "$WM_THIRD_PARTY_USE_PYFOAM_069" ] && { + echo "Building PyFoam 0.6.9" + ( rpm_make -p PyFoam-0.6.9 -s PyFoam-0.6.9.spec -u https://files.pythonhosted.org/packages/78/f5/8f65b66c8ac0e5415f785809e182dd0f0dc562a42094e1a86bd22c7d7ece/PyFoam-0.6.9.tar.gz -n PyFoam-0.6.9-1.noarch -a noarch) + } else echo "Using system installed PyFoam" echo "" diff --git a/ThirdParty/rpmBuild/SPECS/PyFoam-0.6.6.spec b/ThirdParty/rpmBuild/SPECS/PyFoam-0.6.6.spec new file mode 100644 index 000000000..86665fe1a --- /dev/null +++ b/ThirdParty/rpmBuild/SPECS/PyFoam-0.6.6.spec @@ -0,0 +1,205 @@ +#------------------------------------------------------------------------------ +# ========= | +# \\ / F ield | foam-extend: Open Source CFD +# \\ / O peration | +# \\ / A nd | For copyright notice see file Copyright +# \\/ M anipulation | +#------------------------------------------------------------------------------ +# License +# This file is part of foam-extend. +# +# foam-extend is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation, either version 3 of the License, or (at your +# option) any later version. +# +# foam-extend is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with foam-extend. If not, see . +# +# Script +# RPM spec file for PyFoam-0.6.6 +# +# Description +# RPM spec file for PyFoam version 0.6.6 +# +# Author: +# Martin Beaudoin (2018) +# +#------------------------------------------------------------------------------ + +# We grab the value of WM_THIRD_PARTY and WM_OPTIONS from the environment variable +%{expand:%%define _WM_THIRD_PARTY_DIR %(echo $WM_THIRD_PARTY_DIR)} +%{expand:%%define _WM_OPTIONS %(echo $WM_OPTIONS)} + +# Disable the generation of debuginfo packages +%define debug_package %{nil} + +# The topdir needs to point to the $WM_THIRD_PARTY/rpmbuild directory +%define _topdir %{_WM_THIRD_PARTY_DIR}/rpmBuild +%define _tmppath %{_topdir}/tmp + +# Will install the package directly $WM_THIRD_PARTY_DIR +# Some comments about package relocation: +# By using this prefix for the Prefix: parameter in this file, you will make this +# package relocatable. +# +# This is fine, as long as your software is itself relocatable. +# +# Simply take note that libraries built with libtool are not relocatable because the +# prefix we specify will be hard-coded in the library .la files. +# Ref: http://sourceware.org/autobook/autobook/autobook_80.html +# +# In that case, if you ever change the value of the $WM_THIRD_PARTY_DIR, you will +# not be able to reutilize this RPM, even though it is relocatable. You will need to +# regenerate the RPM. +# +%define _prefix %{_WM_THIRD_PARTY_DIR} + +%define name PyFoam +%define release 1 +%define version 0.6.6 + +%define buildroot %{_topdir}/BUILD/%{name}-%{version}-root + +BuildRoot: %{buildroot} +Summary: PyFoam +License: Unkown +Name: %{name} +Version: %{version} +Release: %{release} +BuildArch: noarch +URL: https://openfoamwiki.net/images/a/af/PyFoam-0.6.6.tar.gz +Source: %url/%{name}-%{version}.tar.gz +Prefix: %{_prefix} +Group: Development/Tools + +%define _installPrefix %{_prefix}/packages/%{name}-%{version}/platforms/noarch + +%description +%{summary} + +%prep +%setup -q -n PyFoam-%{version} + +%build + # Make the shebang line portable + python setup.py build --executable "/usr/bin/env python" + +%install + %define pythonVersion $(python -V 2>&1 | awk -F ' ' {'print $2'} | awk -F \. {'print $1 "." $2'}) + + # Temporary settings for the installation + mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/lib/python%{pythonVersion}/site-packages + export PYTHONPATH=$RPM_BUILD_ROOT/%{_installPrefix}/lib/python%{pythonVersion}/site-packages:$PYTHONPATH + python setup.py install --prefix=$RPM_BUILD_ROOT/%{_installPrefix} + + + # Creation of foam-extend specific .csh and .sh files" + + echo "" + echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}" + echo "" + # + # Generate package specific .sh file for foam-extend + # +mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc +cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh +# Load %{name}-%{version} libraries and binaries if available +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +export PYFOAM_DIR=\$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/noarch +export PYTHONPATH=\$PYFOAM_DIR/lib/python%{pythonVersion}/site-packages:\$PYTHONPATH + +# Enable access to the package applications if present +[ -d \$PYFOAM_DIR/bin ] && _foamAddPath \$PYFOAM_DIR/bin + +DOT_SH_EOF + + # + # Generate package specific .csh file for foam-extend + # +cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh +# Load %{name}-%{version} libraries and binaries if available +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +setenv PYFOAM_DIR \$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/noarch + +if ! \$?PYTHONPATH then + setenv PYTHONPATH \$PYFOAM_DIR/lib/python%{pythonVersion}/site-packages +else + setenv PYTHONPATH \$PYFOAM_DIR/lib/python%{pythonVersion}/site-packages:\$PYTHONPATH +endif + + +if ( -e \$PYFOAM_DIR/bin ) then + _foamAddPath \$PYFOAM_DIR/bin +endif + +if \$?PYFOAM_SITE_DIR then + if ( -e \$PYFOAM_SITE_DIR/bin ) then + _foamAddPath \$PYFOAM_SITE_DIR/bin + endif +endif +DOT_CSH_EOF + +cat << DOT_HARDCODED_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}_hardcoded.sh +# In this version of the configuration script, the paths are hardcoded, +# which makes it easier to load PyFoam without the foam-extend environment +# variables +# +# Load %{name}-%{version} libraries and binaries if available +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +export PYFOAM_DIR=$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/noarch +export PYTHONPATH=\$PYFOAM_DIR/lib/python%{pythonVersion}/site-packages:\$PYTHONPATH + +# Enable access to the package applications if present +[ -d \$PYFOAM_DIR/bin ] && export PATH=\$PYFOAM_DIR/bin:\$PATH + +DOT_HARDCODED_SH_EOF + + # + # Generate package specific .csh file for foam-extend + # +cat << DOT_HARDCODED_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}_hardcoded.csh +# In this version of the configuration script, the paths are hardcoded, +# which makes it easier to load PyFoam without the foam-extend environment +# variables +# +# Load %{name}-%{version} libraries and binaries if available +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +setenv PYFOAM_DIR $WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/noarch + +if ! \$?PYTHONPATH then + setenv PYTHONPATH \$PYFOAM_DIR/lib/python%{pythonVersion}/site-packages +else + setenv PYTHONPATH \$PYFOAM_DIR/lib/python%{pythonVersion}/site-packages:\$PYTHONPATH +endif + + +if ( -e \$PYFOAM_DIR/bin ) then + _foamAddPath \$PYFOAM_DIR/bin +endif + +if \$?PYFOAM_SITE_DIR then + if ( -e \$PYFOAM_SITE_DIR/bin ) then + _foamAddPath \$PYFOAM_SITE_DIR/bin + endif +endif +DOT_HARDCODED_CSH_EOF + + #finally, generate a .tgz file for systems where using rpm for installing packages + # as a non-root user might be a problem. + (mkdir -p %{_topdir}/TGZS/%{_target_cpu}; cd $RPM_BUILD_ROOT/%{_prefix}; tar -zcvf %{_topdir}/TGZS/%{_target_cpu}/%{name}-%{version}.tgz packages/%{name}-%{version}) + + +%clean +rm -rf %{buildroot} + +%files +%defattr(-,root,root) +%{_installPrefix} diff --git a/ThirdParty/rpmBuild/SPECS/PyFoam-0.6.9.spec b/ThirdParty/rpmBuild/SPECS/PyFoam-0.6.9.spec new file mode 100644 index 000000000..8581c63d6 --- /dev/null +++ b/ThirdParty/rpmBuild/SPECS/PyFoam-0.6.9.spec @@ -0,0 +1,205 @@ +#------------------------------------------------------------------------------ +# ========= | +# \\ / F ield | foam-extend: Open Source CFD +# \\ / O peration | +# \\ / A nd | For copyright notice see file Copyright +# \\/ M anipulation | +#------------------------------------------------------------------------------ +# License +# This file is part of foam-extend. +# +# foam-extend is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation, either version 3 of the License, or (at your +# option) any later version. +# +# foam-extend is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with foam-extend. If not, see . +# +# Script +# RPM spec file for PyFoam-0.6.9 +# +# Description +# RPM spec file for PyFoam version 0.6.9 +# +# Author: +# Martin Beaudoin (2018) +# +#------------------------------------------------------------------------------ + +# We grab the value of WM_THIRD_PARTY and WM_OPTIONS from the environment variable +%{expand:%%define _WM_THIRD_PARTY_DIR %(echo $WM_THIRD_PARTY_DIR)} +%{expand:%%define _WM_OPTIONS %(echo $WM_OPTIONS)} + +# Disable the generation of debuginfo packages +%define debug_package %{nil} + +# The topdir needs to point to the $WM_THIRD_PARTY/rpmbuild directory +%define _topdir %{_WM_THIRD_PARTY_DIR}/rpmBuild +%define _tmppath %{_topdir}/tmp + +# Will install the package directly $WM_THIRD_PARTY_DIR +# Some comments about package relocation: +# By using this prefix for the Prefix: parameter in this file, you will make this +# package relocatable. +# +# This is fine, as long as your software is itself relocatable. +# +# Simply take note that libraries built with libtool are not relocatable because the +# prefix we specify will be hard-coded in the library .la files. +# Ref: http://sourceware.org/autobook/autobook/autobook_80.html +# +# In that case, if you ever change the value of the $WM_THIRD_PARTY_DIR, you will +# not be able to reutilize this RPM, even though it is relocatable. You will need to +# regenerate the RPM. +# +%define _prefix %{_WM_THIRD_PARTY_DIR} + +%define name PyFoam +%define release 1 +%define version 0.6.9 + +%define buildroot %{_topdir}/BUILD/%{name}-%{version}-root + +BuildRoot: %{buildroot} +Summary: PyFoam +License: Unkown +Name: %{name} +Version: %{version} +Release: %{release} +BuildArch: noarch +URL: https://files.pythonhosted.org/packages/78/f5/8f65b66c8ac0e5415f785809e182dd0f0dc562a42094e1a86bd22c7d7ece/PyFoam-0.6.9.tar.gz +Source: %url/%{name}-%{version}.tar.gz +Prefix: %{_prefix} +Group: Development/Tools + +%define _installPrefix %{_prefix}/packages/%{name}-%{version}/platforms/noarch + +%description +%{summary} + +%prep +%setup -q -n PyFoam-%{version} + +%build + # Make the shebang line portable + python setup.py build --executable "/usr/bin/env python" + +%install + %define pythonVersion $(python -V 2>&1 | awk -F ' ' {'print $2'} | awk -F \. {'print $1 "." $2'}) + + # Temporary settings for the installation + mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/lib/python%{pythonVersion}/site-packages + export PYTHONPATH=$RPM_BUILD_ROOT/%{_installPrefix}/lib/python%{pythonVersion}/site-packages:$PYTHONPATH + python setup.py install --prefix=$RPM_BUILD_ROOT/%{_installPrefix} + + + # Creation of foam-extend specific .csh and .sh files" + + echo "" + echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}" + echo "" + # + # Generate package specific .sh file for foam-extend + # +mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc +cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh +# Load %{name}-%{version} libraries and binaries if available +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +export PYFOAM_DIR=\$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/noarch +export PYTHONPATH=\$PYFOAM_DIR/lib/python%{pythonVersion}/site-packages:\$PYTHONPATH + +# Enable access to the package applications if present +[ -d \$PYFOAM_DIR/bin ] && _foamAddPath \$PYFOAM_DIR/bin + +DOT_SH_EOF + + # + # Generate package specific .csh file for foam-extend + # +cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh +# Load %{name}-%{version} libraries and binaries if available +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +setenv PYFOAM_DIR \$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/noarch + +if ! \$?PYTHONPATH then + setenv PYTHONPATH \$PYFOAM_DIR/lib/python%{pythonVersion}/site-packages +else + setenv PYTHONPATH \$PYFOAM_DIR/lib/python%{pythonVersion}/site-packages:\$PYTHONPATH +endif + + +if ( -e \$PYFOAM_DIR/bin ) then + _foamAddPath \$PYFOAM_DIR/bin +endif + +if \$?PYFOAM_SITE_DIR then + if ( -e \$PYFOAM_SITE_DIR/bin ) then + _foamAddPath \$PYFOAM_SITE_DIR/bin + endif +endif +DOT_CSH_EOF + +cat << DOT_HARDCODED_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}_hardcoded.sh +# In this version of the configuration script, the paths are hardcoded, +# which makes it easier to load PyFoam without the foam-extend environment +# variables +# +# Load %{name}-%{version} libraries and binaries if available +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +export PYFOAM_DIR=$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/noarch +export PYTHONPATH=\$PYFOAM_DIR/lib/python%{pythonVersion}/site-packages:\$PYTHONPATH + +# Enable access to the package applications if present +[ -d \$PYFOAM_DIR/bin ] && export PATH=\$PYFOAM_DIR/bin:\$PATH + +DOT_HARDCODED_SH_EOF + + # + # Generate package specific .csh file for foam-extend + # +cat << DOT_HARDCODED_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}_hardcoded.csh +# In this version of the configuration script, the paths are hardcoded, +# which makes it easier to load PyFoam without the foam-extend environment +# variables +# +# Load %{name}-%{version} libraries and binaries if available +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +setenv PYFOAM_DIR $WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/noarch + +if ! \$?PYTHONPATH then + setenv PYTHONPATH \$PYFOAM_DIR/lib/python%{pythonVersion}/site-packages +else + setenv PYTHONPATH \$PYFOAM_DIR/lib/python%{pythonVersion}/site-packages:\$PYTHONPATH +endif + + +if ( -e \$PYFOAM_DIR/bin ) then + _foamAddPath \$PYFOAM_DIR/bin +endif + +if \$?PYFOAM_SITE_DIR then + if ( -e \$PYFOAM_SITE_DIR/bin ) then + _foamAddPath \$PYFOAM_SITE_DIR/bin + endif +endif +DOT_HARDCODED_CSH_EOF + + #finally, generate a .tgz file for systems where using rpm for installing packages + # as a non-root user might be a problem. + (mkdir -p %{_topdir}/TGZS/%{_target_cpu}; cd $RPM_BUILD_ROOT/%{_prefix}; tar -zcvf %{_topdir}/TGZS/%{_target_cpu}/%{name}-%{version}.tgz packages/%{name}-%{version}) + + +%clean +rm -rf %{buildroot} + +%files +%defattr(-,root,root) +%{_installPrefix} diff --git a/etc/bashrc b/etc/bashrc index bc0be3e30..da1b4816d 100755 --- a/etc/bashrc +++ b/etc/bashrc @@ -106,7 +106,7 @@ export WM_THIRD_PARTY_USE_LIBCCMIO_261=1 export WM_THIRD_PARTY_USE_MESQUITE_212=1 export WM_THIRD_PARTY_USE_SCOTCH_604=1 export WM_THIRD_PARTY_USE_PARMETIS_403=1 -export WM_THIRD_PARTY_USE_PYFOAM_064=1 +export WM_THIRD_PARTY_USE_PYFOAM_069=1 export WM_THIRD_PARTY_USE_HWLOC_201=1 # diff --git a/etc/cshrc b/etc/cshrc index b695d7bfa..ee2e50dc1 100644 --- a/etc/cshrc +++ b/etc/cshrc @@ -92,7 +92,7 @@ setenv WM_THIRD_PARTY_USE_LIBCCMIO_261 1 setenv WM_THIRD_PARTY_USE_MESQUITE_212 1 setenv WM_THIRD_PARTY_USE_SCOTCH_604 1 setenv WM_THIRD_PARTY_USE_PARMETIS_403 1 -setenv WM_THIRD_PARTY_USE_PYFOAM_064 1 +setenv WM_THIRD_PARTY_USE_PYFOAM_069 1 setenv WM_THIRD_PARTY_USE_HWLOC_201 1 # diff --git a/etc/prefs.csh-EXAMPLE b/etc/prefs.csh-EXAMPLE index db0e87e98..4edcdd9e1 100644 --- a/etc/prefs.csh-EXAMPLE +++ b/etc/prefs.csh-EXAMPLE @@ -230,7 +230,7 @@ setenv WM_THIRD_PARTY_USE_SCOTCH_604 1 #setenv WM_THIRD_PARTY_USE_SCOTCH_600 1 setenv WM_THIRD_PARTY_USE_PARMETIS_403 1 #setenv WM_THIRD_PARTY_USE_ZOLTAN_36 1 -setenv WM_THIRD_PARTY_USE_PYFOAM_064 1 +setenv WM_THIRD_PARTY_USE_PYFOAM_069 1 setenv WM_THIRD_PARTY_USE_HWLOC_201 1 #setenv WM_THIRD_PARTY_USE_HWLOC_1101 1 #setenv WM_THIRD_PARTY_USE_HWLOC_172 1 diff --git a/etc/prefs.sh-EXAMPLE b/etc/prefs.sh-EXAMPLE index a0df31222..a93be19ff 100644 --- a/etc/prefs.sh-EXAMPLE +++ b/etc/prefs.sh-EXAMPLE @@ -243,7 +243,7 @@ export WM_THIRD_PARTY_USE_SCOTCH_604=1 #export WM_THIRD_PARTY_USE_SCOTCH_600=1 export WM_THIRD_PARTY_USE_PARMETIS_403=1 #export WM_THIRD_PARTY_USE_ZOLTAN_36=1 -export WM_THIRD_PARTY_USE_PYFOAM_064=1 +export WM_THIRD_PARTY_USE_PYFOAM_069=1 export WM_THIRD_PARTY_USE_HWLOC_201=1 #export WM_THIRD_PARTY_USE_HWLOC_1101=1 #export WM_THIRD_PARTY_USE_HWLOC_172=1 diff --git a/etc/prefs.sh.mingw b/etc/prefs.sh.mingw index 07acfccaa..6b8d19835 100644 --- a/etc/prefs.sh.mingw +++ b/etc/prefs.sh.mingw @@ -229,7 +229,7 @@ export PARAVIEW_BIN_DIR=$PARAVIEW_DIR/bin ##export WM_THIRD_PARTY_USE_SCOTCH_600=1 #export WM_THIRD_PARTY_USE_PARMETIS_403=1 ##export WM_THIRD_PARTY_USE_ZOLTAN_36=1 -#export WM_THIRD_PARTY_USE_PYFOAM_064=1 +#export WM_THIRD_PARTY_USE_PYFOAM_069=1 #export WM_THIRD_PARTY_USE_HWLOC_201=1 #export WM_THIRD_PARTY_USE_HWLOC_1101=1 #export WM_THIRD_PARTY_USE_HWLOC_172=1 diff --git a/etc/settings.csh b/etc/settings.csh index 187163500..6465ff0aa 100644 --- a/etc/settings.csh +++ b/etc/settings.csh @@ -606,6 +606,12 @@ endif if ( $?PYFOAM_SYSTEM == 0 && $?WM_THIRD_PARTY_USE_PYFOAM_064 != 0 && -e "$WM_THIRD_PARTY_DIR"/packages/PyFoam-0.6.4/platforms/noarch ) then _foamSource $WM_THIRD_PARTY_DIR/packages/PyFoam-0.6.4/platforms/noarch/etc/PyFoam-0.6.4.csh endif +if ( $?PYFOAM_SYSTEM == 0 && $?WM_THIRD_PARTY_USE_PYFOAM_066 != 0 && -e "$WM_THIRD_PARTY_DIR"/packages/PyFoam-0.6.6/platforms/noarch ) then + _foamSource $WM_THIRD_PARTY_DIR/packages/PyFoam-0.6.6/platforms/noarch/etc/PyFoam-0.6.6.csh +endif +if ( $?PYFOAM_SYSTEM == 0 && $?WM_THIRD_PARTY_USE_PYFOAM_069 != 0 && -e "$WM_THIRD_PARTY_DIR"/packages/PyFoam-0.6.9/platforms/noarch ) then + _foamSource $WM_THIRD_PARTY_DIR/packages/PyFoam-0.6.9/platforms/noarch/etc/PyFoam-0.6.9.csh +endif # hwloc # ~~~~~ diff --git a/etc/settings.sh b/etc/settings.sh index 01ca5b2cd..8084d2569 100755 --- a/etc/settings.sh +++ b/etc/settings.sh @@ -718,6 +718,12 @@ export MPI_BUFFER_SIZE [ -z "$PYFOAM_SYSTEM" ] && [ ! -z $WM_THIRD_PARTY_USE_PYFOAM_064 ] && [ -e $WM_THIRD_PARTY_DIR/packages/PyFoam-0.6.4/platforms/noarch ] && { _foamSource $WM_THIRD_PARTY_DIR/packages/PyFoam-0.6.4/platforms/noarch/etc/PyFoam-0.6.4.sh } +[ -z "$PYFOAM_SYSTEM" ] && [ ! -z $WM_THIRD_PARTY_USE_PYFOAM_066 ] && [ -e $WM_THIRD_PARTY_DIR/packages/PyFoam-0.6.6/platforms/noarch ] && { + _foamSource $WM_THIRD_PARTY_DIR/packages/PyFoam-0.6.6/platforms/noarch/etc/PyFoam-0.6.6.sh +} +[ -z "$PYFOAM_SYSTEM" ] && [ ! -z $WM_THIRD_PARTY_USE_PYFOAM_069 ] && [ -e $WM_THIRD_PARTY_DIR/packages/PyFoam-0.6.9/platforms/noarch ] && { + _foamSource $WM_THIRD_PARTY_DIR/packages/PyFoam-0.6.9/platforms/noarch/etc/PyFoam-0.6.9.sh +} [ "$FOAM_VERBOSE" -a "$PS1" ] && echo " PYFOAM_DIR is initialized to: $PYFOAM_DIR" # Make sure that there is a special directory for special PyFoam-scripts