RUST: Merge the amadeus and liblektor sub-folders

.vscode/c_cpp_properties.json

@@ -18,7 +18,8 @@
             "compilerPath": "/usr/bin/clang",
             "cStandard": "c17",
             "cppStandard": "c++17",
-            "intelliSenseMode": "linux-clang-x64"
+            "intelliSenseMode": "linux-clang-x64",
+            "compileCommands": "/home/kubat/WORK/lektor/build/compile_commands.json"
         }
     ],
     "version": 4

CMakeLists.txt

@@ -234,13 +234,6 @@ set(lektord_SOURCES
     ${lektor_db_SOURCES}
 )
 
-set(lkt_SOURCES
-    src/main/lkt.c
-    src/base/common.c
-    src/base/segv.c
-    src/base/cmd.c
-)
-
 set(common_DEFINITIONS
     LKT_ARCH="${CMAKE_SYSTEM_PROCESSOR}"
     LKT_MAN_BINARY="${MAN}"
@@ -281,7 +274,6 @@ qt_add_executable(lektord
     ${lektord_SOURCES}
     ${SQL_GENERATED_FILE}
 )
-add_executable(lkt ${lkt_SOURCES})
 
 set_property(TARGET lektord PROPERTY CXX_STANDARD 20)
 
@@ -302,10 +294,7 @@ if(GENERATE_MANPAGES)
     endforeach()
 endif()
 
-target_include_directories(lkt     PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/inc)
 target_include_directories(lektord PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/inc ${CURL_INCLUDE_DIRS})
-
-target_compile_definitions(lkt     PRIVATE ${common_DEFINITIONS})
 target_compile_definitions(lektord PRIVATE ${common_DEFINITIONS}
     QT_DISABLE_DEPRECATED_BEFORE=0x050F00
     QT_NO_CAST_TO_ASCII
@@ -320,41 +309,24 @@ target_compile_options(lektord PRIVATE
     ${${CMAKE_BUILD_TYPE}_${CMAKE_C_COMPILER_ID}_C_FLAGS}
     ${${CMAKE_BUILD_TYPE}_${CMAKE_CXX_COMPILER_ID}_C_FLAGS}
 )
-target_compile_options(lkt PRIVATE
-    ${COMMON_C_FLAGS}
-    ${${CMAKE_C_COMPILER_ID}_C_FLAGS}
-    ${${CMAKE_CXX_COMPILER_ID}_CXX_FLAGS}
-    ${${CMAKE_BUILD_TYPE}_${CMAKE_C_COMPILER_ID}_C_FLAGS}
-    ${${CMAKE_BUILD_TYPE}_${CMAKE_CXX_COMPILER_ID}_C_FLAGS}
-)
 
 set_directory_properties(PROPERTIES EP_PREFIX ${CMAKE_BINARY_DIR}/Rust)
 
-ExternalProject_Add(amadeus_rs
+ExternalProject_Add(lektor_rust
     DOWNLOAD_COMMAND  ""
     CONFIGURE_COMMAND ""
     INSTALL_COMMAND   ""
-    SOURCE_DIR        "${CMAKE_SOURCE_DIR}/src/rust/amadeus-next"
+    SOURCE_DIR        "${CMAKE_SOURCE_DIR}/src/rust"
     BUILD_COMMAND     ${RUST_BUILD_CMD}
     COMMAND           ${RUST_BUILD_CMD}
-    BUILD_BYPRODUCTS  "${CMAKE_SOURCE_DIR}/src/rust/target/${RUST_BUILD_TYPE}/amadeus"
-    BUILD_ALWAYS      1
-    BUILD_IN_SOURCE   1
-)
-
-ExternalProject_Add(liblektor_rs
-    DOWNLOAD_COMMAND  ""
-    CONFIGURE_COMMAND ""
-    INSTALL_COMMAND   ""
-    SOURCE_DIR        "${CMAKE_SOURCE_DIR}/src/rust/liblektor-rs"
-    BUILD_COMMAND     ${RUST_BUILD_CMD}
-    COMMAND           ${RUST_BUILD_CMD}
-    BUILD_BYPRODUCTS  "${CMAKE_SOURCE_DIR}/src/rust/target/${RUST_BUILD_TYPE}/liblektor_unsafe.a"
     BUILD_ALWAYS      1
     BUILD_IN_SOURCE   1
+    BUILD_BYPRODUCTS  "${CMAKE_SOURCE_DIR}/src/rust/target/${RUST_BUILD_TYPE}/amadeus"
+                      "${CMAKE_SOURCE_DIR}/src/rust/target/${RUST_BUILD_TYPE}/lkt"
+                      "${CMAKE_SOURCE_DIR}/src/rust/target/${RUST_BUILD_TYPE}/liblektor_unsafe.a"
 )
 
-add_dependencies(lektord liblektor_rs)
+add_dependencies(lektord lektor_rust)
 
 target_link_libraries(lektord
     PRIVATE

lektor.code-workspace

@@ -10,15 +10,11 @@
         },
         {
             "path": "src",
-            "name": "Lektor Sources"
+            "name": "C/C++ Sources"
         },
         {
-            "path": "src/rust/liblektor-rs",
-            "name": "Lektor Rust Lib Sources"
-        },
-        {
-            "path": "src/rust/amadeus-next",
-            "name": "Amadeus Next RS Sources"
+            "path": "src/rust",
+            "name": "Rust Sources"
         },
     ],
     "settings": {

src/rust/liblektor-rs/Cargo.toml → src/rust/Cargo.toml

 [workspace]
 resolver = "2"
 members = [
+    # Lektord
     "lektor_c_compat",
     "lektor_db",
     "lektor_repo",
     "lektor_unsafe",
+
+    # Common things
     "kurisu_api",
+    "commons",
+
+    # Clients
+    "amadeus",
+    "amalib",
+    "lkt-rs",
 ]
 
 [workspace.package]
@@ -18,13 +27,26 @@ license = "MIT"
 log = "0.4"
 libc = "0.2.0"
 lazy_static = "1"
+
 diesel_migrations = "2"
 diesel = { version = "2", default-features = false, features = ["sqlite"] }
+
+toml = { version = "^0.5", features = ["preserve_order"] }
 serde = { version = "^1", default-features = false, features = [
     "std",
     "derive",
 ] }
 
+tokio = { version = "1", features = [
+    "rt",
+    "rt-multi-thread",
+    "net",
+    "time",
+    "macros",
+    "sync",
+    "io-util",
+] }
+
 [profile.release]
 strip = true
 debug = false

src/rust/amadeus-next/Cargo.toml

-[profile.release]
-strip = true
-lto = true
-opt-level = "s"
-codegen-units = 1
-
-[workspace]
-resolver = "2"
-members = ["amadeus", "amalib", "commons", "lkt-rs"]
-
-[workspace.package]
-edition = "2021"
-authors = ["Maël MARTIN"]
-version = "0.1.0"
-license = "MIT"
-
-[workspace.dependencies]
-lazy_static = "1"
-toml = { version = "^0.5", features = ["preserve_order"] }
-serde = { version = "^1", default-features = false, features = [
-    "std",
-    "derive",
-] }
-tokio = { version = "1", features = [
-    "rt",
-    "rt-multi-thread",
-    "net",
-    "time",
-    "macros",
-    "sync",
-    "io-util",
-] }