exaFOAM/foam-extend4.1-coherent-io
Archived
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge commit '3b1d59ba9fa705808edb5937f14847722ed0f7c6' into nextRelease

Browse source
This commit is contained in:
Henrik Rusche 2014-06-01 10:42:15 +02:00
commit bec862249a
6 changed files with 59 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
ThirdParty/AllClean vendored
View file

@ -27,6 +27,7 @@
# #
# Description # Description
# Cleanup script for ThirdParty packages. # Cleanup script for ThirdParty packages.
# Add option alsoPackage to remove the installed files.
# #
# Author: # Author:
# Martin Beaudoin, Hydro-Quebec, (2013) # Martin Beaudoin, Hydro-Quebec, (2013)
@ -50,22 +51,22 @@ echo ========================================
echo echo
# Cleaning stage 1 # Cleaning stage 1
./AllClean.stage1 ./AllClean.stage1 $1
# Cleaning stage 2 # Cleaning stage 2
./AllClean.stage2 ./AllClean.stage2 $1
# Cleaning stage 3 # Cleaning stage 3
./AllClean.stage3 ./AllClean.stage3 $1
# Cleaning stage 4 # Cleaning stage 4
./AllClean.stage4 ./AllClean.stage4 $1
# Cleaning stage 5 # Cleaning stage 5
./AllClean.stage5 ./AllClean.stage5 $1
# Cleaning stage 6 # Cleaning stage 6
./AllClean.stage6 ./AllClean.stage6 $1
echo ======================================== echo ========================================
echo Done ThirdParty Allclean echo Done ThirdParty Allclean

21
ThirdParty/AllClean.stage1 vendored
View file

@ -27,6 +27,7 @@
# #
# Description # Description
# Cleaning script for ThirdParty packages: Stage1 # Cleaning script for ThirdParty packages: Stage1
# Add option alsoPackage to remove the installed files.
# #
# Author: # Author:
# Martin Beaudoin, Hydro-Quebec, (2013) # Martin Beaudoin, Hydro-Quebec, (2013)
@ -50,32 +51,32 @@ echo ========================================
echo echo
# gmp # gmp
uninstallPackage gmp-5.0.1 uninstallPackage gmp-5.0.1 $1
# mpfr # mpfr
uninstallPackage mpfr-3.0.1 uninstallPackage mpfr-3.0.1 $1
# gcc # gcc
uninstallPackage gcc-4.4.5 uninstallPackage gcc-4.4.5 $1
uninstallPackage gcc-4.5.1 uninstallPackage gcc-4.5.1 $1
# mpc # mpc
uninstallPackage mpc-0.8.2 uninstallPackage mpc-0.8.2 $1
#Python #Python
uninstallPackage Python-2.7 uninstallPackage Python-2.7 $1
# m4 # m4
uninstallPackage m4-1.4.16 uninstallPackage m4-1.4.16 $1
# bison # bison
uninstallPackage bison-2.4.3 uninstallPackage bison-2.4.3 $1
# flex # flex
uninstallPackage flex-2.5.35 uninstallPackage flex-2.5.35 $1
# cmake # cmake
uninstallPackage cmake-2.8.11 uninstallPackage cmake-2.8.12 $1
echo echo

11
ThirdParty/AllClean.stage2 vendored
View file

@ -30,6 +30,7 @@
# #
# Author: # Author:
# Martin Beaudoin, Hydro-Quebec, (2013) # Martin Beaudoin, Hydro-Quebec, (2013)
# Add option alsoPackage to remove the installed files.
# #
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# run from third-party directory only # run from third-party directory only
@ -50,11 +51,11 @@ echo ========================================
echo echo
# openmpi # openmpi
uninstallPackage openmpi-1.4.1 uninstallPackage openmpi-1.4.1 $1
uninstallPackage openmpi-1.4.3 uninstallPackage openmpi-1.4.3 $1
uninstallPackage openmpi-1.5 uninstallPackage openmpi-1.5 $1
uninstallPackage openmpi-1.6.3 uninstallPackage openmpi-1.6.3 $1
uninstallPackage openmpi-1.6.5 uninstallPackage openmpi-1.6.5 $1
echo echo
echo ======================================== echo ========================================

20
ThirdParty/AllClean.stage3 vendored
View file

@ -27,6 +27,7 @@
# #
# Description # Description
# Cleaning script for ThirdParty packages: Stage3 # Cleaning script for ThirdParty packages: Stage3
# Add option alsoPackage to remove the installed files.
# #
# Author: # Author:
# Martin Beaudoin, Hydro-Quebec, (2013) # Martin Beaudoin, Hydro-Quebec, (2013)
@ -50,31 +51,32 @@ echo ========================================
echo echo
# metis # metis
uninstallPackage metis-5.0pre2 uninstallPackage metis-5.1.0 $1
# ParMGridGen # ParMGridGen
uninstallPackage ParMGridGen-1.0 uninstallPackage ParMGridGen-1.0 $1
# Libccmio # Libccmio
uninstallPackage libccmio-2.6.1 uninstallPackage libccmio-2.6.1 $1
# Mesquite # Mesquite
uninstallPackage mesquite-2.1.2 uninstallPackage mesquite-2.1.2 $1
# Scotch/PtScotch # Scotch/PtScotch
uninstallPackage scotch-5.1.10b uninstallPackage scotch-6.0.0 $1
uninstallPackage scotch_6.0.0 $1
# ParMertis # ParMertis
uninstallPackage ParMetis-3.1.1 uninstallPackage parmetis-4.0.3 $1
# Zoltan # Zoltan
# uninstallPackage zoltan-3.6 # uninstallPackage zoltan-3.6 $1
# PyFoam # PyFoam
uninstallPackage PyFoam-0.6.1 uninstallPackage PyFoam-0.6.1 $1
# hwloc # hwloc
uninstallPackage hwloc-1.7.1 uninstallPackage hwloc-1.7.2 $1
echo echo
echo ======================================== echo ========================================

5
ThirdParty/AllClean.stage4 vendored
View file

@ -27,6 +27,7 @@
# #
# Description # Description
# Cleaning script for ThirdParty packages: Stage4 # Cleaning script for ThirdParty packages: Stage4
# Add option alsoPackage to remove the installed files.
# #
# Author: # Author:
# Martin Beaudoin, Hydro-Quebec, (2013) # Martin Beaudoin, Hydro-Quebec, (2013)
@ -50,10 +51,10 @@ echo ========================================
echo echo
# QT # QT
uninstallPackage qt-everywhere-opensource-src-4.7.4 uninstallPackage qt-everywhere-opensource-src-4.7.4 $1
# ParaView # ParaView
uninstallPackage ParaView-3.12.0 uninstallPackage ParaView-3.12.0 $1
echo echo
echo ======================================== echo ========================================

30
ThirdParty/tools/makeThirdPartyFunctionsForRPM vendored
View file

@ -246,24 +246,36 @@ rpm_populateRPMvault()
echo " Current content of the local RPM vault:" echo " Current content of the local RPM vault:"
ls -axlt $rpmVault ls -axlt $rpmVault
echo "" echo ""
} }
# #
# Remove an installed package # Remove an installed package
# #
uninstallPackage() uninstallPackage()
{ {
pkg="$1"; pkg="$1";
if [ -d $WM_THIRD_PARTY_DIR/packages/${pkg} ]; then
set -x echo "Removing ${pkg}"
rm -f $WM_THIRD_PARTY_DIR/rpmBuild/RPMS/$architecture/${pkg}*.rpm [ -f $WM_THIRD_PARTY_DIR/rpmBuild/RPMS/$architecture/${pkg}*.rpm ] && \
rm -f $WM_THIRD_PARTY_DIR/rpmBuild/TGZS/$architecture/${pkg}.tgz rm -f $WM_THIRD_PARTY_DIR/rpmBuild/RPMS/$architecture/${pkg}*.rpm || \
rm -rf $WM_THIRD_PARTY_DIR/rpmBuild/BUILD/${pkg}* echo "Not found: $WM_THIRD_PARTY_DIR/rpmBuild/RPMS/$architecture/${pkg}*.rpm"
rm -rf $WM_THIRD_PARTY_DIR/packages/$pkg [ -f $WM_THIRD_PARTY_DIR/rpmBuild/SOURCES/${pkg}.tar.gz ] && \
set +x rm -f $WM_THIRD_PARTY_DIR/rpmBuild/SOURCES/${pkg}.tar.gz || \
echo "Not found: $WM_THIRD_PARTY_DIR/rpmBuild/SOURCES/${pkg}.tar.gz"
[ -f $WM_THIRD_PARTY_DIR/rpmBuild/TGZS/$architecture/${pkg}.tgz ] && \
rm -f $WM_THIRD_PARTY_DIR/rpmBuild/TGZS/$architecture/${pkg}.tgz || \
echo "Not found: $WM_THIRD_PARTY_DIR/rpmBuild/TGZS/$architecture/${pkg}.tgz"
[ -d $WM_THIRD_PARTY_DIR/rpmBuild/BUILD/${pkg}* ] && \
rm -rf $WM_THIRD_PARTY_DIR/rpmBuild/BUILD/${pkg}* || \
echo "Not found: $WM_THIRD_PARTY_DIR/rpmBuild/BUILD/${pkg}*"
if [ "$2" = "alsoPackage" ]; then
[ -d $WM_THIRD_PARTY_DIR/packages/$pkg ] && \
rm -rf $WM_THIRD_PARTY_DIR/packages/$pkg || \
echo "Not found: $WM_THIRD_PARTY_DIR/packages/$pkg"
else else
echo "Package ${pkg} is already removed." echo "Add option alsoPackage to remove the installed files."
fi fi
echo
} }
# ----------------------------------------------------------------- end-of-file # ----------------------------------------------------------------- end-of-file