Switch to PyFoam version 0.6.1
This commit is contained in:
Martin Beaudoin
parent
5891662bc3
commit
6cd429d931
4 changed files with 213 additions and 9 deletions
3
ThirdParty/AllMake.stage3
vendored
3
ThirdParty/AllMake.stage3
vendored
|
|
@ -129,7 +129,8 @@ fi
|
||||||
if [ -z "$PYFOAM_SYSTEM" ]
|
if [ -z "$PYFOAM_SYSTEM" ]
|
||||||
then
|
then
|
||||||
# ( rpm_make -p PyFoam-0.5.6 -s PyFoam-0.5.6.spec -u http://openfoamwiki.net/images/b/b8/PyFoam-0.5.6.tar.gz -n PyFoam-0.5.6-1.noarch -a noarch)
|
# ( rpm_make -p PyFoam-0.5.6 -s PyFoam-0.5.6.spec -u http://openfoamwiki.net/images/b/b8/PyFoam-0.5.6.tar.gz -n PyFoam-0.5.6-1.noarch -a noarch)
|
||||||
( 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.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)
|
||||||
else
|
else
|
||||||
echo "Using system installed PyFoam"
|
echo "Using system installed PyFoam"
|
||||||
echo ""
|
echo ""
|
||||||
|
|
|
||||||
203
ThirdParty/rpmBuild/SPECS/PyFoam-0.6.1.spec
vendored
Normal file
203
ThirdParty/rpmBuild/SPECS/PyFoam-0.6.1.spec
vendored
Normal file
|
|
@ -0,0 +1,203 @@
|
||||||
|
#------------------------------------------------------------------------------
|
||||||
|
# ========= |
|
||||||
|
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
||||||
|
# \\ / O peration |
|
||||||
|
# \\ / A nd | Copyright held by original author
|
||||||
|
# \\/ M anipulation |
|
||||||
|
#------------------------------------------------------------------------------
|
||||||
|
# License
|
||||||
|
# This file is part of OpenFOAM.
|
||||||
|
#
|
||||||
|
# OpenFOAM 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 2 of the License, or (at your
|
||||||
|
# option) any later version.
|
||||||
|
#
|
||||||
|
# OpenFOAM 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 OpenFOAM; if not, write to the Free Software Foundation,
|
||||||
|
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||||
|
#
|
||||||
|
# Script
|
||||||
|
# RPM spec file for PyFoam-0.6.1
|
||||||
|
#
|
||||||
|
# Description
|
||||||
|
# RPM spec file for PyFoam version 0.6.1
|
||||||
|
#
|
||||||
|
# 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.1
|
||||||
|
|
||||||
|
%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/33/PyFoam-0.6.1.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
|
||||||
|
|
||||||
|
%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 OpenFOAM specific .csh and .sh files"
|
||||||
|
|
||||||
|
echo ""
|
||||||
|
echo "Generating OpenFOAM specific .csh and .sh files for the package %{name}-%{version}"
|
||||||
|
echo ""
|
||||||
|
#
|
||||||
|
# Generate package specific .sh file for OpenFOAM
|
||||||
|
#
|
||||||
|
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 OpenFOAM
|
||||||
|
#
|
||||||
|
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 OpenFOAM 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 OpenFOAM
|
||||||
|
#
|
||||||
|
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 OpenFOAM 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}
|
||||||
|
|
||||||
|
|
@ -193,12 +193,12 @@ case OPENMPI:
|
||||||
case SYSTEMOPENMPI:
|
case SYSTEMOPENMPI:
|
||||||
set mpi_version=openmpi-system
|
set mpi_version=openmpi-system
|
||||||
|
|
||||||
# make sure not the "old" mpi is used
|
# make sure not the "old" mpi is used
|
||||||
# Not sure if this is necessary anymore.
|
# Not sure if this is necessary anymore.
|
||||||
# export OPAL_PREFIX=
|
# export OPAL_PREFIX=
|
||||||
|
|
||||||
# Make sure OPENMPI_BIN_DIR is set and valid
|
# Make sure OPENMPI_BIN_DIR is set and valid
|
||||||
if ($?OPENMPI_BIN_DIR != 0 ) then
|
if ($?OPENMPI_BIN_DIR != 0 ) then
|
||||||
if (-d "${OPENMPI_BIN_DIR}" ) then
|
if (-d "${OPENMPI_BIN_DIR}" ) then
|
||||||
# User defined value specified for OPENMPI_BIN_DIR
|
# User defined value specified for OPENMPI_BIN_DIR
|
||||||
#
|
#
|
||||||
|
|
@ -225,7 +225,7 @@ case SYSTEMOPENMPI:
|
||||||
|
|
||||||
# Make sure OPENMPI_LIB_DIR is set
|
# Make sure OPENMPI_LIB_DIR is set
|
||||||
if ( $?OPENMPI_LIB_DIR == 0 ) then
|
if ( $?OPENMPI_LIB_DIR == 0 ) then
|
||||||
# Initialize OPENMPI_LIB_DIR using the path to mpicc
|
# Initialize OPENMPI_LIB_DIR using the path to mpicc
|
||||||
setenv OPENMPI_LIB_DIR "`mpicc --showme:libdirs`"
|
setenv OPENMPI_LIB_DIR "`mpicc --showme:libdirs`"
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
@ -417,7 +417,7 @@ if ( $?PARMGRIDGEN_SYSTEM == 0 && -e $WM_THIRD_PARTY_DIR/packages/ParMGridGen-1.
|
||||||
_foamSource $WM_THIRD_PARTY_DIR/packages/ParMGridGen-1.0/platforms/$WM_OPTIONS/etc/ParMGridGen-1.0.csh
|
_foamSource $WM_THIRD_PARTY_DIR/packages/ParMGridGen-1.0/platforms/$WM_OPTIONS/etc/ParMGridGen-1.0.csh
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# Load Libccmio library
|
# Load Libccmio library
|
||||||
# ~~~~~~~~~~~~~~~~~~~~~
|
# ~~~~~~~~~~~~~~~~~~~~~
|
||||||
if ( $?LIBCCMIO_SYSTEM == 0 && -e $WM_THIRD_PARTY_DIR/packages/libccmio-2.6.1/platforms/$WM_OPTIONS ) then
|
if ( $?LIBCCMIO_SYSTEM == 0 && -e $WM_THIRD_PARTY_DIR/packages/libccmio-2.6.1/platforms/$WM_OPTIONS ) then
|
||||||
_foamSource $WM_THIRD_PARTY_DIR/packages/libccmio-2.6.1/platforms/$WM_OPTIONS/etc/libccmio-2.6.1.csh
|
_foamSource $WM_THIRD_PARTY_DIR/packages/libccmio-2.6.1/platforms/$WM_OPTIONS/etc/libccmio-2.6.1.csh
|
||||||
|
|
@ -452,8 +452,8 @@ endif
|
||||||
|
|
||||||
# PyFoam
|
# PyFoam
|
||||||
# ~~~~~~
|
# ~~~~~~
|
||||||
if ( $?PYFOAM_SYSTEM == 0 && -e "$WM_THIRD_PARTY_DIR"/packages/PyFoam-0.5.7/platforms/noarch ) then
|
if ( $?PYFOAM_SYSTEM == 0 && -e "$WM_THIRD_PARTY_DIR"/packages/PyFoam-0.6.1/platforms/noarch ) then
|
||||||
_foamSource $WM_THIRD_PARTY_DIR/packages/PyFoam-0.5.7/platforms/noarch/etc/PyFoam-0.5.7.csh
|
_foamSource $WM_THIRD_PARTY_DIR/packages/PyFoam-0.6.1/platforms/noarch/etc/PyFoam-0.6.1.csh
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# QT
|
# QT
|
||||||
|
|
|
||||||
|
|
@ -540,8 +540,8 @@ export MPI_BUFFER_SIZE
|
||||||
|
|
||||||
# Load PyFoam
|
# Load PyFoam
|
||||||
# ~~~~~~~~~~~
|
# ~~~~~~~~~~~
|
||||||
[ -z "$PYFOAM_SYSTEM" ] && [ -e $WM_THIRD_PARTY_DIR/packages/PyFoam-0.5.7/platforms/noarch ] && {
|
[ -z "$PYFOAM_SYSTEM" ] && [ -e $WM_THIRD_PARTY_DIR/packages/PyFoam-0.6.1/platforms/noarch ] && {
|
||||||
_foamSource $WM_THIRD_PARTY_DIR/packages/PyFoam-0.5.7/platforms/noarch/etc/PyFoam-0.5.7.sh
|
_foamSource $WM_THIRD_PARTY_DIR/packages/PyFoam-0.6.1/platforms/noarch/etc/PyFoam-0.6.1.sh
|
||||||
}
|
}
|
||||||
[ "$FOAM_VERBOSE" -a "$PS1" ] && echo " PYFOAM_DIR is initialized to: $PYFOAM_DIR"
|
[ "$FOAM_VERBOSE" -a "$PS1" ] && echo " PYFOAM_DIR is initialized to: $PYFOAM_DIR"
|
||||||
|
|
||||||
|
|
|
||||||
Reference in a new issue