mirror of
https://develop.openfoam.com/Development/openfoam.git
synced 2025-11-28 03:28:01 +00:00
added Foam::FOAMbuild to Foam::FOAMversion
- avoids problems with finding files based on FOAMversion (reported by Mattijs)
This commit is contained in:
@ -2,7 +2,7 @@
|
||||
cd ${0%/*} || exit 1 # run from this directory
|
||||
set -x
|
||||
|
||||
# update Foam::FOAMversion string if required
|
||||
# update OpenFOAM version strings if required
|
||||
wmakePrintBuild -check || /bin/rm -f OpenFOAM/Make/$WM_OPTIONS/global.? 2>/dev/null
|
||||
|
||||
wmakeLnInclude -f OpenFOAM
|
||||
|
||||
@ -38,7 +38,7 @@ inline void Foam::IOobject::writeBanner(Stream& os, bool noHint)
|
||||
{
|
||||
memset(spaces, ' ', 40);
|
||||
|
||||
size_t len = strlen(Foam::FOAMversion);
|
||||
size_t len = strlen(Foam::FOAMbuild);
|
||||
if (len < 38)
|
||||
{
|
||||
spaces[38 - len] = '\0';
|
||||
@ -64,7 +64,7 @@ inline void Foam::IOobject::writeBanner(Stream& os, bool noHint)
|
||||
os <<
|
||||
"| ========= | |\n"
|
||||
"| \\\\ / F ield | OpenFOAM: The Open Source CFD Toolbox |\n"
|
||||
"| \\\\ / O peration | Version: " << FOAMversion << spaces << "|\n"
|
||||
"| \\\\ / O peration | Version: " << FOAMbuild << spaces << "|\n"
|
||||
"| \\\\ / A nd | Web: www.OpenFOAM.org |\n"
|
||||
"| \\\\/ M anipulation | |\n"
|
||||
"\\*---------------------------------------------------------------------------*/\n";
|
||||
|
||||
@ -35,6 +35,12 @@ Global
|
||||
Description
|
||||
OpenFOAM version number static string.
|
||||
|
||||
Global
|
||||
Foam::FOAMbuild
|
||||
|
||||
Description
|
||||
OpenFOAM version number static string with build information
|
||||
|
||||
SourceFiles
|
||||
global.Cver
|
||||
|
||||
@ -48,6 +54,7 @@ SourceFiles
|
||||
namespace Foam
|
||||
{
|
||||
extern const char* const FOAMversion;
|
||||
extern const char* const FOAMbuild;
|
||||
}
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
@ -28,14 +28,15 @@ Description
|
||||
avoid the use of unconstructed data in the global namespace.
|
||||
|
||||
This file has the extension .Cver to trigger a Makefile rule that converts
|
||||
WM_PROJECT_VERSION into the appropriate version string.
|
||||
'VERSION\_STRING' and 'BUILD\_STRING' into the appropriate strings.
|
||||
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
#include "foamVersion.H"
|
||||
|
||||
const char* const Foam::FOAMversion = "WM_PROJECT_VERSION";
|
||||
const char* const Foam::FOAMversion = "VERSION_STRING";
|
||||
const char* const Foam::FOAMbuild = "BUILD_STRING";
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
// Static initializers for string::null, word::null and fileName::null
|
||||
|
||||
Reference in New Issue
Block a user