tweaked build version strings

- added wmakePrintBuild -check, -update, -version options
- only update .build cache when explictly requested and
  from within the wmake Cver rules
- use -check option to avoid unnecessary remake in src/Allwmake

src/Allwmake

@@ -2,8 +2,8 @@
 cd ${0%/*} || exit 1    # run from this directory
 set -x
 
-# force update of Foam::FOAMversion string (git tag or $WM_PROJECT_VERSION)
+# update Foam::FOAMversion string if required
-/bin/rm -f OpenFOAM/Make/$WM_OPTIONS/global.? 2>/dev/null
+wmakePrintBuild -check || /bin/rm -f OpenFOAM/Make/$WM_OPTIONS/global.? 2>/dev/null
 
 wmakeLnInclude -f OpenFOAM
 wmakeLnInclude -f OSspecific/$WM_OS

wmake/rules/General/version

@@ -1,10 +1,10 @@
 .SUFFIXES: .Cver
 
 #
-# update version string
+# update version string in C++ file and in $WM_PROJECT_DIR/.build file
 #
 Cvertoo = \
-    sed s/WM_PROJECT_VERSION/\"$(shell wmakePrintBuild)\"/ $$SOURCE > $*.C; \
+    sed s/WM_PROJECT_VERSION/\"$(shell wmakePrintBuild -update)\"/ $$SOURCE > $*.C; \
     $(CC) $(c++FLAGS) -c $*.C -o $@
 
 .Cver.dep:

wmake/wmakePrintBuild

@@ -35,7 +35,12 @@ Script=${0##*/}
 usage() {
     while [ "$#" -ge 1 ]; do echo "$1"; shift; done
     cat<<USAGE
-usage: $Script
+usage: $Script [OPTION]
+options:
+  -check          check git description vs. \$WM_PROJECT_DIR/.build
+                  (exit code 0 for no changes)
+  -update         update the \$WM_PROJECT_DIR/.build from the git description
+  -version VER    specify an alternative version
 
 Print the version used when building the project, in this order of precedence:
   * git description
@@ -47,11 +52,33 @@ USAGE
 }
 #------------------------------------------------------------------------------
 
-# provide immediate help
+unset checkOnly update version
-if [ "$1" = "-h" -o "$1" = "-help" ]
+
-then
+# parse options
-    usage
+while [ "$#" -gt 0 ]
-fi
+do
+    case "$1" in
+    -h | -help)
+        usage
+        ;;
+    -check)
+        checkOnly=true
+        shift
+        ;;
+    -update)
+        update=true
+        shift
+        ;;
+    -version)
+        [ "$#" -ge 2 ] || usage "'$1' option requires an argument"
+        version=$2
+        shift 2
+        ;;
+    *)
+        usage "unknown option/argument: '$*'"
+        ;;
+    esac
+done
 
 #------------------------------------------------------------------------------
 
@@ -61,35 +88,60 @@ fi
 build="$WM_PROJECT_DIR/.build"
 previous=$(tail -1 $build 2>/dev/null)
 
-#
+# specified a version
-# building under git
+if [ -n "$version" ]
-# note: could also use --abbrev=32 for maximum resolution
-#
-version=$(git describe --always --tags 2>/dev/null)
-if [ $? -eq 0 ]
 then
-    # update persistent build tag (this could be made optional or removed)
+    # specified a version - no error possible
-    if [ "$version" != "$previous" ]
+    rc=0
+else
+    # building under git (could use --abbrev=32 for maximum resolution)
+    version=$(git describe --always --tags 2>/dev/null)
+    rc=$?
+fi
+
+
+# update persistent build tag if possible
+if [ $rc -eq 0 -a -n "$update" -a "$version" != "$previous" ]
+then
+    if [ -w "$build" -a \( -w "$WM_PROJECT_DIR" -o ! -e "$build" \) ]
     then
-        if [ -w "$build" -a \( -w "$WM_PROJECT_DIR" -o ! -e "$build" \) ]
+        echo $version >| "$build" 2>/dev/null
-        then
-            echo $version >| "$build" 2>/dev/null
-        fi
     fi
+fi
 
+
+# check git vs. persistent build tag - no output
+if [ -n "$checkOnly" ]
+then
+    if [ $rc -eq 0 ]
+    then
+        test "$version" = "$previous"
+        rc=$?
+        if [ $rc -eq 0 ]
+        then
+            echo "same version as previous build"
+        else
+            echo "version changed from previous build"
+        fi
+    else
+        echo "no git description found"
+    fi
+    exit $rc
+fi
+
+
+
+if [ $rc -eq 0 ]
+then
+    # output the git description or -version version
     echo $version
-
 elif [ -n "$previous" ]
 then
-
     # use previous build tag
     echo $previous
-
 else
-
     # fallback to WM_PROJECT_VERSION
     echo ${WM_PROJECT_VERSION:-unknown}
-
 fi
 
 #------------------------------------------------------------------------------