From 7cd32a2da3ae02c095051fc3e898b3d414ad4136 Mon Sep 17 00:00:00 2001 From: "Bernhard F.W. Gschaider" Date: Mon, 24 Nov 2014 21:29:09 +0100 Subject: [PATCH] Support pyFoam version 0.6.4 --- ThirdParty/AllMake.stage3 | 3 +- ThirdParty/rpmBuild/SPECS/PyFoam-0.6.4.spec | 201 ++++++++++++++++++++ etc/settings.csh | 4 +- etc/settings.sh | 4 +- 4 files changed, 207 insertions(+), 5 deletions(-) create mode 100644 ThirdParty/rpmBuild/SPECS/PyFoam-0.6.4.spec diff --git a/ThirdParty/AllMake.stage3 b/ThirdParty/AllMake.stage3 index 2823998c5..3f724ad65 100755 --- a/ThirdParty/AllMake.stage3 +++ b/ThirdParty/AllMake.stage3 @@ -133,7 +133,8 @@ then # ( rpm_make -p PyFoam-0.5.7 -s PyFoam-0.5.7.spec -u http://openfoamwiki.net/images/d/dc/PyFoam-0.5.7.tar.gz -n PyFoam-0.5.7-1.noarch -a noarch) # ( rpm_make -p PyFoam-0.6.1 -s PyFoam-0.6.1.spec -u http://openfoamwiki.net/images/3/33/PyFoam-0.6.1.tar.gz -n PyFoam-0.6.1-1.noarch -a noarch) # ( rpm_make -p PyFoam-0.6.2 -s PyFoam-0.6.2.spec -u http://openfoamwiki.net/images/8/89/PyFoam-0.6.2.tar.gz -n PyFoam-0.6.2-1.noarch -a noarch) - ( rpm_make -p PyFoam-0.6.3 -s PyFoam-0.6.3.spec -u http://downloads.sourceforge.net/project/openfoam-extend/foam-extend-3.1/ThirdParty/PyFoam-0.6.1.tar.gz ) +# ( rpm_make -p PyFoam-0.6.3 -s PyFoam-0.6.3.spec -u http://downloads.sourceforge.net/project/openfoam-extend/foam-extend-3.1/ThirdParty/PyFoam-0.6.1.tar.gz ) + ( 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 ) else echo "Using system installed PyFoam" echo "" diff --git a/ThirdParty/rpmBuild/SPECS/PyFoam-0.6.4.spec b/ThirdParty/rpmBuild/SPECS/PyFoam-0.6.4.spec new file mode 100644 index 000000000..500715fbf --- /dev/null +++ b/ThirdParty/rpmBuild/SPECS/PyFoam-0.6.4.spec @@ -0,0 +1,201 @@ +#------------------------------------------------------------------------------ +# ========= | +# \\ / 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.4 +# +# Description +# RPM spec file for PyFoam version 0.6.4 +# +# Author: +# Martin Beaudoin, Hydro-Quebec, (2013) +# +#------------------------------------------------------------------------------ + +# 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.4 + +%define buildroot %{_topdir}/BUILD/%{name}-%{version}-root + +BuildRoot: %{buildroot} +Summary: PyFoam +License: Unkown +Name: %{name} +Version: %{version} +Release: %{release} +BuildArch: noarch +URL: http://openfoamwiki.net/images/3/3b/PyFoam-0.6.4.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 + python setup.py install --prefix=$RPM_BUILD_ROOT/%{_installPrefix} + + %define pythonVersion $(python -V 2>&1 | awk -F ' ' {'print $2'} | awk -F \. {'print $1 "." $2'}) + + # 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/settings.csh b/etc/settings.csh index 365197b45..f11adf99e 100644 --- a/etc/settings.csh +++ b/etc/settings.csh @@ -526,8 +526,8 @@ endif # PyFoam # ~~~~~~ -if ( $?PYFOAM_SYSTEM == 0 && -e "$WM_THIRD_PARTY_DIR"/packages/PyFoam-0.6.3/platforms/noarch ) then - _foamSource $WM_THIRD_PARTY_DIR/packages/PyFoam-0.6.3/platforms/noarch/etc/PyFoam-0.6.3.csh +if ( $?PYFOAM_SYSTEM == 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 # hwloc diff --git a/etc/settings.sh b/etc/settings.sh index fd6001e2d..152524462 100644 --- a/etc/settings.sh +++ b/etc/settings.sh @@ -635,8 +635,8 @@ export MPI_BUFFER_SIZE # Load PyFoam # ~~~~~~~~~~~ -[ -z "$PYFOAM_SYSTEM" ] && [ -e $WM_THIRD_PARTY_DIR/packages/PyFoam-0.6.3/platforms/noarch ] && { - _foamSource $WM_THIRD_PARTY_DIR/packages/PyFoam-0.6.3/platforms/noarch/etc/PyFoam-0.6.3.sh +[ -z "$PYFOAM_SYSTEM" ] && [ -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 } [ "$FOAM_VERBOSE" -a "$PS1" ] && echo " PYFOAM_DIR is initialized to: $PYFOAM_DIR"