ENH: wmake: 'wmake dep' to build dependencies and softlinks
This commit is contained in:
parent
da8563473e
commit
15c433b337
6
Allwmake
6
Allwmake
@ -26,12 +26,12 @@ else
|
||||
fi
|
||||
|
||||
# build OpenFOAM libraries and applications
|
||||
src/Allwmake
|
||||
applications/Allwmake
|
||||
src/Allwmake $*
|
||||
applications/Allwmake $*
|
||||
|
||||
if [ "$1" = doc ]
|
||||
then
|
||||
doc/Allwmake
|
||||
doc/Allwmake $*
|
||||
fi
|
||||
|
||||
# ----------------------------------------------------------------- end-of-file
|
||||
|
@ -16,7 +16,7 @@ wmakeCheckPwd "$WM_PROJECT_DIR/applications" || {
|
||||
|
||||
set -x
|
||||
|
||||
wmake all utilities
|
||||
wmake all solvers
|
||||
wmake all utilities $*
|
||||
wmake all solvers $*
|
||||
|
||||
# ----------------------------------------------------------------- end-of-file
|
||||
|
@ -24,7 +24,7 @@ wmakeLnInclude OpenFOAM
|
||||
wmakeLnInclude OSspecific/${WM_OSTYPE:-POSIX}
|
||||
Pstream/Allwmake $*
|
||||
|
||||
OSspecific/${WM_OSTYPE:-POSIX}/Allwmake
|
||||
OSspecific/${WM_OSTYPE:-POSIX}/Allwmake $*
|
||||
wmake $makeType OpenFOAM
|
||||
|
||||
wmake $makeType fileFormats
|
||||
|
@ -1,5 +1,6 @@
|
||||
#!/bin/sh
|
||||
cd ${0%/*} || exit 1 # run from this directory
|
||||
makeType=${1:-libo}
|
||||
|
||||
unset COMP_FLAGS LINK_FLAGS
|
||||
|
||||
@ -19,6 +20,6 @@ fi
|
||||
|
||||
|
||||
# make (non-shared) object
|
||||
wmake libo
|
||||
wmake $makeType
|
||||
|
||||
# ----------------------------------------------------------------- end-of-file
|
||||
|
@ -3,7 +3,7 @@ cd ${0%/*} || exit 1 # run from this directory
|
||||
makeType=${1:-libso}
|
||||
set -x
|
||||
|
||||
wmake libo postCalc
|
||||
wmake ${1:-libo} postCalc
|
||||
wmake $makeType foamCalcFunctions
|
||||
|
||||
functionObjects/Allwmake $*
|
||||
|
12
wmake/wmake
12
wmake/wmake
@ -56,6 +56,7 @@ or a special target:
|
||||
libo build statically linked lib (.o)
|
||||
libso build dynamically linked lib (.so)
|
||||
jar build Java jar
|
||||
dep build lnInclude and dependencies only
|
||||
|
||||
USAGE
|
||||
exit 1
|
||||
@ -244,7 +245,7 @@ OBJECTS_DIR=$MakeDir/$WM_OPTIONS
|
||||
touch $OBJECTS_DIR/dontIncludeDeps
|
||||
|
||||
case "$makeType" in
|
||||
lib | libo | libso )
|
||||
lib | libo | libso | dep )
|
||||
$make -s -f $WM_DIR/Makefile MAKE_DIR=$MakeDir INCLUDE_DEPS=$OBJECTS_DIR/dontIncludeDeps lnInclude/uptodate
|
||||
;;
|
||||
esac
|
||||
@ -258,8 +259,11 @@ rc=$?
|
||||
# make the object files and link
|
||||
#------------------------------------------------------------------------------
|
||||
|
||||
cmd="$make -f $WM_DIR/Makefile MAKE_DIR=$MakeDir INCLUDE_DEPS=$OBJECTS_DIR/includeDeps $makeType"
|
||||
# echo "cmd=$cmd"
|
||||
exec $cmd
|
||||
if [ "$makeType" != dep ]
|
||||
then
|
||||
cmd="$make -f $WM_DIR/Makefile MAKE_DIR=$MakeDir INCLUDE_DEPS=$OBJECTS_DIR/includeDeps $makeType"
|
||||
# echo "cmd=$cmd"
|
||||
exec $cmd
|
||||
fi
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
|
Loading…
Reference in New Issue
Block a user