zhyang-dev/ThirdParty-6
1
0
Fork 0
mirror of https://github.com/OpenFOAM/ThirdParty-6.git synced 2025-12-08 06:57:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Allwmake: Implement the default "stop on 1st error"

Browse Source 
Patch contributed by Bruno Santos
Resolves tweak http://www.openfoam.org/mantisbt/view.php?id=2040
This commit is contained in:
Henry Weller
2016-04-03 10:30:43 +01:00
parent 8c9c235db6
commit 1379e08a39
3 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Allwmake
View File

@ -3,7 +3,7 @@
# ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration |
# \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
# \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
# \\/ M anipulation |
#------------------------------------------------------------------------------
# License
@ -77,7 +77,7 @@ OPENMPI)
set -x
cd "${MPI_ARCH_PATH##*/}" || exit 1 # change to openmpi-VERSION
make distclean 2>/dev/null
[ -e Makefile ] && make distclean 2>/dev/null
rm -rf $MPI_ARCH_PATH
# start with GridEngine support,
@ -122,7 +122,7 @@ MPICH)
set -x
cd $MPI_HOME || exit 1 # change to mpich-VERSION
make distclean 2>/dev/null
[ -e Makefile ] && make distclean 2>/dev/null
rm -rf $MPI_ARCH_PATH
rm util/machines/machines.*

4
AllwmakeLibccmio
View File

@ -3,7 +3,7 @@
# ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration |
# \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
# \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
# \\/ M anipulation |
#------------------------------------------------------------------------------
# License
@ -26,7 +26,7 @@
# AllwmakeLibccmio
#
# Description
# Get and build CD-adapco's ccmio library
# Build CD-adapco's ccmio library
#
#------------------------------------------------------------------------------
packageDir=libccmio-2.6.1

20
etc/tools/ThirdPartyFunctions
View File

@ -2,7 +2,7 @@
# ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration |
# \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
# \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
# \\/ M anipulation |
#------------------------------------------------------------------------------
# License
@ -31,12 +31,13 @@
# Define WM_NCOMPPROCS always.
#------------------------------------------------------------------------------
# define the normal build and prefix directories
# Define the normal build and prefix directories
buildBASE=$WM_THIRD_PARTY_DIR/build/$WM_ARCH$WM_COMPILER
installBASE=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER
#
# mostly building without wmake
# Mostly building without wmake
# - disable wmakeScheduler variables
# - restrict WM_NCOMPPROCS to local number of cores
#
@ -53,7 +54,16 @@ fi
#
# download file $1 from url $2 into download/ directory
# If WM_CONTINUE_ON_ERROR not set activate the shell option "stop on error"
#
if [ -z "${WM_CONTINUE_ON_ERROR}" ]
then
set -e
fi
#
# Download file $1 from url $2 into download/ directory
#
downloadFile()
{
@ -75,7 +85,7 @@ downloadFile()
#
# copy Make/{files,options} from wmakeFiles/PACKAGE
# Copy Make/{files,options} from wmakeFiles/PACKAGE
#
# $1 = PACKAGE
# $2 (optional) TARGET DIRECTORY