From a53947e45fe3f0736cb5e92db18efed31bade717 Mon Sep 17 00:00:00 2001 From: sksat Date: Wed, 6 Sep 2023 21:19:21 +0900 Subject: [PATCH 01/15] CMake: BUILD_C2A_AS_UTF8 -> C2A_BUILD_AS_UTF8 --- CMakeLists.txt | 5 ++++- common.cmake | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index fe7e94daa..667066f22 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,6 +2,10 @@ cmake_minimum_required(VERSION 3.13) project(C2A_CORE) +# Build option +## C2A compile config +option(C2A_BUILD_AS_UTF8 "Build C2A as UTF-8" ON) + # user config option(USE_ALL_C2A_CORE_APPS "use C2A-core all Applications" ON) option(USE_ALL_C2A_CORE_TEST_APPS "use C2A-core all Test Applications" ON) @@ -14,7 +18,6 @@ option(C2A_USE_C99_STDINT "use C99 standard stdint.h" ON) option(BUILD_C2A_AS_SILS_FW "build C2A as SILS firmware" ON) option(BUILD_C2A_AS_C99 "build C2A as C99" OFF) option(BUILD_C2A_AS_CXX "build C2A as C++" OFF) -option(BUILD_C2A_AS_UTF8 "build C2A as UTF-8" ON) set(C2A_CORE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) diff --git a/common.cmake b/common.cmake index 229eb1cbf..f76b4a9c2 100644 --- a/common.cmake +++ b/common.cmake @@ -31,7 +31,7 @@ if(MSVC) if(BUILD_C2A_AS_CXX) target_compile_options(${PROJECT_NAME} PUBLIC "/TP") # Compile C codes as C++ endif() - if(BUILD_C2A_AS_UTF8) + if(C2A_BUILD_AS_UTF8) target_compile_options(${PROJECT_NAME} PUBLIC "/source-charset:utf-8") endif() From aedfab5d76d6dbc5b0dd94da5b9782ee58af83a0 Mon Sep 17 00:00:00 2001 From: sksat Date: Wed, 6 Sep 2023 21:22:08 +0900 Subject: [PATCH 02/15] CMake: BUILD_C2A_AS_C99 -> C2A_BUILD_AS_C99 --- CMakeLists.txt | 2 +- common.cmake | 2 +- examples/mobc/build.rs | 2 +- examples/subobc/build.rs | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 667066f22..d32c64215 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,6 +5,7 @@ project(C2A_CORE) # Build option ## C2A compile config option(C2A_BUILD_AS_UTF8 "Build C2A as UTF-8" ON) +option(C2A_BUILD_AS_C99 "Build C2A as C99" OFF) # user config option(USE_ALL_C2A_CORE_APPS "use C2A-core all Applications" ON) @@ -16,7 +17,6 @@ option(C2A_USE_SIMPLE_LIBC "use C2A-core hosted simple libc implementat option(C2A_USE_C99_STDINT "use C99 standard stdint.h" ON) option(BUILD_C2A_AS_SILS_FW "build C2A as SILS firmware" ON) -option(BUILD_C2A_AS_C99 "build C2A as C99" OFF) option(BUILD_C2A_AS_CXX "build C2A as C++" OFF) set(C2A_CORE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) diff --git a/common.cmake b/common.cmake index f76b4a9c2..edbd6f456 100644 --- a/common.cmake +++ b/common.cmake @@ -2,7 +2,7 @@ if(BUILD_C2A_AS_CXX) # memo: set_source_files_properties() must be set before add_library/add_executable on Visual Studio CMake set_source_files_properties(${C2A_SRCS} PROPERTIES LANGUAGE CXX) # C++ else() - if(BUILD_C2A_AS_C99) + if(C2A_BUILD_AS_C99) set_target_properties(${PROJECT_NAME} PROPERTIES C_STANDARD 99) # C99 else() if (CMAKE_C_COMPILER_ID STREQUAL "Clang") diff --git a/examples/mobc/build.rs b/examples/mobc/build.rs index dbf8a6b65..32867c589 100644 --- a/examples/mobc/build.rs +++ b/examples/mobc/build.rs @@ -4,7 +4,7 @@ fn main() { let libc2a = c2a_cmake .very_verbose(true) .define("USE_32BIT_COMPILER", "ON") - .define("BUILD_C2A_AS_C99", "ON") + .define("C2A_BUILD_AS_C99", "ON") .define("BUILD_C2A_AS_SILS_FW", "ON") .define("USE_SCI_COM_WINGS", "OFF") .build_target("C2A"); diff --git a/examples/subobc/build.rs b/examples/subobc/build.rs index 8f0d2600c..a5b20315e 100644 --- a/examples/subobc/build.rs +++ b/examples/subobc/build.rs @@ -4,7 +4,7 @@ fn main() { let libc2a = c2a_cmake .very_verbose(true) .define("USE_32BIT_COMPILER", "ON") - .define("BUILD_C2A_AS_C99", "ON") + .define("C2A_BUILD_AS_C99", "ON") .define("BUILD_C2A_AS_SILS_FW", "ON") .define("USE_SCI_COM_WINGS", "OFF") .build_target("C2A"); From 63602d423be32f0faf24670057aa8eb9aa4febd8 Mon Sep 17 00:00:00 2001 From: sksat Date: Wed, 6 Sep 2023 21:37:03 +0900 Subject: [PATCH 03/15] CMake: BUILD_C2A_AS_CXX -> C2A_BUILD_AS_CXX --- CMakeLists.txt | 4 ++-- applications/CMakeLists.txt | 2 +- applications/test_app/CMakeLists.txt | 2 +- common.cmake | 4 ++-- docs/sils/s2e_integration.md | 6 +++--- examples/mobc/CMakeLists.txt | 8 ++++---- examples/mobc/src/s2e_mockup/CMakeLists.txt | 2 +- examples/mobc/src/src_user/Drivers/CMakeLists.txt | 2 +- examples/mobc/src/src_user/Settings/CMakeLists.txt | 2 +- examples/mobc/src/src_user/applications/CMakeLists.txt | 2 +- examples/mobc/src/src_user/hal/CMakeLists.txt | 2 +- examples/mobc/src/src_user/library/CMakeLists.txt | 2 +- examples/mobc/src/src_user/tlm_cmd/CMakeLists.txt | 2 +- examples/subobc/CMakeLists.txt | 6 +++--- examples/subobc/src/s2e_mockup/CMakeLists.txt | 2 +- examples/subobc/src/src_user/Drivers/CMakeLists.txt | 2 +- examples/subobc/src/src_user/Settings/CMakeLists.txt | 2 +- examples/subobc/src/src_user/applications/CMakeLists.txt | 2 +- examples/subobc/src/src_user/hal/CMakeLists.txt | 2 +- examples/subobc/src/src_user/library/CMakeLists.txt | 2 +- examples/subobc/src/src_user/tlm_cmd/CMakeLists.txt | 2 +- library/CMakeLists.txt | 2 +- 22 files changed, 31 insertions(+), 31 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d32c64215..328ffd612 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,6 +6,7 @@ project(C2A_CORE) ## C2A compile config option(C2A_BUILD_AS_UTF8 "Build C2A as UTF-8" ON) option(C2A_BUILD_AS_C99 "Build C2A as C99" OFF) +option(C2A_BUILD_AS_CXX "Build C2A as C++" OFF) # user config option(USE_ALL_C2A_CORE_APPS "use C2A-core all Applications" ON) @@ -17,7 +18,6 @@ option(C2A_USE_SIMPLE_LIBC "use C2A-core hosted simple libc implementat option(C2A_USE_C99_STDINT "use C99 standard stdint.h" ON) option(BUILD_C2A_AS_SILS_FW "build C2A as SILS firmware" ON) -option(BUILD_C2A_AS_CXX "build C2A as C++" OFF) set(C2A_CORE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) @@ -75,7 +75,7 @@ execute_process( add_definitions("-DGIT_REVISION_C2A_CORE=\"${GIT_REVISION_C2A_CORE}\"") add_definitions("-DGIT_REVISION_C2A_CORE_SHORT=0x${GIT_REVISION_C2A_CORE_SHORT}") -if(BUILD_C2A_AS_CXX) +if(C2A_BUILD_AS_CXX) set_source_files_properties(${C2A_SRCS} PROPERTIES LANGUAGE CXX) # C++ endif() diff --git a/applications/CMakeLists.txt b/applications/CMakeLists.txt index 3aeadea94..39c2daf6e 100644 --- a/applications/CMakeLists.txt +++ b/applications/CMakeLists.txt @@ -15,7 +15,7 @@ set(C2A_SRCS telemetry_manager.c ) -if(BUILD_C2A_AS_CXX) +if(C2A_BUILD_AS_CXX) set_source_files_properties(${C2A_SRCS} PROPERTIES LANGUAGE CXX) # C++ endif() diff --git a/applications/test_app/CMakeLists.txt b/applications/test_app/CMakeLists.txt index df73456e6..a7c66de98 100644 --- a/applications/test_app/CMakeLists.txt +++ b/applications/test_app/CMakeLists.txt @@ -6,7 +6,7 @@ set(C2A_SRCS test_ccp_util.c ) -if(BUILD_C2A_AS_CXX) +if(C2A_BUILD_AS_CXX) set_source_files_properties(${C2A_SRCS} PROPERTIES LANGUAGE CXX) # C++ endif() diff --git a/common.cmake b/common.cmake index edbd6f456..ec0b0516f 100644 --- a/common.cmake +++ b/common.cmake @@ -1,4 +1,4 @@ -if(BUILD_C2A_AS_CXX) +if(C2A_BUILD_AS_CXX) # memo: set_source_files_properties() must be set before add_library/add_executable on Visual Studio CMake set_source_files_properties(${C2A_SRCS} PROPERTIES LANGUAGE CXX) # C++ else() @@ -28,7 +28,7 @@ endif() if(MSVC) target_compile_options(${PROJECT_NAME} PUBLIC "/W4") target_compile_options(${PROJECT_NAME} PUBLIC "/MT") - if(BUILD_C2A_AS_CXX) + if(C2A_BUILD_AS_CXX) target_compile_options(${PROJECT_NAME} PUBLIC "/TP") # Compile C codes as C++ endif() if(C2A_BUILD_AS_UTF8) diff --git a/docs/sils/s2e_integration.md b/docs/sils/s2e_integration.md index 2f6a164fa..6ac9859fc 100644 --- a/docs/sils/s2e_integration.md +++ b/docs/sils/s2e_integration.md @@ -4,11 +4,11 @@ C2A 標準 SILS として， S2E (FIXME: 公開後にリンクを貼る) とい これにより，フライトソフトウェアである C2A を S2E 内部で動かすことが可能である． 詳細はS2Eドキュメント (TBA) を参照のこと． -現行の S2E では C2A を C++ としてビルドしなければならないため，その際は `BUILD_C2A_AS_CXX` というオプションを使用してビルドする． +現行の S2E では C2A を C++ としてビルドしなければならないため，その際は `C2A_BUILD_AS_CXX` というオプションを使用してビルドする． （[オプションの追加経緯](https://github.com/ut-issl/c2a-core/pull/35)） 具体的には， S2E 側の `CMakeLists.txt` を次のようにする． ``` - set(BUILD_C2A_AS_CXX ON) - add_subdirectory(${C2A_DIR} C2A_CORE) + set(C2A_BUILD_AS_CXX ON) + add_subdirectory(${C2A_DIR} C2A) ``` diff --git a/examples/mobc/CMakeLists.txt b/examples/mobc/CMakeLists.txt index 63d380697..e20516197 100644 --- a/examples/mobc/CMakeLists.txt +++ b/examples/mobc/CMakeLists.txt @@ -21,11 +21,11 @@ option(USE_SILS_MOCKUP "Use SILS mockup for build C2A with minimal user in C89 o option(BUILD_C2A_AS_SILS_FW "Build C2A as SILS firmware" ON) if(USE_SILS_MOCKUP) - set(BUILD_C2A_AS_CXX OFF) + set(C2A_BUILD_AS_CXX OFF) endif() -if(BUILD_C2A_AS_CXX) - message("build C2A as C++!") +if(C2A_BUILD_AS_CXX) + message("Build C2A as C++!") endif() set(C2A_CORE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src/src_core) @@ -69,7 +69,7 @@ set(C2A_SRCS ${C2A_USER_DIR}/c2a_main.c ) -if(BUILD_C2A_AS_CXX) +if(C2A_BUILD_AS_CXX) message("Build as C++!!!") set_source_files_properties(${C2A_SRCS} PROPERTIES LANGUAGE CXX) # C++ endif() diff --git a/examples/mobc/src/s2e_mockup/CMakeLists.txt b/examples/mobc/src/s2e_mockup/CMakeLists.txt index 65b2c975a..3346820cb 100644 --- a/examples/mobc/src/s2e_mockup/CMakeLists.txt +++ b/examples/mobc/src/s2e_mockup/CMakeLists.txt @@ -15,7 +15,7 @@ set(C2A_DIR ../..) # include_directories include_directories(${C2A_DIR}/src) # add subdirectory -set(BUILD_C2A_AS_CXX ON) # Build C2A as C++ +set(C2A_BUILD_AS_CXX ON) # Build C2A as C++ add_subdirectory(${C2A_DIR} C2A) add_executable(${PROJECT_NAME} main.cpp) diff --git a/examples/mobc/src/src_user/Drivers/CMakeLists.txt b/examples/mobc/src/src_user/Drivers/CMakeLists.txt index 89ee3b8dd..8d25518ff 100644 --- a/examples/mobc/src/src_user/Drivers/CMakeLists.txt +++ b/examples/mobc/src/src_user/Drivers/CMakeLists.txt @@ -10,7 +10,7 @@ set(C2A_SRCS Etc/uart_test.c ) -if(BUILD_C2A_AS_CXX) +if(C2A_BUILD_AS_CXX) set_source_files_properties(${C2A_SRCS} PROPERTIES LANGUAGE CXX) # C++ endif() diff --git a/examples/mobc/src/src_user/Settings/CMakeLists.txt b/examples/mobc/src/src_user/Settings/CMakeLists.txt index 6ddb4001f..87ca11465 100644 --- a/examples/mobc/src/src_user/Settings/CMakeLists.txt +++ b/examples/mobc/src/src_user/Settings/CMakeLists.txt @@ -19,7 +19,7 @@ set(C2A_SRCS tlm_cmd/ccsds/apid_define.c ) -if(BUILD_C2A_AS_CXX) +if(C2A_BUILD_AS_CXX) set_source_files_properties(${C2A_SRCS} PROPERTIES LANGUAGE CXX) # C++ endif() diff --git a/examples/mobc/src/src_user/applications/CMakeLists.txt b/examples/mobc/src/src_user/applications/CMakeLists.txt index 1bef2501e..f5ac69837 100644 --- a/examples/mobc/src/src_user/applications/CMakeLists.txt +++ b/examples/mobc/src/src_user/applications/CMakeLists.txt @@ -10,7 +10,7 @@ set(C2A_SRCS user_defined/debug_apps.c ) -if(BUILD_C2A_AS_CXX) +if(C2A_BUILD_AS_CXX) set_source_files_properties(${C2A_SRCS} PROPERTIES LANGUAGE CXX) # C++ endif() diff --git a/examples/mobc/src/src_user/hal/CMakeLists.txt b/examples/mobc/src/src_user/hal/CMakeLists.txt index e9f0b4703..084c84cf3 100644 --- a/examples/mobc/src/src_user/hal/CMakeLists.txt +++ b/examples/mobc/src/src_user/hal/CMakeLists.txt @@ -56,7 +56,7 @@ set(C2A_SRCS ${C2A_HAL_IMPL_SRCS} ) -if(BUILD_C2A_AS_CXX) +if(C2A_BUILD_AS_CXX) set_source_files_properties(${C2A_SRCS} PROPERTIES LANGUAGE CXX) # C++ endif() diff --git a/examples/mobc/src/src_user/library/CMakeLists.txt b/examples/mobc/src/src_user/library/CMakeLists.txt index 7b98581d7..0bbb4a8b8 100644 --- a/examples/mobc/src/src_user/library/CMakeLists.txt +++ b/examples/mobc/src/src_user/library/CMakeLists.txt @@ -7,7 +7,7 @@ set(C2A_SRCS vt100.c ) -if(BUILD_C2A_AS_CXX) +if(C2A_BUILD_AS_CXX) set_source_files_properties(${C2A_SRCS} PROPERTIES LANGUAGE CXX) # C++ endif() diff --git a/examples/mobc/src/src_user/tlm_cmd/CMakeLists.txt b/examples/mobc/src/src_user/tlm_cmd/CMakeLists.txt index 6ba67aaf0..c7cd1b936 100644 --- a/examples/mobc/src/src_user/tlm_cmd/CMakeLists.txt +++ b/examples/mobc/src/src_user/tlm_cmd/CMakeLists.txt @@ -21,7 +21,7 @@ set(C2A_SRCS ccsds/vcdu.c ) -if(BUILD_C2A_AS_CXX) +if(C2A_BUILD_AS_CXX) set_source_files_properties(${C2A_SRCS} PROPERTIES LANGUAGE CXX) # C++ endif() diff --git a/examples/subobc/CMakeLists.txt b/examples/subobc/CMakeLists.txt index 4dfc060d8..e23130bd7 100644 --- a/examples/subobc/CMakeLists.txt +++ b/examples/subobc/CMakeLists.txt @@ -19,10 +19,10 @@ set(USE_ALL_C2A_CORE_APPS OFF) set(USE_ALL_C2A_CORE_TEST_APPS OFF) if(USE_SILS_MOCKUP) - set(BUILD_C2A_AS_CXX OFF) + set(C2A_BUILD_AS_CXX OFF) endif() -if(BUILD_C2A_AS_CXX) +if(C2A_BUILD_AS_CXX) message("build C2A as C++!") endif() @@ -67,7 +67,7 @@ set(C2A_SRCS ${C2A_USER_DIR}/c2a_main.c ) -if(BUILD_C2A_AS_CXX) +if(C2A_BUILD_AS_CXX) message("Build as C++!!!") set_source_files_properties(${C2A_SRCS} PROPERTIES LANGUAGE CXX) # C++ endif() diff --git a/examples/subobc/src/s2e_mockup/CMakeLists.txt b/examples/subobc/src/s2e_mockup/CMakeLists.txt index 65b2c975a..3346820cb 100644 --- a/examples/subobc/src/s2e_mockup/CMakeLists.txt +++ b/examples/subobc/src/s2e_mockup/CMakeLists.txt @@ -15,7 +15,7 @@ set(C2A_DIR ../..) # include_directories include_directories(${C2A_DIR}/src) # add subdirectory -set(BUILD_C2A_AS_CXX ON) # Build C2A as C++ +set(C2A_BUILD_AS_CXX ON) # Build C2A as C++ add_subdirectory(${C2A_DIR} C2A) add_executable(${PROJECT_NAME} main.cpp) diff --git a/examples/subobc/src/src_user/Drivers/CMakeLists.txt b/examples/subobc/src/src_user/Drivers/CMakeLists.txt index 3df27a90d..5385e9e74 100644 --- a/examples/subobc/src/src_user/Drivers/CMakeLists.txt +++ b/examples/subobc/src/src_user/Drivers/CMakeLists.txt @@ -6,7 +6,7 @@ set(C2A_SRCS Etc/mobc.c ) -if(BUILD_C2A_AS_CXX) +if(C2A_BUILD_AS_CXX) set_source_files_properties(${C2A_SRCS} PROPERTIES LANGUAGE CXX) # C++ endif() diff --git a/examples/subobc/src/src_user/Settings/CMakeLists.txt b/examples/subobc/src/src_user/Settings/CMakeLists.txt index a0e28ff8c..ecc5cd7dc 100644 --- a/examples/subobc/src/src_user/Settings/CMakeLists.txt +++ b/examples/subobc/src/src_user/Settings/CMakeLists.txt @@ -16,7 +16,7 @@ set(C2A_SRCS tlm_cmd/ccsds/apid_define.c ) -if(BUILD_C2A_AS_CXX) +if(C2A_BUILD_AS_CXX) set_source_files_properties(${C2A_SRCS} PROPERTIES LANGUAGE CXX) # C++ endif() diff --git a/examples/subobc/src/src_user/applications/CMakeLists.txt b/examples/subobc/src/src_user/applications/CMakeLists.txt index 892932512..7a51c0020 100644 --- a/examples/subobc/src/src_user/applications/CMakeLists.txt +++ b/examples/subobc/src/src_user/applications/CMakeLists.txt @@ -13,7 +13,7 @@ set(C2A_SRCS ${C2A_CORE_DIR}/applications/timeline_command_dispatcher.c ) -if(BUILD_C2A_AS_CXX) +if(C2A_BUILD_AS_CXX) set_source_files_properties(${C2A_SRCS} PROPERTIES LANGUAGE CXX) # C++ endif() diff --git a/examples/subobc/src/src_user/hal/CMakeLists.txt b/examples/subobc/src/src_user/hal/CMakeLists.txt index 51b970c83..dc41fbb67 100644 --- a/examples/subobc/src/src_user/hal/CMakeLists.txt +++ b/examples/subobc/src/src_user/hal/CMakeLists.txt @@ -44,7 +44,7 @@ set(C2A_SRCS ${C2A_HAL_IMPL_SRCS} ) -if(BUILD_C2A_AS_CXX) +if(C2A_BUILD_AS_CXX) set_source_files_properties(${C2A_SRCS} PROPERTIES LANGUAGE CXX) # C++ endif() diff --git a/examples/subobc/src/src_user/library/CMakeLists.txt b/examples/subobc/src/src_user/library/CMakeLists.txt index 7b98581d7..0bbb4a8b8 100644 --- a/examples/subobc/src/src_user/library/CMakeLists.txt +++ b/examples/subobc/src/src_user/library/CMakeLists.txt @@ -7,7 +7,7 @@ set(C2A_SRCS vt100.c ) -if(BUILD_C2A_AS_CXX) +if(C2A_BUILD_AS_CXX) set_source_files_properties(${C2A_SRCS} PROPERTIES LANGUAGE CXX) # C++ endif() diff --git a/examples/subobc/src/src_user/tlm_cmd/CMakeLists.txt b/examples/subobc/src/src_user/tlm_cmd/CMakeLists.txt index bd81865dd..3b4ea3a5d 100644 --- a/examples/subobc/src/src_user/tlm_cmd/CMakeLists.txt +++ b/examples/subobc/src/src_user/tlm_cmd/CMakeLists.txt @@ -14,7 +14,7 @@ set(C2A_SRCS normal_block_command_definition/nbc_start_hk_tlm.c ) -if(BUILD_C2A_AS_CXX) +if(C2A_BUILD_AS_CXX) set_source_files_properties(${C2A_SRCS} PROPERTIES LANGUAGE CXX) # C++ endif() diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt index df5e570a5..44fb40a7d 100644 --- a/library/CMakeLists.txt +++ b/library/CMakeLists.txt @@ -21,7 +21,7 @@ set(C2A_SRCS ${C2A_LIBC_SRC} ) -if(BUILD_C2A_AS_CXX) +if(C2A_BUILD_AS_CXX) set_source_files_properties(${C2A_SRCS} PROPERTIES LANGUAGE CXX) # C++ endif() From 98ec01e4cba18706f501f9ea8ee517f4867fcaaa Mon Sep 17 00:00:00 2001 From: sksat Date: Wed, 6 Sep 2023 21:41:55 +0900 Subject: [PATCH 04/15] CMake: (NOT USE_32BIT_COMPILER) -> C2A_BUILD_FOR_32BIT --- CMakeLists.txt | 3 ++- common.cmake | 2 +- examples/mobc/build.rs | 2 +- examples/subobc/build.rs | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 328ffd612..c8ee64a74 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,11 +8,12 @@ option(C2A_BUILD_AS_UTF8 "Build C2A as UTF-8" ON) option(C2A_BUILD_AS_C99 "Build C2A as C99" OFF) option(C2A_BUILD_AS_CXX "Build C2A as C++" OFF) +option(C2A_BUILD_FOR_32BIT "Build C2A for 32bit target(this will add -m32 option)" ON) + # user config option(USE_ALL_C2A_CORE_APPS "use C2A-core all Applications" ON) option(USE_ALL_C2A_CORE_TEST_APPS "use C2A-core all Test Applications" ON) option(USE_ALL_C2A_CORE_LIB "use C2A-core all library" ON) -option(USE_32BIT_COMPILER "use 32bit compiler" OFF) option(C2A_USE_SIMPLE_LIBC "use C2A-core hosted simple libc implementation" OFF) option(C2A_USE_C99_STDINT "use C99 standard stdint.h" ON) diff --git a/common.cmake b/common.cmake index ec0b0516f..89de0d488 100644 --- a/common.cmake +++ b/common.cmake @@ -45,7 +45,7 @@ else() # endif() # 32bit - if(NOT USE_32BIT_COMPILER) + if(C2A_BUILD_FOR_32BIT) target_compile_options(${PROJECT_NAME} PUBLIC "-m32") target_link_options(${PROJECT_NAME} PRIVATE "-m32") endif() diff --git a/examples/mobc/build.rs b/examples/mobc/build.rs index 32867c589..173786053 100644 --- a/examples/mobc/build.rs +++ b/examples/mobc/build.rs @@ -3,7 +3,7 @@ fn main() { let mut c2a_cmake = cmake::Config::new("."); let libc2a = c2a_cmake .very_verbose(true) - .define("USE_32BIT_COMPILER", "ON") + .define("C2A_BUILD_FOR_32BIT", "OFF") .define("C2A_BUILD_AS_C99", "ON") .define("BUILD_C2A_AS_SILS_FW", "ON") .define("USE_SCI_COM_WINGS", "OFF") diff --git a/examples/subobc/build.rs b/examples/subobc/build.rs index a5b20315e..efc90ab64 100644 --- a/examples/subobc/build.rs +++ b/examples/subobc/build.rs @@ -3,7 +3,7 @@ fn main() { let mut c2a_cmake = cmake::Config::new("."); let libc2a = c2a_cmake .very_verbose(true) - .define("USE_32BIT_COMPILER", "ON") + .define("C2A_BUILD_FOR_32BIT", "ON") .define("C2A_BUILD_AS_C99", "ON") .define("BUILD_C2A_AS_SILS_FW", "ON") .define("USE_SCI_COM_WINGS", "OFF") From f7859f69c88bd5dcc08975fccc76c7e013808b3b Mon Sep 17 00:00:00 2001 From: sksat Date: Wed, 6 Sep 2023 21:44:48 +0900 Subject: [PATCH 05/15] CMake: (NOT C2A_USE_STDINT_WRAPPER) -> C2A_USE_STDINT_WRAPPER --- CMakeLists.txt | 8 +++++--- library/stdint_wrapper/stdint.h | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c8ee64a74..a9e0fc336 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,13 +10,15 @@ option(C2A_BUILD_AS_CXX "Build C2A as C++" OFF) option(C2A_BUILD_FOR_32BIT "Build C2A for 32bit target(this will add -m32 option)" ON) +## C2A +option(C2A_USE_STDINT_WRAPPER "Use stdint.h wrapper for C89" OFF) + # user config option(USE_ALL_C2A_CORE_APPS "use C2A-core all Applications" ON) option(USE_ALL_C2A_CORE_TEST_APPS "use C2A-core all Test Applications" ON) option(USE_ALL_C2A_CORE_LIB "use C2A-core all library" ON) option(C2A_USE_SIMPLE_LIBC "use C2A-core hosted simple libc implementation" OFF) -option(C2A_USE_C99_STDINT "use C99 standard stdint.h" ON) option(BUILD_C2A_AS_SILS_FW "build C2A as SILS firmware" ON) @@ -56,8 +58,8 @@ set(C2A_SRCS tlm_cmd/ccsds/tlm_space_packet.c ) -if(NOT C2A_USE_C99_STDINT) - message("Use stdint.h wrapper") +if(C2A_USE_STDINT_WRAPPER) + message("Use stdint.h wrapper for C89") include_directories(library/stdint_wrapper) endif() diff --git a/library/stdint_wrapper/stdint.h b/library/stdint_wrapper/stdint.h index 8ebd2a0b3..2fba321da 100644 --- a/library/stdint_wrapper/stdint.h +++ b/library/stdint_wrapper/stdint.h @@ -7,7 +7,7 @@ #define STDINT_H_ // C99 stdint.h ないしはそれと同等のヘッダへのラッパー用ヘッダ -// 実機向けのコンパイラが C89 であるときのみ使用すること（CMake では C2A_USE_C99_STDINT=OFF すること） +// 実機向けのコンパイラが C89 であるときのみ使用すること（CMake では C2A_USE_STDINT_WRAPPER=ON すること） #ifdef SILS_FW #include // このヘッダを使う OBC であっても，SILS 環境下では C99 stdint.h が存在することが期待できる From 5ffc505c90a6eeb5d0dca42c906feb747f57be7c Mon Sep 17 00:00:00 2001 From: sksat Date: Wed, 6 Sep 2023 21:48:30 +0900 Subject: [PATCH 06/15] CMake: BUILD_C2A_AS_SILS_FW -> C2A_BUILD_FOR_SILS --- CMakeLists.txt | 4 ++-- common.cmake | 2 +- examples/mobc/CMakeLists.txt | 2 +- examples/mobc/build.rs | 2 +- examples/subobc/CMakeLists.txt | 2 +- examples/subobc/build.rs | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a9e0fc336..a883ea104 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,6 +13,8 @@ option(C2A_BUILD_FOR_32BIT "Build C2A for 32bit target(this will add -m ## C2A option(C2A_USE_STDINT_WRAPPER "Use stdint.h wrapper for C89" OFF) +option(C2A_BUILD_FOR_SILS "Build C2A for SILS target" ON) + # user config option(USE_ALL_C2A_CORE_APPS "use C2A-core all Applications" ON) option(USE_ALL_C2A_CORE_TEST_APPS "use C2A-core all Test Applications" ON) @@ -20,8 +22,6 @@ option(USE_ALL_C2A_CORE_LIB "use C2A-core all library" ON) option(C2A_USE_SIMPLE_LIBC "use C2A-core hosted simple libc implementation" OFF) -option(BUILD_C2A_AS_SILS_FW "build C2A as SILS firmware" ON) - set(C2A_CORE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) set(C2A_SRCS diff --git a/common.cmake b/common.cmake index 89de0d488..46b309115 100644 --- a/common.cmake +++ b/common.cmake @@ -20,7 +20,7 @@ else() endif() endif() -if(BUILD_C2A_AS_SILS_FW) +if(C2A_BUILD_FOR_SILS ) target_compile_definitions(${PROJECT_NAME} PUBLIC SILS_FW) endif() diff --git a/examples/mobc/CMakeLists.txt b/examples/mobc/CMakeLists.txt index e20516197..c3af2b54f 100644 --- a/examples/mobc/CMakeLists.txt +++ b/examples/mobc/CMakeLists.txt @@ -18,7 +18,7 @@ option(USE_SCI_COM_UART "Use SCI_COM_UART" OFF) option(USE_SILS_MOCKUP "Use SILS mockup for build C2A with minimal user in C89 only" OFF) -option(BUILD_C2A_AS_SILS_FW "Build C2A as SILS firmware" ON) +option(C2A_BUILD_FOR_SILS "Build C2A for SILS target" ON) if(USE_SILS_MOCKUP) set(C2A_BUILD_AS_CXX OFF) diff --git a/examples/mobc/build.rs b/examples/mobc/build.rs index 173786053..d22f07cf5 100644 --- a/examples/mobc/build.rs +++ b/examples/mobc/build.rs @@ -5,7 +5,7 @@ fn main() { .very_verbose(true) .define("C2A_BUILD_FOR_32BIT", "OFF") .define("C2A_BUILD_AS_C99", "ON") - .define("BUILD_C2A_AS_SILS_FW", "ON") + .define("C2A_BUILD_FOR_SILS", "ON") .define("USE_SCI_COM_WINGS", "OFF") .build_target("C2A"); diff --git a/examples/subobc/CMakeLists.txt b/examples/subobc/CMakeLists.txt index e23130bd7..d119bb76f 100644 --- a/examples/subobc/CMakeLists.txt +++ b/examples/subobc/CMakeLists.txt @@ -12,7 +12,7 @@ option(USE_SCI_COM_WINGS "Use SCI_COM_WINGS" ON) option(USE_SILS_MOCKUP "Use SILS mockup for build C2A with minimal user in C89 only" OFF) -option(BUILD_C2A_AS_SILS_FW "Build C2A as SILS firmware" ON) +option(C2A_BUILD_FOR_SILS "Build C2A for SILS target" ON) set(USE_ALL_C2A_CORE_APPS OFF) # Core App のターゲット追加は src_user/applications/CMakeLists.txt で行う diff --git a/examples/subobc/build.rs b/examples/subobc/build.rs index efc90ab64..620a43451 100644 --- a/examples/subobc/build.rs +++ b/examples/subobc/build.rs @@ -5,7 +5,7 @@ fn main() { .very_verbose(true) .define("C2A_BUILD_FOR_32BIT", "ON") .define("C2A_BUILD_AS_C99", "ON") - .define("BUILD_C2A_AS_SILS_FW", "ON") + .define("C2A_BUILD_FOR_SILS ", "ON") .define("USE_SCI_COM_WINGS", "OFF") .build_target("C2A"); From 1c30c9a047b5bbc49301b5f781cdd88674eced78 Mon Sep 17 00:00:00 2001 From: sksat Date: Wed, 6 Sep 2023 21:52:33 +0900 Subject: [PATCH 07/15] CMake: USE_ALL_C2A_CORE_APPS -> C2A_USE_ALL_CORE_APPS --- CMakeLists.txt | 6 ++++-- examples/subobc/CMakeLists.txt | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a883ea104..a283d2fdf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,8 +15,10 @@ option(C2A_USE_STDINT_WRAPPER "Use stdint.h wrapper for C89" OFF) option(C2A_BUILD_FOR_SILS "Build C2A for SILS target" ON) +## C2A core library select +option(C2A_USE_ALL_CORE_APPS "Use C2A-core all Applications" ON) + # user config -option(USE_ALL_C2A_CORE_APPS "use C2A-core all Applications" ON) option(USE_ALL_C2A_CORE_TEST_APPS "use C2A-core all Test Applications" ON) option(USE_ALL_C2A_CORE_LIB "use C2A-core all library" ON) @@ -84,7 +86,7 @@ endif() add_library(${PROJECT_NAME} OBJECT ${C2A_SRCS}) -if(USE_ALL_C2A_CORE_APPS) +if(C2A_USE_ALL_CORE_APPS) add_subdirectory(applications) target_sources(${PROJECT_NAME} PUBLIC $) endif() diff --git a/examples/subobc/CMakeLists.txt b/examples/subobc/CMakeLists.txt index d119bb76f..d5d1db92e 100644 --- a/examples/subobc/CMakeLists.txt +++ b/examples/subobc/CMakeLists.txt @@ -14,8 +14,8 @@ option(USE_SILS_MOCKUP "Use SILS mockup for build C2A with minimal user in C89 o option(C2A_BUILD_FOR_SILS "Build C2A for SILS target" ON) -set(USE_ALL_C2A_CORE_APPS OFF) # Core App のターゲット追加は src_user/applications/CMakeLists.txt で行う +set(C2A_USE_ALL_CORE_APPS OFF) set(USE_ALL_C2A_CORE_TEST_APPS OFF) if(USE_SILS_MOCKUP) From ad5af89b638ea7be75fccbdfa3f0a475f48fd4cc Mon Sep 17 00:00:00 2001 From: sksat Date: Wed, 6 Sep 2023 21:54:20 +0900 Subject: [PATCH 08/15] CMake: USE_ALL_C2A_CORE_TEST_APPS -> C2A_USE_ALL_CORE_TEST_APPS --- CMakeLists.txt | 4 ++-- examples/subobc/CMakeLists.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a283d2fdf..8c2d9d289 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,9 +17,9 @@ option(C2A_BUILD_FOR_SILS "Build C2A for SILS target" ON) ## C2A core library select option(C2A_USE_ALL_CORE_APPS "Use C2A-core all Applications" ON) +option(C2A_USE_ALL_CORE_TEST_APPS "Use C2A-core all Test Applications" ON) # user config -option(USE_ALL_C2A_CORE_TEST_APPS "use C2A-core all Test Applications" ON) option(USE_ALL_C2A_CORE_LIB "use C2A-core all library" ON) option(C2A_USE_SIMPLE_LIBC "use C2A-core hosted simple libc implementation" OFF) @@ -91,7 +91,7 @@ if(C2A_USE_ALL_CORE_APPS) target_sources(${PROJECT_NAME} PUBLIC $) endif() -if(USE_ALL_C2A_CORE_TEST_APPS) +if(C2A_USE_ALL_CORE_TEST_APPS) add_subdirectory(applications/test_app) target_sources(${PROJECT_NAME} PUBLIC $) endif() diff --git a/examples/subobc/CMakeLists.txt b/examples/subobc/CMakeLists.txt index d5d1db92e..c0a1acb5e 100644 --- a/examples/subobc/CMakeLists.txt +++ b/examples/subobc/CMakeLists.txt @@ -16,7 +16,7 @@ option(C2A_BUILD_FOR_SILS "Build C2A for SILS target" ON) # Core App のターゲット追加は src_user/applications/CMakeLists.txt で行う set(C2A_USE_ALL_CORE_APPS OFF) -set(USE_ALL_C2A_CORE_TEST_APPS OFF) +set(C2A_USE_ALL_CORE_TEST_APPS OFF) if(USE_SILS_MOCKUP) set(C2A_BUILD_AS_CXX OFF) From 7c292569d548b56db1d1caa10822fba314c09b24 Mon Sep 17 00:00:00 2001 From: sksat Date: Wed, 6 Sep 2023 21:57:58 +0900 Subject: [PATCH 09/15] CMake: USE_ALL_C2A_CORE_LIB -> C2A_USE_ALL_CORE_LIB --- CMakeLists.txt | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8c2d9d289..c3e869574 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,11 +18,9 @@ option(C2A_BUILD_FOR_SILS "Build C2A for SILS target" ON) ## C2A core library select option(C2A_USE_ALL_CORE_APPS "Use C2A-core all Applications" ON) option(C2A_USE_ALL_CORE_TEST_APPS "Use C2A-core all Test Applications" ON) +option(C2A_USE_ALL_CORE_LIB "Use C2A-core all library" ON) -# user config -option(USE_ALL_C2A_CORE_LIB "use C2A-core all library" ON) - -option(C2A_USE_SIMPLE_LIBC "use C2A-core hosted simple libc implementation" OFF) +option(C2A_USE_SIMPLE_LIBC "Use C2A-core hosted simple libc implementation" OFF) set(C2A_CORE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) @@ -96,7 +94,7 @@ if(C2A_USE_ALL_CORE_TEST_APPS) target_sources(${PROJECT_NAME} PUBLIC $) endif() -if(USE_ALL_C2A_CORE_LIB) +if(C2A_USE_ALL_CORE_LIB) add_subdirectory(library) target_sources(${PROJECT_NAME} PUBLIC $) endif() From 6b0095b59f0b1bbe0fac54f654d7b002dcd7b2e6 Mon Sep 17 00:00:00 2001 From: sksat Date: Thu, 7 Sep 2023 22:00:45 +0900 Subject: [PATCH 10/15] add CMake option() refactor changelog --- CHANGELOG.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index cadf52e8a..14471d17c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -29,6 +29,18 @@ - import したバージョン: [ut-issl/c2a-enum-loader ae-v2.0.0](https://github.com/ut-issl/c2a-enum-loader/releases/tag/ae-v2.0.0) - [ut-issl/c2a-tlm-cmd-code-generator](https://github.com/ut-issl/c2a-tlm-cmd-code-generator) を c2a-core リポジトリで管理するように変更: [#111](https://github.com/arkedge/c2a-core/pull/111) - import したバージョン: [ut-issl/c2a-tlm-cmd-code-generator ae-v2.0.0](https://github.com/ut-issl/c2a-tlm-cmd-code-generator/releases/tag/ae-v2.0.0) +- CMake option の整理: [#86](https://github.com/arkedge/c2a-core/pull/86) + - `C2A_` prefix に統一した他，意味が分かりにくい命名の変更，今後 optional としていく挙動を default OFF とした + - `option()` の挙動はユーザ指定によってかなり変わるため，該当する変更は単なるビルドチェックなどではなくすべて grep して変更すること + - `BUILD_C2A_AS_UTF8` -> `C2A_BUILD_AS_UTF8` + - `BUILD_C2A_AS_C99` -> `C2A_BUILD_AS_C99` + - `BUILD_C2A_AS_CXX` -> `C2A_BUILD_AS_CXX` + - `(NOT USE_32BIT_COMPILER)` -> `C2A_BUILD_FOR_32BIT`: `ON` の時に明示的に 32bit ターゲットとしてビルドする（`-m32` をつける） + - `(NOT C2A_USE_STDINT_WRAPPER)` -> `C2A_USE_STDINT_WRAPPER`: C89 ターゲットでビルドする際に `ON` にすることでユーザ定義の `stdint.h` を使う + - `BUILD_C2A_AS_SILS_FW` -> `C2A_BUILD_FOR_SILS` + - `USE_ALL_C2A_CORE_APPS` -> `C2A_USE_ALL_CORE_APPS` + - `USE_ALL_C2A_CORE_TEST_APPS` -> `C2A_USE_ALL_CORE_TEST_APPS` + - `USE_ALL_C2A_CORE_LIB` -> `C2A_USE_ALL_CORE_LIB` ### Enhancements From e0ab5e91d84b6fd53f27c9149c7298e927e66a27 Mon Sep 17 00:00:00 2001 From: sksat Date: Thu, 7 Sep 2023 23:19:05 +0900 Subject: [PATCH 11/15] add CMake option prefix to coding rule --- CHANGELOG.md | 3 ++- docs/general/coding_rule.md | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 14471d17c..51daa7fd9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -30,7 +30,8 @@ - [ut-issl/c2a-tlm-cmd-code-generator](https://github.com/ut-issl/c2a-tlm-cmd-code-generator) を c2a-core リポジトリで管理するように変更: [#111](https://github.com/arkedge/c2a-core/pull/111) - import したバージョン: [ut-issl/c2a-tlm-cmd-code-generator ae-v2.0.0](https://github.com/ut-issl/c2a-tlm-cmd-code-generator/releases/tag/ae-v2.0.0) - CMake option の整理: [#86](https://github.com/arkedge/c2a-core/pull/86) - - `C2A_` prefix に統一した他，意味が分かりにくい命名の変更，今後 optional としていく挙動を default OFF とした + - `C2A_` prefix に統一した（これはコーディング規約にも追加） + - 意味が分かりにくい命名の変更，今後 optional としていく挙動を default OFF とした - `option()` の挙動はユーザ指定によってかなり変わるため，該当する変更は単なるビルドチェックなどではなくすべて grep して変更すること - `BUILD_C2A_AS_UTF8` -> `C2A_BUILD_AS_UTF8` - `BUILD_C2A_AS_C99` -> `C2A_BUILD_AS_C99` diff --git a/docs/general/coding_rule.md b/docs/general/coding_rule.md index 89d66ea99..17b01abbe 100644 --- a/docs/general/coding_rule.md +++ b/docs/general/coding_rule.md @@ -213,6 +213,11 @@ typedef uint32_t flash_block_t; ## 個別箇所についての命名など [M] +### CMake option +- 接頭辞は `C2A_` で統一する + - 特定の C2A user 固有のものや，C2A 以外の文脈が含まれる場合は必須ではない + + ### applications/user_defined - ファイル名と AppInfo 構造体名を一致させる（スタイルを除く） - AppInfo 構造体名とそのインスタンス名を一致させる（スタイルを除く） From 18fd7d1ecd44bf6e905d7cddf8a0d84d848f76a9 Mon Sep 17 00:00:00 2001 From: sksat Date: Tue, 19 Sep 2023 19:03:01 +0900 Subject: [PATCH 12/15] add simple libc annotation Co-authored-by: Ryo Suzumoto --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c3e869574..6c24bd541 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,7 +20,7 @@ option(C2A_USE_ALL_CORE_APPS "Use C2A-core all Applications" ON) option(C2A_USE_ALL_CORE_TEST_APPS "Use C2A-core all Test Applications" ON) option(C2A_USE_ALL_CORE_LIB "Use C2A-core all library" ON) -option(C2A_USE_SIMPLE_LIBC "Use C2A-core hosted simple libc implementation" OFF) +option(C2A_USE_SIMPLE_LIBC "Use C2A-core hosted simple libc (c2a-core/library/libc) implementation" OFF) set(C2A_CORE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) From 284c47c65f6d6e1b6134e17d57a0440338b48055 Mon Sep 17 00:00:00 2001 From: sksat Date: Wed, 20 Sep 2023 04:37:01 +0900 Subject: [PATCH 13/15] CMake option must be SNAKE_CASE --- docs/general/coding_rule.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/general/coding_rule.md b/docs/general/coding_rule.md index 17b01abbe..2c3c8a8ef 100644 --- a/docs/general/coding_rule.md +++ b/docs/general/coding_rule.md @@ -214,6 +214,7 @@ typedef uint32_t flash_block_t; ## 個別箇所についての命名など [M] ### CMake option +- 大文字の snake case - 接頭辞は `C2A_` で統一する - 特定の C2A user 固有のものや，C2A 以外の文脈が含まれる場合は必須ではない From 6abfce0d54ed9a3883bc81910b54ed63ff93cb7e Mon Sep 17 00:00:00 2001 From: sksat Date: Wed, 11 Oct 2023 00:33:22 +0900 Subject: [PATCH 14/15] use ut-issl/s2e-user-for-c2a-core ae-v3.0.0 --- .github/workflows/build_with_s2e.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build_with_s2e.yml b/.github/workflows/build_with_s2e.yml index 818ac58d1..691884312 100644 --- a/.github/workflows/build_with_s2e.yml +++ b/.github/workflows/build_with_s2e.yml @@ -36,6 +36,7 @@ jobs: with: path: s2e-user repository: ut-issl/s2e-user-for-c2a-core + ref: ae-v3.0.0 # TODO: import s2e-user-for-c2a-core to c2a-core fetch-depth: 1 - name: checkout C2A user From 6a32752b6d5cea1ef5a5eb68c410cf705315170d Mon Sep 17 00:00:00 2001 From: sksat Date: Wed, 11 Oct 2023 00:35:49 +0900 Subject: [PATCH 15/15] bump version to 4.0.0-beta.2 --- Cargo.toml | 2 +- c2a_core_main.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 182658e24..56bc50926 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,5 +1,5 @@ [workspace.package] -version = "4.0.0-beta.1" +version = "4.0.0-beta.2" [workspace] resolver = "2" diff --git a/c2a_core_main.h b/c2a_core_main.h index e9bc11288..29517491d 100644 --- a/c2a_core_main.h +++ b/c2a_core_main.h @@ -10,6 +10,6 @@ void C2A_core_main(void); #define C2A_CORE_VER_MAJOR (4) #define C2A_CORE_VER_MINOR (0) #define C2A_CORE_VER_PATCH (0) -#define C2A_CORE_VER_PRE ("beta.1") +#define C2A_CORE_VER_PRE ("beta.2") #endif