build: move commit_id and build_info to common

As we will need these outside of OcreCore

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

Author: casaroli

.gitignore

@@ -54,7 +54,7 @@ Thumbs.db
 # Generated by VS
 settings.json
 
-src/ocre/commit_id.h
+src/common/include/ocre/commit_id.h
 
 **/.DS_Store
 

CMakeLists.txt

@@ -19,6 +19,7 @@ include (src/samples/demo/demo_containers.cmake)
 add_subdirectory(src/uthash)
 
 # core
+add_subdirectory(src/common)
 add_subdirectory(src/ocre)
 add_subdirectory(src/runtime)
 

src/common/CMakeLists.txt

@@ -0,0 +1,60 @@
+# @copyright Copyright (c) contributors to Project Ocre,
+# which has been established as Project Ocre a Series of LF Projects, LLC
+#
+# SPDX-License-Identifier: Apache-2.0
+
+# Check if we are in a git repository
+execute_process(
+    COMMAND git rev-parse --git-dir
+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+    OUTPUT_VARIABLE GIT_DIR
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+    ERROR_QUIET
+)
+
+if(GIT_DIR)
+    message(STATUS "Detected git repository. Automatic commit ID tracking is enabled.")
+
+    # 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"
+        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+        VERBATIM
+        DEPENDS always_rebuild
+    )
+endif()
+
+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"
+    VERBATIM
+    DEPENDS always_rebuild
+)
+
+# dummy command used to make the custom commands be re-run on every build (not just configure)
+add_custom_command(
+    OUTPUT always_rebuild
+    COMMAND cmake -E echo
+)
+
+add_library(OcreCommon INTERFACE)
+
+# if we are not in a git repository, just fail automatically if we are missing commit_id.h
+target_sources(OcreCommon
+    PRIVATE
+    include/ocre/build_info.h
+    include/ocre/commit_id.h
+)
+
+target_include_directories(OcreCommon
+    INTERFACE
+    include
+    ${CMAKE_CURRENT_BINARY_DIR}/include
+)

src/ocre/CMakeLists.txt

@@ -3,49 +3,8 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-# Check if we are in a git repository
-execute_process(
-    COMMAND git rev-parse --git-dir
-    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-    OUTPUT_VARIABLE GIT_DIR
-    OUTPUT_STRIP_TRAILING_WHITESPACE
-    ERROR_QUIET
-)
-
-if(GIT_DIR)
-    message(STATUS "Detected git repository. Automatic commit ID tracking is enabled.")
-
-    # Generate commit ID header file in source dir if we are in a git repository
-    add_custom_command(
-        OUTPUT commit_id.h
-        COMMAND sh -c "echo '/* Auto-generated file. DO NOT EDIT */' > commit_id.h"
-        COMMAND sh -c "echo \"#define GIT_COMMIT_ID \\\"$(git describe --always --abbrev=0 --dirty)\\\"\" >> commit_id.h"
-        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-        VERBATIM
-        DEPENDS always_rebuild
-    )
-endif()
-
-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
-    VERBATIM
-    DEPENDS always_rebuild
-)
-
-# dummy command used to make the custom commands be re-run on every build (not just configure)
-add_custom_command(
-    OUTPUT always_rebuild
-    COMMAND cmake -E echo
-)
-
 add_library(OcreCore)
 
-# if we are not in a git repository, just fail automatically if we are missing commit_id.h
 target_sources(OcreCore
     PRIVATE
     container.c
@@ -54,8 +13,6 @@ target_sources(OcreCore
     util/rm_rf.c
     util/string_array.c
     util/unique_random_id.c
-    commit_id.h
-    include/ocre/build_info.h
 )
 
 target_link_libraries(OcreCore
@@ -64,6 +21,7 @@ target_link_libraries(OcreCore
     OcrePlatform
     OcreRuntime
     OcreRuntimeWamr
+    OcreCommon
 )
 
 target_include_directories(OcreCore

src/ocre/ocre.c

@@ -20,11 +20,11 @@
 #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 "commit_id.h"
 #include "version.h"
 
 LOG_MODULE_REGISTER(ocre, CONFIG_OCRE_LOG_LEVEL);

zephyr/CMakeLists.txt

@@ -18,10 +18,12 @@ set(CMAKE_CXX_STANDARD 17)
 include (wamr.cmake)
 
 add_subdirectory(../src/uthash "uthash")
+add_subdirectory(../src/common "ocre-common")
 add_subdirectory(../src/ocre "ocre-core")
 add_subdirectory(../src/runtime "ocre-runtime")
 add_subdirectory(../src/runtime/wamr-wasip1 "ocre-runtime-wamr-wasip1")
 add_subdirectory(../src/platform/zephyr "ocre-zephyr")
+
 if(CONFIG_OCRE_SHELL)
     message(STATUS "Shell is enabled")
     add_subdirectory(../src/shell "ocre-shell")