From c7d3425d3890b78919f7049f11ddc271dd4aef20 Mon Sep 17 00:00:00 2001 From: erlingrj Date: Tue, 17 Sep 2024 10:16:34 +0200 Subject: [PATCH 1/5] version->variant to avoid naming collision --- core/CMakeLists.txt | 2 +- {version => variant}/api/CMakeLists.txt | 0 {version => variant}/api/lf_core_version.h | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename {version => variant}/api/CMakeLists.txt (100%) rename {version => variant}/api/lf_core_version.h (100%) diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt index 6d938ae0c..443ce9b86 100644 --- a/core/CMakeLists.txt +++ b/core/CMakeLists.txt @@ -77,7 +77,7 @@ else() target_link_libraries(reactor-c PUBLIC lf::trace-api-types) endif() -include(${LF_ROOT}/version/api/CMakeLists.txt) +include(${LF_ROOT}/variant/api/CMakeLists.txt) target_link_libraries(reactor-c PUBLIC lf::version-api) include(${LF_ROOT}/logging/api/CMakeLists.txt) diff --git a/version/api/CMakeLists.txt b/variant/api/CMakeLists.txt similarity index 100% rename from version/api/CMakeLists.txt rename to variant/api/CMakeLists.txt diff --git a/version/api/lf_core_version.h b/variant/api/lf_core_version.h similarity index 100% rename from version/api/lf_core_version.h rename to variant/api/lf_core_version.h From e6f1fef2e184d20a0f647df37331a98d98706425 Mon Sep 17 00:00:00 2001 From: erlingrj Date: Tue, 17 Sep 2024 10:31:05 +0200 Subject: [PATCH 2/5] Complete rename --- core/federated/RTI/CMakeLists.txt | 2 +- util/tracing/codegen/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/federated/RTI/CMakeLists.txt b/core/federated/RTI/CMakeLists.txt index 5bfbf0196..5ea66c1d6 100644 --- a/core/federated/RTI/CMakeLists.txt +++ b/core/federated/RTI/CMakeLists.txt @@ -43,7 +43,7 @@ IF(CMAKE_BUILD_TYPE MATCHES DEBUG) ENDIF(CMAKE_BUILD_TYPE MATCHES DEBUG) target_compile_definitions(${RTI_LIB} PUBLIC LOG_LEVEL=${LOG_LEVEL}) -include(${LF_ROOT}/version/api/CMakeLists.txt) +include(${LF_ROOT}/variant/api/CMakeLists.txt) target_link_libraries(${RTI_LIB} PUBLIC lf::version-api) include(${LF_ROOT}/logging/api/CMakeLists.txt) diff --git a/util/tracing/codegen/CMakeLists.txt b/util/tracing/codegen/CMakeLists.txt index 5866a2ab3..be755784b 100644 --- a/util/tracing/codegen/CMakeLists.txt +++ b/util/tracing/codegen/CMakeLists.txt @@ -3,7 +3,7 @@ project(TracepointToRs LANGUAGES C) add_executable(tracepoint-to-rs ${CMAKE_CURRENT_LIST_DIR}/src/tracepoint_to_rs.c) set(LF_ROOT ${CMAKE_CURRENT_LIST_DIR}/../../..) include(${LF_ROOT}/trace/api/CMakeLists.txt) -include(${LF_ROOT}/version/api/CMakeLists.txt) +include(${LF_ROOT}/variant/api/CMakeLists.txt) target_link_libraries(tracepoint-to-rs PUBLIC lf::trace-api) target_link_libraries(tracepoint-to-rs PUBLIC lf::version-api) target_link_libraries(tracepoint-to-rs PUBLIC lf::trace-api-types) From e7d3301fedbe39589642a22bc24bca5b7387cdf7 Mon Sep 17 00:00:00 2001 From: erlingrj Date: Tue, 17 Sep 2024 10:52:18 +0200 Subject: [PATCH 3/5] version rename in Makefile --- util/tracing/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util/tracing/Makefile b/util/tracing/Makefile index 0cda03c7d..feeb07dd6 100644 --- a/util/tracing/Makefile +++ b/util/tracing/Makefile @@ -12,7 +12,7 @@ CFLAGS= -I$(REACTOR_C)/include/core/ \ -I$(REACTOR_C)/tag/api \ -I$(REACTOR_C)/trace/api \ -I$(REACTOR_C)/trace/api/types \ - -I$(REACTOR_C)/version/api \ + -I$(REACTOR_C)/variant/api \ -I$(REACTOR_C)/logging/api \ -I$(REACTOR_C)/trace/impl/include \ -DLF_SINGLE_THREADED=1 \ From 2b70a6d549f016688e238c3d47f859f7add60189 Mon Sep 17 00:00:00 2001 From: erlingrj Date: Wed, 18 Sep 2024 13:45:48 +0200 Subject: [PATCH 4/5] Put version in ~/core/version instead --- core/CMakeLists.txt | 2 +- core/federated/RTI/CMakeLists.txt | 2 +- {variant => core/version}/api/CMakeLists.txt | 0 {variant => core/version}/api/lf_core_version.h | 0 util/tracing/Makefile | 2 +- util/tracing/codegen/CMakeLists.txt | 2 +- 6 files changed, 4 insertions(+), 4 deletions(-) rename {variant => core/version}/api/CMakeLists.txt (100%) rename {variant => core/version}/api/lf_core_version.h (100%) diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt index 443ce9b86..9da7eba00 100644 --- a/core/CMakeLists.txt +++ b/core/CMakeLists.txt @@ -77,7 +77,7 @@ else() target_link_libraries(reactor-c PUBLIC lf::trace-api-types) endif() -include(${LF_ROOT}/variant/api/CMakeLists.txt) +include(${LF_ROOT}/core/version/api/CMakeLists.txt) target_link_libraries(reactor-c PUBLIC lf::version-api) include(${LF_ROOT}/logging/api/CMakeLists.txt) diff --git a/core/federated/RTI/CMakeLists.txt b/core/federated/RTI/CMakeLists.txt index 5ea66c1d6..6690dafe7 100644 --- a/core/federated/RTI/CMakeLists.txt +++ b/core/federated/RTI/CMakeLists.txt @@ -43,7 +43,7 @@ IF(CMAKE_BUILD_TYPE MATCHES DEBUG) ENDIF(CMAKE_BUILD_TYPE MATCHES DEBUG) target_compile_definitions(${RTI_LIB} PUBLIC LOG_LEVEL=${LOG_LEVEL}) -include(${LF_ROOT}/variant/api/CMakeLists.txt) +include(${LF_ROOT}/core/version/api/CMakeLists.txt) target_link_libraries(${RTI_LIB} PUBLIC lf::version-api) include(${LF_ROOT}/logging/api/CMakeLists.txt) diff --git a/variant/api/CMakeLists.txt b/core/version/api/CMakeLists.txt similarity index 100% rename from variant/api/CMakeLists.txt rename to core/version/api/CMakeLists.txt diff --git a/variant/api/lf_core_version.h b/core/version/api/lf_core_version.h similarity index 100% rename from variant/api/lf_core_version.h rename to core/version/api/lf_core_version.h diff --git a/util/tracing/Makefile b/util/tracing/Makefile index feeb07dd6..cc2589461 100644 --- a/util/tracing/Makefile +++ b/util/tracing/Makefile @@ -12,7 +12,7 @@ CFLAGS= -I$(REACTOR_C)/include/core/ \ -I$(REACTOR_C)/tag/api \ -I$(REACTOR_C)/trace/api \ -I$(REACTOR_C)/trace/api/types \ - -I$(REACTOR_C)/variant/api \ + -I$(REACTOR_C)/core/version/api \ -I$(REACTOR_C)/logging/api \ -I$(REACTOR_C)/trace/impl/include \ -DLF_SINGLE_THREADED=1 \ diff --git a/util/tracing/codegen/CMakeLists.txt b/util/tracing/codegen/CMakeLists.txt index be755784b..128ce8600 100644 --- a/util/tracing/codegen/CMakeLists.txt +++ b/util/tracing/codegen/CMakeLists.txt @@ -3,7 +3,7 @@ project(TracepointToRs LANGUAGES C) add_executable(tracepoint-to-rs ${CMAKE_CURRENT_LIST_DIR}/src/tracepoint_to_rs.c) set(LF_ROOT ${CMAKE_CURRENT_LIST_DIR}/../../..) include(${LF_ROOT}/trace/api/CMakeLists.txt) -include(${LF_ROOT}/variant/api/CMakeLists.txt) +include(${LF_ROOT}/core/version/api/CMakeLists.txt) target_link_libraries(tracepoint-to-rs PUBLIC lf::trace-api) target_link_libraries(tracepoint-to-rs PUBLIC lf::version-api) target_link_libraries(tracepoint-to-rs PUBLIC lf::trace-api-types) From bbac808e28259b20201e9bbf40119f96d031e369 Mon Sep 17 00:00:00 2001 From: erlingrj Date: Thu, 19 Sep 2024 08:47:55 +0200 Subject: [PATCH 5/5] Update lf-ref --- lingua-franca-ref.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lingua-franca-ref.txt b/lingua-franca-ref.txt index 1f7391f92..bf8549687 100644 --- a/lingua-franca-ref.txt +++ b/lingua-franca-ref.txt @@ -1 +1 @@ -master +c-move-version-folder \ No newline at end of file