-
- Downloads
CONFIG: adjust make scripts for darwin
- handling of dead links (find -L -delete unsupported) - remove ignore case flag on 's/../../i' used in have_scotch script. It is unneeded and not tolerated by Darwin's sed. - avoid embedded comments in EXE_INC (Make/options files), which do not work well with the OSX LLVM cpp. It strips out the comments but also removes the continuation char. STYLE: adjust notes about paraview library locations
- applications/utilities/mesh/generation/snappyHexMesh/Make/options 4 additions, 1 deletion...ions/utilities/mesh/generation/snappyHexMesh/Make/options
- applications/utilities/mesh/manipulation/renumberMesh/Make/options 4 additions, 1 deletion...ons/utilities/mesh/manipulation/renumberMesh/Make/options
- applications/utilities/mesh/manipulation/zipUpMesh/Make/options 7 additions, 4 deletions...ations/utilities/mesh/manipulation/zipUpMesh/Make/options
- etc/config.csh/paraview 8 additions, 9 deletionsetc/config.csh/paraview
- etc/config.sh/CGAL 1 addition, 1 deletionetc/config.sh/CGAL
- etc/config.sh/FFTW 1 addition, 1 deletionetc/config.sh/FFTW
- etc/config.sh/paraview 7 additions, 8 deletionsetc/config.sh/paraview
- etc/config.sh/settings 0 additions, 1 deletionetc/config.sh/settings
- src/conversion/ccm/Make/options 6 additions, 3 deletionssrc/conversion/ccm/Make/options
- src/overset/Make/options 4 additions, 1 deletionsrc/overset/Make/options
- wmake/scripts/have_scotch 1 addition, 1 deletionwmake/scripts/have_scotch
- wmake/wmakeLnInclude 20 additions, 15 deletionswmake/wmakeLnInclude
... | ... | @@ -67,10 +67,7 @@ USAGE |
# Parse arguments and options | ||
#------------------------------------------------------------------------------ | ||
# Default 'find' option | ||
unset findOpt | ||
# Default 'ln' option | ||
# Option for 'ln' | ||
lnOpt="-s" | ||
unset update silentOpt | ||
... | ... | @@ -149,23 +146,31 @@ fi |
#------------------------------------------------------------------------------ | ||
# Remove any broken links first (this helps when file locations have moved) | ||
#------------------------------------------------------------------------------ | ||
find -L . -type l -delete | ||
case "$WM_ARCH" in | ||
darwin*) | ||
find -L . -type l -exec rm -- {} \+ | ||
|
||
;; | ||
*) | ||
find -L . -type l -delete | ||
;; | ||
esac | ||
#------------------------------------------------------------------------------ | ||
# Create links, avoid recreating links unless necessary | ||
# things placed in the 'noLink' directory are skipped | ||
#------------------------------------------------------------------------------ | ||
find .. $findOpt \ | ||
\( -name lnInclude -o -name Make -o -name config -o -name noLink \) \ | ||
-prune \ | ||
-o \( \ | ||
-name '*.[CHh]' \ | ||
-o -name '*.[ch]xx' \ | ||
-o -name '*.[ch]pp' \ | ||
-o -name '*.type' \ | ||
\) \ | ||
-exec ln $lnOpt {} . \; | ||
find .. \ | ||
\( -name lnInclude -o -name Make -o -name config -o -name noLink \) \ | ||
-prune \ | ||
-o \( \ | ||
-name '*.[CHh]' \ | ||
-o -name '*.[ch]xx' \ | ||
-o -name '*.[ch]pp' \ | ||
-o -name '*.type' \ | ||
\) \ | ||
-exec ln $lnOpt {} . \; | ||
exit 0 # clean exit | ||
... | ... |