refactor: move version to ocre/common and make it private

Signed-off-by: Marco Casaroli <marco.casaroli@gmail.com>

Author: casaroli

src/common/CMakeLists.txt

@@ -17,10 +17,9 @@ if(GIT_DIR)
 
     # Generate commit ID header file in source dir if we are in a git repository
     add_custom_command(
-        OUTPUT include/ocre/commit_id.h
-        COMMAND sh -c "mkdir -p ${CMAKE_CURRENT_BINARY_DIR}/include/ocre"
-        COMMAND sh -c "echo '/* Auto-generated file. DO NOT EDIT */' > ${CMAKE_CURRENT_BINARY_DIR}/include/ocre/commit_id.h"
-        COMMAND sh -c "echo \"#define GIT_COMMIT_ID \\\"$(git describe --always --abbrev=0 --dirty)\\\"\" >> ${CMAKE_CURRENT_BINARY_DIR}/include/ocre/commit_id.h"
+        OUTPUT include/commit_id.h
+        COMMAND sh -c "echo '/* Auto-generated file. DO NOT EDIT */' > ${CMAKE_CURRENT_BINARY_DIR}/include/commit_id.h"
+        COMMAND sh -c "echo \"#define GIT_COMMIT_ID \\\"$(git describe --always --abbrev=0 --dirty)\\\"\" >> ${CMAKE_CURRENT_BINARY_DIR}/include/commit_id.h"
         WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
         VERBATIM
         DEPENDS always_rebuild
@@ -31,9 +30,9 @@ file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include/ocre)
 
 # Generate build info header file in binary dir for every build
 add_custom_command(
-    OUTPUT include/ocre/build_info.h
-    COMMAND sh -c "echo \"#define OCRE_BUILD_HOST_INFO \\\"$ENV{USER} @ $(uname -a)\\\"\" > include/ocre/build_info.h"
-    COMMAND sh -c "echo \"#define OCRE_BUILD_DATE \\\"$(date +'%Y-%m-%d %H:%M:%S %Z')\\\"\" >> include/ocre/build_info.h"
+    OUTPUT include/build_info.h
+    COMMAND sh -c "echo \"#define OCRE_BUILD_HOST_INFO \\\"$ENV{USER} @ $(uname -a)\\\"\" > include/build_info.h"
+    COMMAND sh -c "echo \"#define OCRE_BUILD_DATE \\\"$(date +'%Y-%m-%d %H:%M:%S %Z')\\\"\" >> include/build_info.h"
     VERBATIM
     DEPENDS always_rebuild
 )
@@ -50,12 +49,13 @@ add_library(OcreCommon)
 target_sources(OcreCommon
     PRIVATE
     common.c
-    include/ocre/build_info.h
-    include/ocre/commit_id.h
+    include/build_info.h
+    include/commit_id.h
 )
 
 target_include_directories(OcreCommon
+    PRIVATE
+    ${CMAKE_CURRENT_BINARY_DIR}/include
     PUBLIC
     include
-    ${CMAKE_CURRENT_BINARY_DIR}/include
 )

src/common/common.c

@@ -2,6 +2,21 @@
 #include <ctype.h>
 #include <string.h>
 
+#include <ocre/common.h>
+
+#include "version.h"
+#include "build_info.h"
+#include "commit_id.h"
+
+/* Constant build information */
+
+const struct ocre_config ocre_build_configuration = {
+	.build_info = OCRE_BUILD_HOST_INFO,
+	.version = OCRE_VERSION_STRING,
+	.commit_id = GIT_COMMIT_ID,
+	.build_date = OCRE_BUILD_DATE,
+};
+
 int ocre_is_valid_name(const char *id)
 {
 	/* Cannot be NULL */

src/common/include/ocre/common.h

@@ -8,6 +8,25 @@
 #ifndef OCRE_COMMON_H
 #define OCRE_COMMON_H
 
+/**
+ * @brief Build configuration of the Ocre Library
+ * @headerfile ocre.h <ocre/ocre.h>
+ *
+ * There should only be only one instance of this structure in the program. And it must be in constant read-only memory.
+ * It is set at build-time and should only be read-only to the user.
+ */
+struct ocre_config {
+	const char *version;	/**< Version of the Ocre Library */
+	const char *commit_id;	/**< Commit ID of the build tree */
+	const char *build_info; /**< Host build information */
+	const char *build_date; /**< Build date */
+};
+
+/**
+ * @brief The instance of configuration of the Ocre Library is constant and compiled-in.
+ */
+extern const struct ocre_config ocre_build_configuration;
+
 /**
  * @brief Check if a container or image names is valid
  * @memberof ocre_context

src/common/include/ocre/version.h src/common/version.hsrc/common/include/ocre/version.h renamed to src/common/version.h

@@ -10,25 +10,6 @@
 
 #include <ocre/runtime/vtable.h>
 
-/**
- * @brief Build configuration of the Ocre Library
- * @headerfile ocre.h <ocre/ocre.h>
- *
- * There should only be only one instance of this structure in the program. And it must be in constant read-only memory.
- * It is set at build-time and should only be read-only to the user.
- */
-struct ocre_config {
-	const char *version;	/**< Version of the Ocre Library */
-	const char *commit_id;	/**< Commit ID of the build tree */
-	const char *build_info; /**< Host build information */
-	const char *build_date; /**< Build date */
-};
-
-/**
- * @brief The instance of configuration of the Ocre Library is constant and compiled-in.
- */
-extern const struct ocre_config ocre_build_configuration;
-
 /**
  * @class ocre_context
  * @headerfile ocre.h <ocre/ocre.h>

src/ocre/include/ocre/library.h

@@ -17,26 +17,13 @@
 
 #include <ocre/ocre.h>
 #include <ocre/platform/log.h>
-#include <ocre/build_info.h>
 #include <ocre/runtime/wamr/wasip1.h>
-#include <ocre/commit_id.h>
 
 #include "context.h"
 #include "util/rm_rf.h"
 
-#include <ocre/version.h>
-
 LOG_MODULE_REGISTER(ocre, CONFIG_OCRE_LOG_LEVEL);
 
-/* Constant build information */
-
-const struct ocre_config ocre_build_configuration = {
-	.build_info = OCRE_BUILD_HOST_INFO,
-	.version = OCRE_VERSION_STRING,
-	.commit_id = GIT_COMMIT_ID,
-	.build_date = OCRE_BUILD_DATE,
-};
-
 /* List of runtimes */
 
 struct runtime_node {