ThirdParty:

- Replacing wget by curl for downloading packages
   - Adjusting a few URLs that were no longer valid
   - Contributing a new script for checking the validity of URLs specified
     in AllMake.stage* files: ThirdParty/tools/verifyURLs.sh
     Usage: ThirdParty/tools/verifyURLs.sh ThirdParty/AllMake.stage1
This commit is contained in:
Martin Beaudoin 2018-02-20 00:04:58 -05:00
parent ec83275923
commit 9fdeeb872f
4 changed files with 74 additions and 7 deletions

View file

@ -76,7 +76,7 @@ echo
echo "Building gmp-5.0.1 mpfr-3.0.1 mpc-0.8.2 gcc-4.5.1"
( rpm_make -p gmp-5.0.1 -s gmp-5.0.1.spec -u http://ftpmirror.gnu.org/gmp/gmp-5.0.1.tar.gz )
( rpm_make -p mpfr-3.0.1 -s mpfr-3.0.1.spec -u http://ftpmirror.gnu.org/mpfr/mpfr-3.0.1.tar.gz )
( rpm_make -p mpc-0.8.2 -s mpc-0.8.2.spec -u http://www.multiprecision.org/mpc/download/mpc-0.8.2.tar.gz )
( rpm_make -p mpc-0.8.2 -s mpc-0.8.2.spec -u http://www.multiprecision.org/downloads/mpc-0.8.2.tar.gz )
( rpm_make -p gcc-4.5.1 -s gcc-4.5.1.spec -u http://ftpmirror.gnu.org/gcc/gcc-4.5.1/gcc-4.5.1.tar.gz )
}
@ -86,7 +86,7 @@ echo
echo "Building gmp-5.0.5 mpfr-3.1.0 mpc-0.9 gcc-4.6.3"
( rpm_make -p gmp-5.0.5 -s gmp-5.0.5.spec -u http://ftpmirror.gnu.org/gmp/gmp-5.0.5.tar.bz2 )
( rpm_make -p mpfr-3.1.0 -s mpfr-3.1.0.spec -u http://ftpmirror.gnu.org/mpfr/mpfr-3.1.0.tar.gz )
( rpm_make -p mpc-0.9 -s mpc-0.9.spec -u http://www.multiprecision.org/mpc/download/mpc-0.9.tar.gz )
( rpm_make -p mpc-0.9 -s mpc-0.9.spec -u http://www.multiprecision.org/downloads/mpc-0.9.tar.gz )
( rpm_make -p gcc-4.6.3 -s gcc-4.6.3.spec -u http://ftpmirror.gnu.org/gcc/gcc-4.6.3/gcc-4.6.3.tar.gz )
}
@ -96,7 +96,7 @@ echo
echo "Building gmp-5.0.5 mpfr-3.1.0 mpc-0.9 gcc-4.6.3"
( rpm_make -p gmp-5.1.2 -s gmp-5.1.2.spec -u ftp://ftp.gnu.org/gnu/gmp/gmp-5.1.2.tar.bz2 )
( rpm_make -p mpfr-3.1.2 -s mpfr-3.1.2.spec -u ftp://ftp.gnu.org/gnu/mpfr/mpfr-3.1.2.tar.gz )
( rpm_make -p mpc-1.0.1 -s mpc-1.0.1.spec -u http://www.multiprecision.org/mpc/download/mpc-1.0.1.tar.gz )
( rpm_make -p mpc-1.0.1 -s mpc-1.0.1.spec -u http://www.multiprecision.org/downloads/mpc-1.0.1.tar.gz )
( rpm_make -p gcc-4.7.4 -s gcc-4.7.4.spec -u ftp://ftp.gnu.org/gnu/gcc/gcc-4.7.4/gcc-4.7.4.tar.gz )
}
@ -106,7 +106,7 @@ echo
echo "Building gmp-5.0.5 mpfr-3.1.0 mpc-0.9 gcc-4.6.3"
( rpm_make -p gmp-5.1.2 -s gmp-5.1.2.spec -u ftp://ftp.gnu.org/gnu/gmp/gmp-5.1.2.tar.bz2 )
( rpm_make -p mpfr-3.1.2 -s mpfr-3.1.2.spec -u ftp://ftp.gnu.org/gnu/mpfr/mpfr-3.1.2.tar.gz )
( rpm_make -p mpc-1.0.1 -s mpc-1.0.1.spec -u http://www.multiprecision.org/mpc/download/mpc-1.0.1.tar.gz )
( rpm_make -p mpc-1.0.1 -s mpc-1.0.1.spec -u http://www.multiprecision.org/downloads/mpc-1.0.1.tar.gz )
( rpm_make -p gcc-4.7.4 -s gcc-4.7.4.spec -u ftp://ftp.gnu.org/gnu/gcc/gcc-4.7.4/gcc-4.7.4.tar.gz )
}
@ -158,7 +158,7 @@ echo
#
[ ! -z "$WM_THIRD_PARTY_USE_FLEX_2535" ] && {
echo "Building flex 2.5.35"
( rpm_make -p flex-2.5.35 -s flex-2.5.35.spec -u http://downloads.sourceforge.net/project/flex/flex/flex-2.5.35/flex-2.5.35.tar.gz )
( rpm_make -p flex-2.5.35 -s flex-2.5.35.spec -u https://github.com/westes/flex/archive/flex-2-5-35.tar.gz )
}
# cmake 2.8.12

View file

@ -101,7 +101,7 @@ then
#
[ ! -z "$WM_THIRD_PARTY_USE_OPENMPI_188" ] && {
echo "Building openmpi 1.8.8"
( rpm_make -p openmpi-1.8.8 -s openmpi-1.8.8.spec -u http://www.open-mpi.org/software/ompi/v1.8/downloads/openmpi-1.8.8.tar.gz \
( rpm_make -p openmpi-1.8.8 -s openmpi-1.8.8.spec -u https://www.open-mpi.org/software/ompi/v1.8/downloads/openmpi-1.8.8.tar.gz \
-f --define '_configureAdditionalArgs "$WM_THIRD_PARTY_USE_OPENMPI_188_ConfigureAdditionalArgs"')
}
# mvipich2-2.2

View file

@ -122,7 +122,8 @@ rpm_make()
if [ ! -e "SOURCES/$packageTarBall" ]; then
echo "Download $packageTarBall from : $_PACKAGE_URL"
( cd SOURCES; wget --no-check-certificate $_PACKAGE_URL )
#( cd SOURCES; wget --no-check-certificate $_PACKAGE_URL )
( cd SOURCES; curl -L -k -O $_PACKAGE_URL )
fi
fi

66
ThirdParty/tools/verifyURLs.sh vendored Executable file
View file

@ -0,0 +1,66 @@
#!/bin/bash
#------------------------------------------------------------------------------
# ========= |
# \\ / 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 <http://www.gnu.org/licenses/>.
#
# Script
# verifyURLs.sh
#
# Description
# Extract URLs from AllMake.stage* files, and report if the URLs are still
# valid.
#
# Caveat: We are currently skipping the verification of swak4Foam, available
# from either Mercurial or Subversion.
#
# Example:
# tools/verifyURLs.sh AllMake.stage1
#
# Author:
# Martin Beaudoin (2018)
#
#------------------------------------------------------------------------------
# Can run from anywhere
# Extract the list of URLs from the file specified from the command line
listOfURLs=`cat $1 | sed -ne 's/.*\(http[^"]*\).*/\1/p' | \
tr -d ')' | tr -d '\' | \
grep -v licenses | grep -v SWAK_RELEASE_VERSION`
# Iterate over each url, checking if curl can access it
for url in $listOfURLs
do
if [[ $url == http* ]] ;
then
printf "Verifying: $url :"
# Using curl
if curl --output /dev/null --silent --head --fail "$url"; then
echo " OK"
else
echo " <----- CANNOT ACCESS!!!"
fi
fi
done
exit