diff --git a/applications/test/wmake1/Make/files b/applications/test/wmake1/Make/files
new file mode 100644
index 0000000000000000000000000000000000000000..3ef1ed76a9321caf262e083de6ce884c8690e5a7
--- /dev/null
+++ b/applications/test/wmake1/Make/files
@@ -0,0 +1,10 @@
+Test-wmake1.C
+
+/* #if OPENFOAM == 1812 */
+#if OPENFOAM > 1812
+newStub.C
+#else
+oldStub.C
+#endif
+
+EXE = $(FOAM_APPBIN)/Test-wmake1
diff --git a/applications/test/wmake1/Make/options b/applications/test/wmake1/Make/options
new file mode 100644
index 0000000000000000000000000000000000000000..75c7356f1c6d09cf219b7d3357cdc94afc8d45e5
--- /dev/null
+++ b/applications/test/wmake1/Make/options
@@ -0,0 +1,2 @@
+EXE_INC =
+EXE_LIBS =
diff --git a/applications/test/wmake1/Test-wmake1.C b/applications/test/wmake1/Test-wmake1.C
new file mode 100644
index 0000000000000000000000000000000000000000..614d9189fb8e2c9964383340c2c7b0f7330ae0b1
--- /dev/null
+++ b/applications/test/wmake1/Test-wmake1.C
@@ -0,0 +1,56 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
+ \\/ M anipulation |
+-------------------------------------------------------------------------------
+License
+ This file is part of OpenFOAM.
+
+ OpenFOAM is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
+
+Application
+ Test-wmake1
+
+Description
+ Some tests for wmake features.
+ For example, testing how robust or fragile version-dependent conditional
+ compilation works.
+
+\*---------------------------------------------------------------------------*/
+
+#include "argList.H"
+
+namespace Foam
+{
+ void printTest();
+}
+
+
+using namespace Foam;
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+int main(int argc, char *argv[])
+{
+ printTest();
+
+ Info<< "\nEnd\n" << nl;
+
+ return 0;
+}
+
+
+// ************************************************************************* //
diff --git a/applications/test/wmake1/newStub.C b/applications/test/wmake1/newStub.C
new file mode 100644
index 0000000000000000000000000000000000000000..153ccd4173f9488d2cfcac10c3ba5662d11a0e12
--- /dev/null
+++ b/applications/test/wmake1/newStub.C
@@ -0,0 +1,13 @@
+// Some test code
+
+#include "foamVersion.H"
+#include "IOstreams.H"
+
+namespace Foam
+{
+ void printTest()
+ {
+ Info<< nl;
+ foamVersion::printBuildInfo();
+ }
+}
diff --git a/applications/test/wmake1/oldStub.C b/applications/test/wmake1/oldStub.C
new file mode 100644
index 0000000000000000000000000000000000000000..136b7d80866b9b0324739b6776980045dfc9f642
--- /dev/null
+++ b/applications/test/wmake1/oldStub.C
@@ -0,0 +1,17 @@
+// Some test code
+
+#include "IOstreams.H"
+
+namespace Foam
+{
+ void printTest()
+ {
+ Info<< nl << "Using old stub" << nl;
+
+ #if OPENFOAM
+ Info<< "OPENFOAM=" << OPENFOAM << nl;
+ #else
+ Info<< "OPENFOAM is undefined" << nl;
+ #endif
+ }
+}
diff --git a/wmake/makefiles/general b/wmake/makefiles/general
index 198e5c1e59a3eb6c7b56fca8a0be5d902fbd127a..2177e89a87c2b73e5d99726b6f95b0cbf9c9f161 100644
--- a/wmake/makefiles/general
+++ b/wmake/makefiles/general
@@ -175,7 +175,7 @@ lib: $(LIB).a | silent
$(LIB).a: $(OBJECTS)
@$(WM_SCRIPTS)/makeTargetDir $(LIB)
@rm -f $(LIB).a
- $(call QUIET_MESSAGE,ar,$(LIB))
+ $(call QUIET_MESSAGE,ar,$(LIB).a)
$E $(AR) $(ARFLAGS) $(LIB).a $(OBJECTS)
$(call QUIET_MESSAGE,ranlib,$(notdir $(LIB)))
$E $(RANLIB) $(LIB).a
diff --git a/wmake/makefiles/info b/wmake/makefiles/info
index 90fa2b550df45c70030d48dda837ca346a36ffc4..600399a173eb769f5b59484970e23b486768528a 100644
--- a/wmake/makefiles/info
+++ b/wmake/makefiles/info
@@ -43,16 +43,13 @@ include $(GENERAL_RULES)/general
# Display information
#------------------------------------------------------------------------------
-export WM_VERSION
-
-
.PHONY: compile
compile:
@echo "$(strip $(CC) $(c++FLAGS))"
.PHONY: api
api:
- @echo "$${WM_VERSION#*=}"
+ @echo "$(WM_VERSION)" | sed -e 's/^.*=//'
.PHONY: c
c:
diff --git a/wmake/wmake b/wmake/wmake
index d9b43e001e0cc0496e88816db0632bbbab2f6a9c..20fef12ae3e92109eb26b78ffa61bb6b1132dafa 100755
--- a/wmake/wmake
+++ b/wmake/wmake
@@ -70,18 +70,16 @@ options:
-s | -silent Quiet mode (does not echo commands)
-a | -all wmake all sub-directories, running Allwmake if present
-q | -queue wmakeCollect all sub-directories, running Allwmake if present
- -k | -keep-going Keep going without stopping when errors occur (-non-stop)
+ -k | -keep-going Keep going even when errors occur (-non-stop)
-j Compile using all local cores/hyperthreads
- -jN or -j N Compile using N cores/hyperthreads
+ -jN | -j N Compile using N cores/hyperthreads
-no-scheduler Disable scheduled parallel compilation
- -pwd Print root directory containing a Make/ directory and exit
- -update Update lnInclude directories, dep files, remove deprecated
- files and directories
- -show Identical to -show-compile
- -show-api Print api value and exit
- -show-compile Print C++ compiler value/flags and exit
- -show-cxx Print C++ compiler value and exit
- -show-cxxflags Print C++ compiler flags and exit
+ -pwd Print root directory containing a Make/ directory
+ -update Update lnInclude dirs, dep files, remove deprecated files/dirs
+ -show-api Print api value
+ -show-compile Print C++ compiler value and flags (shortcut: -show)
+ -show-cxx Print C++ compiler value
+ -show-cxxflags Print C++ compiler flags
-h | -help Print the usage