From 22d6097d595330b5dccd6d322d4f09bf8dd4ca41 Mon Sep 17 00:00:00 2001 From: Jessica James Date: Fri, 5 Nov 2021 16:56:50 -0500 Subject: [PATCH] Bump version number, allow cmake to insert version numeric, update copyright year --- src/common/Jupiter.cpp | 2 +- src/include/Jupiter/Jupiter.h | 26 ++++++++++++++++++++++++-- 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/src/common/Jupiter.cpp b/src/common/Jupiter.cpp index d505d24..366d325 100644 --- a/src/common/Jupiter.cpp +++ b/src/common/Jupiter.cpp @@ -21,7 +21,7 @@ extern "C" { const char *Jupiter_version = JUPITER_VERSION; - const char *Jupiter_copyright = "Copyright (C) 2013-2016 Jessica James. ISC License."; + const char *Jupiter_copyright = "Copyright (C) 2013-2021 Jessica James. ISC License."; } const char *Jupiter::version = Jupiter_version; diff --git a/src/include/Jupiter/Jupiter.h b/src/include/Jupiter/Jupiter.h index 12d6d28..1ecc31d 100644 --- a/src/include/Jupiter/Jupiter.h +++ b/src/include/Jupiter/Jupiter.h @@ -37,10 +37,32 @@ #endif // _WIN32 #if !defined JUPITER_PLATFORM -#define JUPITER_PLATFORM + +#ifdef _WIN64 +#define JUPITER_PLATFORM "Win64" +#elif defined _WIN32 +#define JUPITER_PLATFORM "Win32" +#elif defined __linux__ +#define JUPITER_PLATFORM "Linux" +#elif defined __unix__ +#define JUPITER_PLATFORM "UNIX" +#elif defined _POSIX_VERSION +#define JUPITER_PLATFORM "POSIX" +#else +#define JUPITER_PLATFORM "Unknown" #endif -#define JUPITER_VERSION "Jupiter 1.0 (" JUPITER_PLATFORM __DATE__ ")" /** Version of this program at compile time. */ +#endif // JUPITER_PLATFORM + +#if !defined JUPITER_VERSION_SHORT +#if !defined JUPITER_REVISION +#define JUPITER_REVISION +#endif // JUPITER_REVISION + +#define JUPITER_VERSION_SHORT "1.1.0" JUPITER_REVISION +#endif // JUPITER_VERSION_SHORT + +#define JUPITER_VERSION "Jupiter " JUPITER_VERSION_SHORT " (" JUPITER_PLATFORM " " __DATE__ ")" /** Version of this program at compile time. */ #if defined __cplusplus extern "C"