Commit 15c433b3 authored by mattijs's avatar mattijs
Browse files

ENH: wmake: 'wmake dep' to build dependencies and softlinks

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