From 15c433b3379703f0aa4700f7968d0b5f7df942af Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Tue, 4 Jun 2013 16:50:33 +0100
Subject: [PATCH] ENH: wmake: 'wmake dep' to build dependencies and softlinks
---
Allwmake | 6 +++---
applications/Allwmake | 4 ++--
src/Allwmake | 2 +-
src/OSspecific/POSIX/Allwmake | 3 ++-
src/postProcessing/Allwmake | 2 +-
wmake/wmake | 12 ++++++++----
6 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/Allwmake b/Allwmake
index 16edfd1f6fd..91875325538 100755
--- a/Allwmake
+++ b/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
diff --git a/applications/Allwmake b/applications/Allwmake
index 00bc326641b..7f7ac6718da 100755
--- a/applications/Allwmake
+++ b/applications/Allwmake
@@ -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
diff --git a/src/Allwmake b/src/Allwmake
index 55b8981ce2b..d5177cfafc5 100755
--- a/src/Allwmake
+++ b/src/Allwmake
@@ -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
diff --git a/src/OSspecific/POSIX/Allwmake b/src/OSspecific/POSIX/Allwmake
index c68f0894362..52a54646f06 100755
--- a/src/OSspecific/POSIX/Allwmake
+++ b/src/OSspecific/POSIX/Allwmake
@@ -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
diff --git a/src/postProcessing/Allwmake b/src/postProcessing/Allwmake
index 24b764c4208..3522721c4d3 100755
--- a/src/postProcessing/Allwmake
+++ b/src/postProcessing/Allwmake
@@ -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 $*
diff --git a/wmake/wmake b/wmake/wmake
index ebcd38cb6e0..f6de0bd0c4a 100755
--- a/wmake/wmake
+++ b/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
#------------------------------------------------------------------------------
--
GitLab