Skip to content
Snippets Groups Projects
Commit d29388f1 authored by Mark OLESEN's avatar Mark OLESEN
Browse files

STYLE: use foamVersion::api instead of OPENFOAM define

- for referencing the etc locations, or reporting the current API
  value.
parent 99b85e3b
Branches
Tags
No related merge requests found
...@@ -31,6 +31,7 @@ License ...@@ -31,6 +31,7 @@ License
#include "OSspecific.H" #include "OSspecific.H"
#include "etcFiles.H" #include "etcFiles.H"
#include "dictionary.H" #include "dictionary.H"
#include "foamVersion.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
...@@ -81,7 +82,7 @@ void Foam::dynamicCode::checkSecurity ...@@ -81,7 +82,7 @@ void Foam::dynamicCode::checkSecurity
<< " allowSystemOperations 1" << nl << nl << " allowSystemOperations 1" << nl << nl
<< "to the InfoSwitches setting in the system controlDict." << nl << "to the InfoSwitches setting in the system controlDict." << nl
<< "The system controlDict is any of" << nl << nl << "The system controlDict is any of" << nl << nl
<< " ~/.OpenFOAM/" << OPENFOAM << "/controlDict" << nl << " ~/.OpenFOAM/" << foamVersion::api << "/controlDict" << nl
<< " ~/.OpenFOAM/controlDict" << nl << " ~/.OpenFOAM/controlDict" << nl
<< " $WM_PROJECT_DIR/etc/controlDict" << nl << endl << " $WM_PROJECT_DIR/etc/controlDict" << nl << endl
<< exit(FatalIOError); << exit(FatalIOError);
......
...@@ -1539,11 +1539,7 @@ void Foam::argList::displayDoc(bool source) const ...@@ -1539,11 +1539,7 @@ void Foam::argList::displayDoc(bool source) const
CStringList command(stringOps::splitSpace(docBrowser)); CStringList command(stringOps::splitSpace(docBrowser));
Info Info
<< "OpenFOAM" << "OpenFOAM " << foamVersion::api << " documentation:" << nl
#if OPENFOAM
<< ' ' << OPENFOAM
#endif
<< " documentation:" << nl
<< " " << command << nl << endl; << " " << command << nl << endl;
Foam::system(command, true); Foam::system(command, true);
......
...@@ -26,6 +26,7 @@ License ...@@ -26,6 +26,7 @@ License
#include "systemCall.H" #include "systemCall.H"
#include "Time.H" #include "Time.H"
#include "dynamicCode.H" #include "dynamicCode.H"
#include "foamVersion.H"
#include "addToRunTimeSelectionTable.H" #include "addToRunTimeSelectionTable.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
...@@ -127,7 +128,7 @@ bool Foam::functionObjects::systemCall::read(const dictionary& dict) ...@@ -127,7 +128,7 @@ bool Foam::functionObjects::systemCall::read(const dictionary& dict)
<< " allowSystemOperations 1" << nl << nl << " allowSystemOperations 1" << nl << nl
<< "to the InfoSwitches setting in the system controlDict." << nl << "to the InfoSwitches setting in the system controlDict." << nl
<< "The system controlDict is any of" << nl << nl << "The system controlDict is any of" << nl << nl
<< " ~/.OpenFOAM/" << OPENFOAM << "/controlDict" << nl << " ~/.OpenFOAM/" << foamVersion::api << "/controlDict" << nl
<< " ~/.OpenFOAM/controlDict" << nl << " ~/.OpenFOAM/controlDict" << nl
<< " $WM_PROJECT_DIR/etc/controlDict" << nl << endl << " $WM_PROJECT_DIR/etc/controlDict" << nl << endl
<< exit(FatalError); << exit(FatalError);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment