mirror of
https://github.com/logos-co/logos-cpp-sdk.git
synced 2026-08-31 01:31:10 +00:00
Dario Gabriel LipicarandClaude Opus 5
1afcf46f4d
`legacy/` was never a library with an API surface. Two files, 475 lines, exactly
one exported symbol — `int legacy_main(int, char**)` — with every other
definition `static`, compiled INTO logos-cpp-generator and reached by fallthrough
at the end of main(). So there was nothing to keep separate: it is one mode of
this binary, and it now lives beside the others as plugin_introspect.{cpp,h}
behind `runPluginIntrospectMode()`, named for what it does.
Deleting it was never an option — that premise was checked and refused earlier.
`--general-only` alone has ~10 live callers across 7 repos including the central
module path (buildPlugin.nix:206,211, buildHeaders.nix:221,
LogosModule.cmake:423). The mode is load-bearing; only its packaging was wrong.
110 lines go with the move, all genuinely unreferenced:
* cppStringEscape — zero callers anywhere.
* writeUmbrellaHeader / writeUmbrellaSource and the `if (!moduleOnly)` block
that called them. This is the real prize: a SECOND, directory-SCRAPING
implementation of logos_sdk.{h,cpp}, unreachable in practice because
generate-module-headers.sh:60 always passes --module-only. generator_lib's
deps-driven makeUmbrella*FromDeps is now the only umbrella emitter, so the
two cannot drift.
* a dead `QJsonDocument doc(methods);` and its commented-out use.
With the block gone, `--module-only` suppresses nothing, so the parameter and
its plumbing go too. The FLAG stays tolerated rather than rejected, because
generate-module-headers.sh passes it unconditionally — a comment at the old
parse site says so.
Verified: #default builds, and both checks pass — `generator-cli` (which
exercises the CLI surface, including --general-only) and `tests`.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
70 lines
2.8 KiB
CMake
70 lines
2.8 KiB
CMake
cmake_minimum_required(VERSION 3.14)
|
|
project(LogosCppGenerator)
|
|
|
|
# C++17: the generator consumes logos-lidl (built with C++17), and its AST
|
|
# aggregate-initialization (e.g. `{TypeExpr::Primitive, "bool", {}}` in the
|
|
# impl-header parser) needs aggregates-with-default-member-initializers.
|
|
set(CMAKE_CXX_STANDARD 17)
|
|
set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
|
set(CMAKE_AUTOMOC ON)
|
|
|
|
# Find Qt Core (QCoreApplication, QPluginLoader, QJson*)
|
|
find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core)
|
|
find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core)
|
|
|
|
# logos-lidl: the canonical, language-neutral LIDL frontend (lexer/parser/AST/
|
|
# serializer/validator). The generator links it instead of embedding its own
|
|
# copy; only the C++/Qt-specific backends (impl-header parsing, gen_client,
|
|
# gen_cdylib) live here now.
|
|
find_package(logos-lidl REQUIRED)
|
|
|
|
add_executable(logos-cpp-generator
|
|
main.cpp
|
|
generator_lib.cpp
|
|
lidl_to_json.cpp
|
|
plugin_introspect.cpp
|
|
experimental/lidl_emit_common.cpp
|
|
experimental/lidl_gen_client.cpp
|
|
experimental/lidl_gen_cdylib.cpp
|
|
experimental/impl_header_parser.cpp
|
|
)
|
|
|
|
target_link_libraries(logos-cpp-generator PRIVATE Qt${QT_VERSION_MAJOR}::Core logos-lidl::logos_lidl)
|
|
|
|
# nlohmann_json: pulled in transitively by logos_provider_object.h →
|
|
# logos_provider_interface.h / logos_json_convert.h (header-only use).
|
|
find_package(nlohmann_json REQUIRED)
|
|
target_link_libraries(logos-cpp-generator PRIVATE nlohmann_json::nlohmann_json)
|
|
|
|
# logos-protocol headers (logos_provider_interface.h, logos_json_convert.h —
|
|
# included transitively via ../cpp/logos_provider_object.h). Header-only:
|
|
# the generator does not link the protocol library. Resolution mirrors
|
|
# cpp/CMakeLists.txt: -DLOGOS_PROTOCOL_ROOT / env / sibling checkout.
|
|
if(NOT DEFINED LOGOS_PROTOCOL_ROOT)
|
|
if(DEFINED ENV{LOGOS_PROTOCOL_ROOT})
|
|
set(LOGOS_PROTOCOL_ROOT "$ENV{LOGOS_PROTOCOL_ROOT}")
|
|
elseif(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/../../logos-protocol/cpp/logos_protocol.h")
|
|
set(LOGOS_PROTOCOL_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/../../logos-protocol")
|
|
endif()
|
|
endif()
|
|
if(EXISTS "${LOGOS_PROTOCOL_ROOT}/cpp/logos_protocol.h")
|
|
set(LP_INCLUDE "${LOGOS_PROTOCOL_ROOT}/cpp")
|
|
elseif(EXISTS "${LOGOS_PROTOCOL_ROOT}/include/cpp/logos_protocol.h")
|
|
set(LP_INCLUDE "${LOGOS_PROTOCOL_ROOT}/include/cpp")
|
|
else()
|
|
message(FATAL_ERROR "logos-protocol headers not found. Set LOGOS_PROTOCOL_ROOT "
|
|
"(CMake or environment variable).")
|
|
endif()
|
|
|
|
target_include_directories(logos-cpp-generator PRIVATE
|
|
${CMAKE_CURRENT_SOURCE_DIR}
|
|
${CMAKE_CURRENT_SOURCE_DIR}/experimental
|
|
${CMAKE_CURRENT_SOURCE_DIR}/../cpp
|
|
${LP_INCLUDE}
|
|
)
|
|
|
|
# Output directories
|
|
set_target_properties(logos-cpp-generator PROPERTIES
|
|
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
|
|
)
|