Commit 635a901b authored by Stefan's avatar Stefan
Browse files

add -build-dep option

parent faeaa56d
......@@ -49,9 +49,13 @@ set -a
# DONT'T TOUCH WHAT FOLLOWS !!!
###############################################################################
: ${NEK_SOURCE_ROOT:="$HOME/Nek5000"}
VERMAKENEK="19.0.0"
echo "using source path: $NEK_SOURCE_ROOT"
VERMAKENEK="19.0.1"
set +a -e
$NEK_SOURCE_ROOT/bin/nekconfig $@
set -o pipefail
make -j4 2>&1 | tee -a build.log
set +o pipefail
if [[ $1 != "clean" ]]; then
$NEK_SOURCE_ROOT/bin/nekconfig -build-dep
set -o pipefail
make -j4 2>&1 | tee -a build.log
set +o pipefail
fi
#!/bin/bash
set -e
: ${VERMAKENEK:="19.0.0"}
: ${VERMAKENEK:="19.0.1"}
NEK_SOURCE_ROOT=$(cd `dirname $0`/.. && pwd)
source $NEK_SOURCE_ROOT/core/makenek.inc
config_nek $@
......@@ -117,6 +117,8 @@ cFL2 = $(L2) $(CFLAGS) $(PPS_C) -I$S -I$(OPT_INCDIR)
cFL3 = $(L3) $(CFLAGS) $(PPS_C) -I$S -I$(OPT_INCDIR)
################################################################################
.PHONY: all clean
all : nek5000
objdir:
......
......@@ -78,7 +78,7 @@ if [ "$1" == "-h" ] || [ "$1" == "-help" ] || [ "$PPLIST" == "?" ]; then
echo "Options and arguments:"
echo " <casename> name of usr file without extension"
echo " clean cleanup build environment"
echo " -nodep don't build dependencies"
echo " -build-dep build dependencies"
echo ""
echo "PPLIST config options:"
echo " NOMPIIO disable MPI-IO"
......@@ -92,9 +92,7 @@ if [ "$1" == "-h" ] || [ "$1" == "-help" ] || [ "$PPLIST" == "?" ]; then
return 11
fi
echo "using source path: $NEK_SOURCE_ROOT"
if [ "$VERMAKENEK" != "19.0.0" ]; then
if [ "$VERMAKENEK" != "19.0.1" ]; then
echo "FATAL ERROR: Your makenek is incompatible!"
echo "Please upgrade to the version shipped the source"
return 11
......@@ -121,15 +119,8 @@ export SOURCE_ROOT_CVODE
SOURCE_ROOT_HYPRE="$NEK_SOURCE_ROOT/3rd_party/hypre"
export SOURCE_ROOT_HYPRE
if [ "$1" == "-nodep" ]; then
NODEP=1
nargs=0
fi
if [ "$2" == "-nodep" ]; then
NODEP=1
fi
if [ "$1" == "3rdparty" ]; then
NODEP=1
if [ "$1" == "-build-dep" ]; then
ONLYDEP=1
nargs=0
fi
......@@ -153,8 +144,6 @@ if [[ $1 = "clean" ]]; then
return 0
fi
echo "setup build environment"
#if [ -f makefile ] && [ $ONLYDEP -ne 1 ]; then
# while true; do
# echo "makefile exists already!"
......@@ -397,6 +386,11 @@ if [ $nargs -eq 0 ]; then
fi
fi
if [ ! -f ${CASENAME}'.usr' ]; then
echo "FATAL ERROR: Cannot find $1.usr!"
return 11
fi
printf "generating makefile ... "
rm -rf makefile 2>/dev/null
......@@ -490,11 +484,6 @@ else
fi
\rm .makefile 2>/dev/null
if [ ! -f ${CASENAME}'.usr' ]; then
echo "FATAL ERROR: Cannot find $1.usr!"
return 11
fi
# tweak SIZE file
if [ -f SIZEu ]; then
if [ -f SIZE ]; then
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment