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: build into build/ directory instead of platforms/ (issue #312)

Browse Source 
- makes it slightly easier when packaging various binaries, or when
  building packages for installation via modules etc.
This commit is contained in:
Mark Olesen
2017-02-10 20:30:15 +01:00
committed by mark
parent 3d02c8a530
commit 957635200a
6 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
bin/tools/foamListSourceFiles
View File

@ -78,6 +78,7 @@ find -H $packDir \
| sed \ | sed \
-e '\@/\.git/@d' \ -e '\@/\.git/@d' \
-e '\@/\.tags/@d' \ -e '\@/\.tags/@d' \
-e '\@/build/@d' \
-e '\@/platforms/@d' \ -e '\@/platforms/@d' \
-e '\@/t/@d' \ -e '\@/t/@d' \
-e '\@/Make[.A-Za-z]*/[^/]*/@d' \ -e '\@/Make[.A-Za-z]*/[^/]*/@d' \

2
src/Pstream/Allwmake
View File

@ -15,7 +15,7 @@ wmakeMpiLib()
do do
( (
WM_OPTIONS="$WM_OPTIONS$WM_MPLIB" WM_OPTIONS="$WM_OPTIONS$WM_MPLIB"
objectsDir="$WM_PROJECT_DIR/platforms/$WM_OPTIONS/src/Pstream/$libName" objectsDir="$WM_PROJECT_DIR/build/$WM_OPTIONS/src/Pstream/$libName"
whichmpi="$objectsDir/using:$FOAM_MPI" whichmpi="$objectsDir/using:$FOAM_MPI"
[ -e "$whichmpi" ] || wclean $libName [ -e "$whichmpi" ] || wclean $libName
echo "wmake $targetType $libName" echo "wmake $targetType $libName"

2
src/parallel/decompose/Allwmake
View File

@ -132,7 +132,7 @@ wmakeMpiLib()
do do
( (
WM_OPTIONS="$WM_OPTIONS$WM_MPLIB" WM_OPTIONS="$WM_OPTIONS$WM_MPLIB"
objectsDir="$WM_PROJECT_DIR/platforms/$WM_OPTIONS/src/parallel/decompose/$libName" objectsDir="$WM_PROJECT_DIR/build/$WM_OPTIONS/src/parallel/decompose/$libName"
whichmpi="$objectsDir/using:$FOAM_MPI" whichmpi="$objectsDir/using:$FOAM_MPI"
whichdecomp="$objectsDir/using:$decompName" whichdecomp="$objectsDir/using:$decompName"
[ -e "$whichmpi" -a -e "$whichdecomp" ] || wclean $libName [ -e "$whichmpi" -a -e "$whichdecomp" ] || wclean $libName

14
wmake/scripts/wmakeFunctions
View File

@ -160,7 +160,7 @@ findObjectDir()
case "$exPath" in case "$exPath" in
("$wmpdir"/*) ("$wmpdir"/*)
local buildPath=$WM_PROJECT_DIR/platforms/${WM_OPTIONS} local buildPath=$WM_PROJECT_DIR/build/${WM_OPTIONS}
objectsDir=$buildPath$(echo $exPath | sed s%$wmpdir%% ) objectsDir=$buildPath$(echo $exPath | sed s%$wmpdir%% )
;; ;;
(*) (*)
@ -208,8 +208,8 @@ then
depToSource() depToSource()
{ {
local sourceFile=${1%.dep} local sourceFile=${1%.dep}
sourceFile="${sourceFile/platforms\/${WM_OPTIONS}\//}" sourceFile="${sourceFile/build\/${WM_OPTIONS}\//}"
sourceFile="${sourceFile/platforms\/${WM_OPTIONS}${WM_MPLIB}\//}" sourceFile="${sourceFile/build\/${WM_OPTIONS}${WM_MPLIB}\//}"
sourceFile="${sourceFile/Make\/${WM_OPTIONS}\//}" sourceFile="${sourceFile/Make\/${WM_OPTIONS}\//}"
sourceFile="${sourceFile/Make\/${WM_OPTIONS}${WM_MPLIB}\//}" sourceFile="${sourceFile/Make\/${WM_OPTIONS}${WM_MPLIB}\//}"
@ -218,10 +218,10 @@ then
else else
depToSource() depToSource()
{ {
local sourceFile=$(echo ${1%.dep} | \ local sourceFile=$(echo ${1%.dep} | \
sed -e s%platforms/${WM_OPTIONS}/%% \ sed -e s%build/${WM_OPTIONS}/%% \
-e s%platforms/${WM_OPTIONS}${WM_MPLIB}/%% \ -e s%build/${WM_OPTIONS}${WM_MPLIB}/%% \
-e s%Make/${WM_OPTIONS}/%% \ -e s%Make/${WM_OPTIONS}/%% \
-e s%Make/${WM_OPTIONS}${WM_MPLIB}/%% ) -e s%Make/${WM_OPTIONS}${WM_MPLIB}/%% )
echo "$sourceFile" echo "$sourceFile"

2
wmake/wclean
View File

@ -256,7 +256,7 @@ then
objectsDir=$MakeDir/$WM_OPTIONS objectsDir=$MakeDir/$WM_OPTIONS
case "$PWD" in case "$PWD" in
("$WM_PROJECT_DIR"/*) ("$WM_PROJECT_DIR"/*)
buildPath=$WM_PROJECT_DIR/platforms/${WM_OPTIONS} buildPath=$WM_PROJECT_DIR/build/${WM_OPTIONS}
objectsDir=$buildPath$(echo $PWD | sed s%$WM_PROJECT_DIR%% ) objectsDir=$buildPath$(echo $PWD | sed s%$WM_PROJECT_DIR%% )
;; ;;
esac esac

4
wmake/wmake
View File

@ -340,7 +340,7 @@ then
[ "$update" = true ] || wmakeLnIncludeAll $parOpt [ "$update" = true ] || wmakeLnIncludeAll $parOpt
( (
export WM_COLLECT_DIR=$WM_PROJECT_DIR/platforms/${WM_OPTIONS}/${PWD////_} export WM_COLLECT_DIR=$WM_PROJECT_DIR/build/${WM_OPTIONS}/${PWD////_}
export WM_SCHEDULER=wmakeCollect export WM_SCHEDULER=wmakeCollect
trap '$WM_SCHEDULER -kill' TERM INT trap '$WM_SCHEDULER -kill' TERM INT
$WM_SCHEDULER -clean \ $WM_SCHEDULER -clean \
@ -390,7 +390,7 @@ fi
objectsDir=$MakeDir/$WM_OPTIONS objectsDir=$MakeDir/$WM_OPTIONS
case "$PWD" in case "$PWD" in
("$WM_PROJECT_DIR"/*) ("$WM_PROJECT_DIR"/*)
buildPath=$WM_PROJECT_DIR/platforms/${WM_OPTIONS} buildPath=$WM_PROJECT_DIR/build/${WM_OPTIONS}
objectsDir=$buildPath$(echo $PWD | sed s%$WM_PROJECT_DIR%% ) objectsDir=$buildPath$(echo $PWD | sed s%$WM_PROJECT_DIR%% )
;; ;;
esac esac