From f05ff817229d07fb7bce0524b173f4df460172df Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Thu, 13 Jun 2019 18:22:10 +0200 Subject: [PATCH] CONFIG: bump API to 1906 (pre-release) - adjust copyright dates for manpages --- META-INFO/api-info | 2 +- src/OpenFOAM/global/argList/argListHelp.C | 8 +++++++- wmake/rules/General/general | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/META-INFO/api-info b/META-INFO/api-info index bade5ef065..4448e7818b 100644 --- a/META-INFO/api-info +++ b/META-INFO/api-info @@ -1,2 +1,2 @@ -api=1904 +api=1906 patch=0 diff --git a/src/OpenFOAM/global/argList/argListHelp.C b/src/OpenFOAM/global/argList/argListHelp.C index 850359654c..bfc8e694ec 100644 --- a/src/OpenFOAM/global/argList/argListHelp.C +++ b/src/OpenFOAM/global/argList/argListHelp.C @@ -33,6 +33,12 @@ License namespace Foam { +// Convert api number (YYMM) -> 20YY. Eg, 1906 -> 2019 +static inline int apiYear() +{ + return 2000 + (foamVersion::api / 100); +} + // manpage Footer static inline void printManFooter() { @@ -40,7 +46,7 @@ static inline void printManFooter() << "Online documentation " << "https://www.openfoam.com/documentation/" << nl << ".SH COPYRIGHT" << nl - << "Copyright \\(co 2018 OpenCFD Ltd." << nl; + << "Copyright \\(co 2018-" << apiYear() << " OpenCFD Ltd." << nl; } diff --git a/wmake/rules/General/general b/wmake/rules/General/general index 4eb70d6c45..6a6c7e130d 100644 --- a/wmake/rules/General/general +++ b/wmake/rules/General/general @@ -1,5 +1,5 @@ #-------------------------------*- makefile -*--------------------------------- -WM_VERSION = OPENFOAM=1904 +WM_VERSION = OPENFOAM=1906 AR = ar ARFLAGS = cr