STYLE: use EXT_SO instead of SO for consistency with wmake internal naming

a7c2a4bf · Mark Olesen · c6e6c0ab · a7c2a4bf · a7c2a4bf · a7c2a4bf
Commit a7c2a4bf authored Apr 25, 2019 by Mark Olesen
12 changed files
--- a/Allwmake
+++ b/Allwmake
@@ -105,8 +105,8 @@ done


 if [ -f "$SCOTCH_ARCH_PATH/include/scotch.h" ] \
-&& [ -r "$FOAM_EXT_LIBBIN/libscotch.$SO" ] \
-&& [ -r "$FOAM_EXT_LIBBIN/libscotcherrexit.$SO" ]
+&& [ -r "$FOAM_EXT_LIBBIN/libscotch$EXT_SO" ] \
+&& [ -r "$FOAM_EXT_LIBBIN/libscotcherrexit$EXT_SO" ]
 then
    echo "    scotch include: $SCOTCH_ARCH_PATH/include"
    echo "    scotch library: $FOAM_EXT_LIBBIN"
@@ -175,7 +175,7 @@ fi
 # and normal scotch was built (has include and library)
 if [ "${FOAM_MPI:-dummy}" != dummy ] && \
   [ -f $SCOTCH_ARCH_PATH/include/scotch.h \
-  -a -r $FOAM_EXT_LIBBIN/libscotch.$SO ] || \
+  -a -r $FOAM_EXT_LIBBIN/libscotch$EXT_SO ] || \
 {
    # Report that the above tests failed and pass-through the failure
    echo
@@ -189,8 +189,8 @@ then
    echo "    $SCOTCH_ARCH_PATH"

    if [ -f $SCOTCH_ARCH_PATH/include/$FOAM_MPI/ptscotch.h \
-      -a -r $FOAM_EXT_LIBBIN/$FOAM_MPI/libptscotch.$SO \
-      -a -r $FOAM_EXT_LIBBIN/$FOAM_MPI/libptscotcherrexit.$SO ]
+      -a -r $FOAM_EXT_LIBBIN/$FOAM_MPI/libptscotch$EXT_SO \
+      -a -r $FOAM_EXT_LIBBIN/$FOAM_MPI/libptscotcherrexit$EXT_SO ]
    then
        echo "    ptscotch include: $SCOTCH_ARCH_PATH/include/$FOAM_MPI"
        echo "    ptscotch library: $FOAM_EXT_LIBBIN/$FOAM_MPI"

--- a/etc/tools/ThirdPartyFunctions
+++ b/etc/tools/ThirdPartyFunctions
@@ -33,13 +33,12 @@ installBASE="$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER"
 # Synthetic value combining precision and label size (Eg, DPInt32)
 WM_SIZE_OPTIONS="${WM_PRECISION_OPTION}Int${WM_LABEL_SIZE}"

-# Dynamic library endings (default is .so)
-SO="$(wmake -show-ext-so 2>/dev/null)"; SO="${SO#.}"
-if [ -z "$SO" ] && [ "$(uname -s)" = Darwin ]
+# Dynamic library ending (default is .so)
+EXT_SO="$(wmake -show-ext-so 2>/dev/null)"
+if [ -z "$EXT_SO" ]
 then
-    SO=dylib
+    [ "$(uname -s)" = Darwin ] && EXT_SO=.dylib || EXT_SO=.so
 fi
-: "${SO:=so}"


 # Fallback values, needed for our scotch Makefile which uses

--- a/makeCCMIO
+++ b/makeCCMIO
@@ -21,8 +21,8 @@
 # ----------------------------------------------
 # NO USER-CONFIGURABLE SETTINGS WITHIN THIS FILE
 #------------------------------------------------------------------------------
-# Dynamic library endings (default is .so)
-[ "$(uname -s)" = Darwin ] && SO=dylib || SO=so
+# Dynamic library ending (default is .so)
+[ "$(uname -s)" = Darwin ] && EXT_SO=.dylib || EXT_SO=.so

 # Run from third-party directory only
 cd ${0%/*} && wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
@@ -129,7 +129,7 @@ echo
    export GIT_DIR=$PWD/.git # Mask seeing our own git-repo

    rm -rf $CCMIO_ARCH_PATH
-    rm -f $FOAM_EXT_LIBBIN/libccmio.$SO
+    rm -f $FOAM_EXT_LIBBIN/libccmio$EXT_SO

    libdir=$CCMIO_ARCH_PATH/lib


--- a/makeCGAL
+++ b/makeCGAL
@@ -27,15 +27,15 @@
 # ----------------------------------------------
 # NO USER-CONFIGURABLE SETTINGS WITHIN THIS FILE
 #------------------------------------------------------------------------------
-# Dynamic library endings (default is .so)
-[ "$(uname -s)" = Darwin ] && SO=dylib || SO=so
+# Dynamic library ending (default is .so)
+[ "$(uname -s)" = Darwin ] && EXT_SO=.dylib || EXT_SO=.so

 # Short-circuit test for an installation
 if [ "$1" = "-test" ]
 then
    [ "$#" -eq 3 ] || { echo "${0##*/} -test : needs 2 argument"; exit 1; }
    dir="$2" # <- CGAL_ARCH_PATH
-    if [ -d "$dir/include" -a -r "$dir/lib$WM_COMPILER_LIB_ARCH/libCGAL.$SO" ]
+    if [ -d "$dir/include" -a -r "$dir/lib$WM_COMPILER_LIB_ARCH/libCGAL$EXT_SO" ]
    then
        echo "    CGAL  include: $dir/include"
        echo "    CGAL  library: $dir/lib$WM_COMPILER_LIB_ARCH"
@@ -44,7 +44,7 @@ then
        for root in "$dir" /usr
        do
            if [ -d "$root/include/boost" \
-              -a -r "$root/lib$WM_COMPILER_LIB_ARCH/libboost_system.$SO" ]
+              -a -r "$root/lib$WM_COMPILER_LIB_ARCH/libboost_system$EXT_SO" ]
            then
                echo "    boost include: $root/include"
                echo "    boost library: $root/lib$WM_COMPILER_LIB_ARCH"
@@ -463,10 +463,10 @@ fi
        configBoost=$(cat <<CMAKE_OPTIONS
 -DBoost_INCLUDE_DIR=$boostInc
 -DBoost_LIBRARY_DIRS=$boostLib
- -DBoost_THREAD_LIBRARY=$boostLib/libboost_thread.$SO
- -DBoost_THREAD_LIBRARY_RELEASE=$boostLib/libboost_thread.$SO
- -DBoost_SYSTEM_LIBRARY=$boostLib/libboost_system.$SO
- -DBoost_SYSTEM_LIBRARY_RELEASE=$boostLib/libboost_system.$SO
+ -DBoost_THREAD_LIBRARY=$boostLib/libboost_thread$EXT_SO
+ -DBoost_THREAD_LIBRARY_RELEASE=$boostLib/libboost_thread$EXT_SO
+ -DBoost_SYSTEM_LIBRARY=$boostLib/libboost_system$EXT_SO
+ -DBoost_SYSTEM_LIBRARY_RELEASE=$boostLib/libboost_system$EXT_SO
 -DBoost_VERSION=$BOOST_VERSION
 CMAKE_OPTIONS
 )
@@ -488,12 +488,12 @@ CMAKE_OPTIONS
            $GMP_ARCH_PATH/lib \
        ;
        do
-            if [ -f "$libdir/libgmp.$SO" ]
+            if [ -f "$libdir/libgmp$EXT_SO" ]
            then
                configGmp=$(cat <<CMAKE_OPTIONS
 -DGMP_INCLUDE_DIR=$GMP_ARCH_PATH/include
 -DGMP_LIBRARIES_DIR=$libdir
- -DGMP_LIBRARIES=$libdir/libgmp.$SO
+ -DGMP_LIBRARIES=$libdir/libgmp$EXT_SO
 CMAKE_OPTIONS
 )
                break
@@ -519,12 +519,12 @@ CMAKE_OPTIONS
            $MPFR_ARCH_PATH/lib \
        ;
        do
-            if [ -f "$libdir/libmpfr.$SO" ]
+            if [ -f "$libdir/libmpfr$EXT_SO" ]
            then
                configMpfr=$(cat <<CMAKE_OPTIONS
 -DMPFR_INCLUDE_DIR=$MPFR_ARCH_PATH/include
 -DMPFR_LIBRARIES_DIR=$libdir
- -DMPFR_LIBRARIES=$libdir/libmpfr.$SO
+ -DMPFR_LIBRARIES=$libdir/libmpfr$EXT_SO
 CMAKE_OPTIONS
 )
                break

--- a/makeFFTW
+++ b/makeFFTW
@@ -19,15 +19,15 @@
 # ----------------------------------------------
 # NO USER-CONFIGURABLE SETTINGS WITHIN THIS FILE
 #------------------------------------------------------------------------------
-# Dynamic library endings (default is .so)
-[ "$(uname -s)" = Darwin ] && SO=dylib || SO=so
+# Dynamic library ending (default is .so)
+[ "$(uname -s)" = Darwin ] && EXT_SO=.dylib || EXT_SO=.so

 # Short-circuit test for an installation
 if [ "$1" = "-test" ]
 then
    [ "$#" -eq 2 ] || { echo "${0##*/} -test : needs 1 argument"; exit 1; }
    dir="$2" # <- FFTW_ARCH_PATH
-    if [ -d "$dir/include" -a -r "$dir/lib$WM_COMPILER_LIB_ARCH/libfftw3.$SO" ]
+    if [ -d "$dir/include" -a -r "$dir/lib$WM_COMPILER_LIB_ARCH/libfftw3$EXT_SO" ]
    then
        echo "    fftw include: $dir/include"
        echo "    fftw library: $dir/lib$WM_COMPILER_LIB_ARCH"
@@ -118,7 +118,7 @@ fi
 FFTW_SOURCE_DIR=$sourceBASE/$fftwPACKAGE
 FFTW_ARCH_PATH=$installBASE/$fftwPACKAGE

-if [ -r "$FFTW_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH/libfftw3.$SO" ]
+if [ -r "$FFTW_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH/libfftw3$EXT_SO" ]
 then
    echo "Already has FFTW shared library"
 else

--- a/makeHYPRE
+++ b/makeHYPRE
@@ -19,8 +19,8 @@
 # ----------------------------------------------
 # NO USER-CONFIGURABLE SETTINGS WITHIN THIS FILE
 #------------------------------------------------------------------------------
-# Dynamic library endings (default is .so)
-[ "$(uname -s)" = Darwin ] && SO=dylib || SO=so
+# Dynamic library ending (default is .so)
+[ "$(uname -s)" = Darwin ] && EXT_SO=.dylib || EXT_SO=.so

 # Short-circuit test for an installation
 if [ "$1" = "-test" ]
@@ -30,11 +30,11 @@ then
    if [ -d "$dir/include" ]
    then
        for lib in \
-            $FOAM_EXT_LIBBIN/libhypre.$SO \
+            $FOAM_EXT_LIBBIN/libhypre$EXT_SO \
            $dir/lib/libhypre.a \
-            $dir/lib/libhypre.$SO \
+            $dir/lib/libhypre$EXT_SO \
            $dir/lib$WM_COMPILER_LIB_ARCH/libhypre.a \
-            $dir/lib$WM_COMPILER_LIB_ARCH/libhypre.$SO \
+            $dir/lib$WM_COMPILER_LIB_ARCH/libhypre$EXT_SO \
            ;
        do
            if [ -r "$lib" ]

--- a/makeKAHIP
+++ b/makeKAHIP
@@ -19,8 +19,8 @@
 # ----------------------------------------------
 # NO USER-CONFIGURABLE SETTINGS WITHIN THIS FILE
 #------------------------------------------------------------------------------
-# Dynamic library endings (default is .so)
-[ "$(uname -s)" = Darwin ] && SO=dylib || SO=so
+# Dynamic library ending (default is .so)
+[ "$(uname -s)" = Darwin ] && EXT_SO=.dylib || EXT_SO=.so

 # Short-circuit test for an installation
 if [ "$1" = "-test" ]
@@ -30,11 +30,11 @@ then
    if [ -d "$dir/include" ]
    then
        for lib in \
-            $FOAM_EXT_LIBBIN/libkahip.$SO \
+            $FOAM_EXT_LIBBIN/libkahip$EXT_SO \
            $dir/lib/libkahip.a \
-            $dir/lib/libkahip.$SO \
+            $dir/lib/libkahip$EXT_SO \
            $dir/lib$WM_COMPILER_LIB_ARCH/libkahip.a \
-            $dir/lib$WM_COMPILER_LIB_ARCH/libkahip.$SO \
+            $dir/lib$WM_COMPILER_LIB_ARCH/libkahip$EXT_SO \
            ;
        do
            if [ -r "$lib" ]
@@ -165,7 +165,7 @@ echo
    export GIT_DIR=$KAHIP_SOURCE_DIR/.git # Mask seeing our own git-repo

    rm -rf $KAHIP_ARCH_PATH
-    rm -f $FOAM_EXT_LIBBIN/libkahip.$SO
+    rm -f $FOAM_EXT_LIBBIN/libkahip$EXT_SO

    libdir=$KAHIP_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH


--- a/makeMETIS
+++ b/makeMETIS
@@ -19,8 +19,8 @@
 # ----------------------------------------------
 # NO USER-CONFIGURABLE SETTINGS WITHIN THIS FILE
 #------------------------------------------------------------------------------
-# Dynamic library endings (default is .so)
-[ "$(uname -s)" = Darwin ] && SO=dylib || SO=so
+# Dynamic library ending (default is .so)
+[ "$(uname -s)" = Darwin ] && EXT_SO=.dylib || EXT_SO=.so

 # Short-circuit test for an installation
 if [ "$1" = "-test" ]
@@ -30,11 +30,11 @@ then
    if [ -d "$dir/include" ]
    then
        for lib in \
-            $FOAM_EXT_LIBBIN/libmetis.$SO \
+            $FOAM_EXT_LIBBIN/libmetis$EXT_SO \
            $dir/lib/libmetis.a \
-            $dir/lib/libmetis.$SO \
+            $dir/lib/libmetis$EXT_SO \
            $dir/lib$WM_COMPILER_LIB_ARCH/libmetis.a \
-            $dir/lib$WM_COMPILER_LIB_ARCH/libmetis.$SO \
+            $dir/lib$WM_COMPILER_LIB_ARCH/libmetis$EXT_SO \
            ;
        do
            if [ -r "$lib" ]
@@ -146,10 +146,10 @@ install()

    if [ "$targetType" = libso ]
    then
-        \mv $libdir/libmetis.$SO $FOAM_EXT_LIBBIN
+        \mv $libdir/libmetis$EXT_SO $FOAM_EXT_LIBBIN
        rmdir $libdir 2>/dev/null # Failed rmdir is uncritical

-        echo "Installing: $FOAM_EXT_LIBBIN/libmetis.$SO"
+        echo "Installing: $FOAM_EXT_LIBBIN/libmetis$EXT_SO"
    fi
    return 0
 }
@@ -168,7 +168,7 @@ echo
    export GIT_DIR=$PWD/.git # Mask seeing our own git-repo

    rm -rf $METIS_ARCH_PATH
-    rm -f $FOAM_EXT_LIBBIN/libmetis.$SO
+    rm -f $FOAM_EXT_LIBBIN/libmetis$EXT_SO

    # Adjust metis integer size to match OpenFOAM label-size
    sed -i -e 's=\(#define IDXTYPEWIDTH\).*=\1 '$WM_LABEL_SIZE'=' \

--- a/makeMPICH
+++ b/makeMPICH
@@ -19,15 +19,15 @@
 # ----------------------------------------------
 # NO USER-CONFIGURABLE SETTINGS WITHIN THIS FILE
 #------------------------------------------------------------------------------
-# Dynamic library endings (default is .so)
-[ "$(uname -s)" = Darwin ] && SO=dylib || SO=so
+# Dynamic library ending (default is .so)
+[ "$(uname -s)" = Darwin ] && EXT_SO=.dylib || EXT_SO=.so

 # Short-circuit test for an installation
 if [ "$1" = "-test" ]
 then
    [ "$#" -eq 2 ] || { echo "${0##*/} -test : needs 1 argument"; exit 1; }
    dir="$2" # <- MPI_ARCH_PATH
-    if [ -r "$dir/lib$WM_COMPILER_LIB_ARCH/libmpi.$SO" ]
+    if [ -r "$dir/lib$WM_COMPILER_LIB_ARCH/libmpi$EXT_SO" ]
    then
        echo "Have mpich shared library (${dir##*/})"
        exit 0
@@ -125,7 +125,7 @@ fi
 MPI_SOURCE_DIR=$sourceBASE/$mpiPACKAGE
 MPI_ARCH_PATH=$installBASE/$mpiPACKAGE

-if [ -r "$MPI_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH/libmpi.$SO" ]
+if [ -r "$MPI_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH/libmpi$EXT_SO" ]
 then
    echo "Already has shared library"
 elif [ -r "$MPI_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH/libmpi.a" ]

--- a/makeMVAPICH
+++ b/makeMVAPICH
@@ -19,15 +19,15 @@
 # ----------------------------------------------
 # NO USER-CONFIGURABLE SETTINGS WITHIN THIS FILE
 #------------------------------------------------------------------------------
-# Dynamic library endings (default is .so)
-[ "$(uname -s)" = Darwin ] && SO=dylib || SO=so
+# Dynamic library ending (default is .so)
+[ "$(uname -s)" = Darwin ] && EXT_SO=.dylib || EXT_SO=.so

 # Short-circuit test for an installation
 if [ "$1" = "-test" ]
 then
    [ "$#" -eq 2 ] || { echo "${0##*/} -test : needs 1 argument"; exit 1; }
    dir="$2" # <- MPI_ARCH_PATH
-    if [ -r "$dir/lib$WM_COMPILER_LIB_ARCH/libmpi.$SO" ]
+    if [ -r "$dir/lib$WM_COMPILER_LIB_ARCH/libmpi$EXT_SO" ]
    then
        echo "Have mpich shared library (${dir##*/})"
        exit 0
@@ -129,7 +129,7 @@ fi
 MPI_SOURCE_DIR=$sourceBASE/$mpiPACKAGE
 MPI_ARCH_PATH=$installBASE/$mpiPACKAGE

-if [ -r "$MPI_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH/libmpi.$SO" ]
+if [ -r "$MPI_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH/libmpi$EXT_SO" ]
 then
    echo "Already has shared library"
 elif [ -r "$MPI_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH/libmpi.a" ]

--- a/makeOPENMPI
+++ b/makeOPENMPI
@@ -19,15 +19,15 @@
 # ----------------------------------------------
 # NO USER-CONFIGURABLE SETTINGS WITHIN THIS FILE
 #------------------------------------------------------------------------------
-# Dynamic library endings (default is .so)
-[ "$(uname -s)" = Darwin ] && SO=dylib || SO=so
+# Dynamic library ending (default is .so)
+[ "$(uname -s)" = Darwin ] && EXT_SO=.dylib || EXT_SO=.so

 # Short-circuit test for an installation
 if [ "$1" = "-test" ]
 then
    [ "$#" -eq 2 ] || { echo "${0##*/} -test : needs 1 argument"; exit 1; }
    dir="$2" # <- MPI_ARCH_PATH
-    if [ -r "$dir/lib$WM_COMPILER_LIB_ARCH/libmpi.$SO" ]
+    if [ -r "$dir/lib$WM_COMPILER_LIB_ARCH/libmpi$EXT_SO" ]
    then
        echo "    Have openmpi shared library (${dir##*/})"
        exit 0
@@ -133,7 +133,7 @@ fi
 MPI_SOURCE_DIR=$sourceBASE/$mpiPACKAGE
 MPI_ARCH_PATH=$installBASE/$mpiPACKAGE

-if [ -r "$MPI_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH/libmpi.$SO" ]
+if [ -r "$MPI_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH/libmpi$EXT_SO" ]
 then
    echo "Already has shared library: $MPI_ARCH_PATH"
 elif [ -r "$MPI_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH/libmpi.a" ]

--- a/makePETSC
+++ b/makePETSC
@@ -19,8 +19,8 @@
 # ----------------------------------------------
 # NO USER-CONFIGURABLE SETTINGS WITHIN THIS FILE
 #------------------------------------------------------------------------------
-# Dynamic library endings (default is .so)
-[ "$(uname -s)" = Darwin ] && SO=dylib || SO=so
+# Dynamic library ending (default is .so)
+[ "$(uname -s)" = Darwin ] && EXT_SO=.dylib || EXT_SO=.so

 # Short-circuit test for an installation
 if [ "$1" = "-test" ]
@@ -30,11 +30,11 @@ then
    if [ -d "$dir/include" ]
    then
        for lib in \
-            $FOAM_EXT_LIBBIN/libpetsc.$SO \
+            $FOAM_EXT_LIBBIN/libpetsc$EXT_SO \
            $dir/lib/libpetsc.a \
-            $dir/lib/libpetsc.$SO \
+            $dir/lib/libpetsc$EXT_SO \
            $dir/lib$WM_COMPILER_LIB_ARCH/libpetsc.a \
-            $dir/lib$WM_COMPILER_LIB_ARCH/libpetsc.$SO \
+            $dir/lib$WM_COMPILER_LIB_ARCH/libpetsc$EXT_SO \
            ;
        do
            if [ -r "$lib" ]