mirror of
https://develop.openfoam.com/Development/openfoam.git
synced 2025-11-28 03:28:01 +00:00
608bb5d83b
- Could be related to interrupted builds.
So if there are any parts of the build that rely on an explicit
'wmakeLnInclude', make sure that the contents are properly updated.
--
ENH: improved feedback from top-level Allwmake
- Report which section (libraries, applications) is being built.
- Provide final summary of date, version, etc, which can be helpful
for later diagnosis or record keeping.
- The -log=XXX option for Allwmake now accepts a directory name
and automatically appends an appropriate log name.
Eg,
./Allwmake -log=logs/ ->> logs/log.linux64GccDPInt32Opt
The default name is built from the value of WM_OPTIONS.
--
BUG: shell not exiting properly in combination with -log option
- the use of 'tee' causes the shell to hang around.
Added an explicit exit to catch this.
--
- Detecting the '-k' (-non-stop) option at the top-level Allwmake, which
may improve robustness.
- Explicit continue-on-error for foamyMesh (as optional component)
- unify format of script messages for better readability
COMP: reduce warnings when building Pstream (old-style casts in openmpi)
67 lines
1.8 KiB
Bash
Executable File
67 lines
1.8 KiB
Bash
Executable File
#!/bin/sh
|
|
cd ${0%/*} || exit 1 # Run from this directory
|
|
|
|
# Source the wmake functions
|
|
. $WM_DIR/scripts/wmakeFunctions
|
|
|
|
# Ensure CMake gets the correct C/C++ compilers
|
|
[ -n "$WM_CC" ] && export CC="$WM_CC"
|
|
[ -n "$WM_CXX" ] && export CXX="$WM_CXX"
|
|
|
|
echo "======================================================================"
|
|
echo "${PWD##*/} : $PWD"
|
|
echo
|
|
|
|
# CMake into objectsDir,
|
|
# with an additional attempt if (possibly incorrect) CMakeCache.txt existed
|
|
doCmake()
|
|
{
|
|
local sourceDir="$1"
|
|
|
|
findObjectDir $sourceDir # Where are generated files stored?
|
|
test -f "$objectsDir/CMakeCache.txt"
|
|
retry=$? # CMakeCache.txt exists, but sources may have moved
|
|
|
|
mkdir -p $objectsDir && \
|
|
(
|
|
cd $objectsDir || exit 1
|
|
|
|
cmake $sourceDir || {
|
|
if [ $retry -eq 0 ]
|
|
then
|
|
echo "Removing CMakeCache.txt and attempt again"
|
|
rm -f CMakeCache.txt
|
|
cmake $sourceDir
|
|
else
|
|
exit 1
|
|
fi
|
|
} && make
|
|
)
|
|
}
|
|
|
|
|
|
if [ -d "$VTK_DIR" -o -d "$ParaView_DIR" ]
|
|
then
|
|
if [ "$targetType" != objects ]
|
|
then
|
|
if type cmake > /dev/null 2>&1
|
|
then
|
|
doCmake $PWD || {
|
|
echo
|
|
echo " WARNING: incomplete build of VTK-based post-processing"
|
|
echo
|
|
}
|
|
else
|
|
echo "WARNING: skipped - needs cmake"
|
|
fi
|
|
fi
|
|
else
|
|
echo "WARNING: skipped - needs a VTK or a ParaView installation"
|
|
echo " - For ParaView : export the 'ParaView_DIR' variable"
|
|
echo " - For VTK : export the 'VTK_DIR' variable"
|
|
fi
|
|
|
|
echo "======================================================================"
|
|
|
|
# -----------------------------------------------------------------------------
|