zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
mattijs
2013-06-04 16:50:33 +01:00
parent da8563473e
commit 15c433b337
6 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Allwmake
View File

@ -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

4
applications/Allwmake
View File

@ -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

2
src/Allwmake
View File

@ -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

3
src/OSspecific/POSIX/Allwmake
View File

@ -1,5 +1,6 @@
#!/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
# make (non-shared) object # make (non-shared) object
wmake libo wmake $makeType
# ----------------------------------------------------------------- end-of-file # ----------------------------------------------------------------- end-of-file

2
src/postProcessing/Allwmake
View File

@ -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 $*

6
wmake/wmake
View File

@ -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
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=$?
# make the object files and link # make the object files and link
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
if [ "$makeType" != dep ]
then
cmd="$make -f $WM_DIR/Makefile MAKE_DIR=$MakeDir INCLUDE_DEPS=$OBJECTS_DIR/includeDeps $makeType" cmd="$make -f $WM_DIR/Makefile MAKE_DIR=$MakeDir INCLUDE_DEPS=$OBJECTS_DIR/includeDeps $makeType"
# echo "cmd=$cmd" # echo "cmd=$cmd"
exec $cmd exec $cmd
fi
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------