zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

BUG: dynamicCodeContext: preprocessing options_, localCode_

Browse Source
This commit is contained in:
mattijs
2011-06-21 11:07:48 +01:00
parent 258d9a7f59
commit 8fc5612159
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/OpenFOAM/db/dynamicLibrary/dynamicCode/dynamicCodeContext.C
View File

@ -85,6 +85,14 @@ Foam::dynamicCodeContext::dynamicCodeContext(const dictionary& dict)
stringOps::inplaceExpand(libs_, dict); stringOps::inplaceExpand(libs_, dict);
} }
// optional
const entry* localPtr = dict.lookupEntryPtr("localCode", false, false);
if (localPtr)
{
localCode_ = stringOps::trim(localPtr->stream());
stringOps::inplaceExpand(localCode_, dict);
}
// calculate SHA1 digest from include, options, localCode, code // calculate SHA1 digest from include, options, localCode, code
OSHA1stream os; OSHA1stream os;
os << include_ << options_ << libs_ << localCode_ << code_; os << include_ << options_ << libs_ << localCode_ << code_;
@ -103,14 +111,18 @@ Foam::dynamicCodeContext::dynamicCodeContext(const dictionary& dict)
{ {
addLineDirective(include_, includePtr->startLineNumber(), dict.name()); addLineDirective(include_, includePtr->startLineNumber(), dict.name());
} }
if (optionsPtr)
{ // Do not add line directive to options_ (Make/options) since at it is a
addLineDirective(options_, optionsPtr->startLineNumber(), dict.name()); // single line at this point. Can be fixed.
}
if (libsPtr) if (libsPtr)
{ {
addLineDirective(libs_, libsPtr->startLineNumber(), dict.name()); addLineDirective(libs_, libsPtr->startLineNumber(), dict.name());
} }
if (localPtr)
{
addLineDirective(localCode_, localPtr->startLineNumber(), dict.name());
}
} }