xo-procedure: refactor generated file locations

2026-03-13 16:15:31 -05:00 · 2026-03-13 16:15:31 -05:00 · f6ecc56a1c
commit f6ecc56a1c
parent 9b8de11c31
32 changed files with 31 additions and 48 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -39,7 +39,6 @@ xo_add_genfacet(
 xo_add_genfacetimpl(
    TARGET xo-procedure2-facetimpl-runtimecontext-simplercx
    FACET_PKG xo_procedure2
-#    REPR DSimpleRcx
    INPUT idl/IRuntimeContext_DSimpleRcx.json5
    )

@ -49,7 +48,6 @@ xo_add_genfacetimpl(
 xo_add_genfacetimpl(
    TARGET xo-procedure2-facetimpl-procedure-primitive_gco_0
    FACET_PKG xo_procedure2
-#    REPR DPrimitive_gco_0
    INPUT idl/IProcedure_DPrimitive_gco_0.json5
 )

@ -57,7 +55,6 @@ xo_add_genfacetimpl(
 xo_add_genfacetimpl(
    TARGET xo-procedure2-facetimpl-gcobject-primitive_gco_0
    FACET_PKG xo_alloc2
-#    REPR Primitive_gco_0
    INPUT idl/IGCObject_DPrimitive_gco_0.json5
 )

@ -65,7 +62,6 @@ xo_add_genfacetimpl(
 xo_add_genfacetimpl(
    TARGET xo-procedure2-facetimpl-printable-primitive_gco_0
    FACET_PKG xo_printable2
-#    REPR Primitive_gco_0
    INPUT idl/IPrintable_DPrimitive_gco_0.json5
 )

@ -75,7 +71,6 @@ xo_add_genfacetimpl(
 xo_add_genfacetimpl(
    TARGET xo-procedure2-facetimpl-procedure-primitive_gco_1_gco
    FACET_PKG xo_procedure2
-#    REPR DPrimitive_gco_1_gco
    INPUT idl/IProcedure_DPrimitive_gco_1_gco.json5
 )

@ -83,7 +78,6 @@ xo_add_genfacetimpl(
 xo_add_genfacetimpl(
    TARGET xo-procedure2-facetimpl-gcobject-primitive_gco_1_gco
    FACET_PKG xo_alloc2
-#    REPR Primitive_gco_1_gco
    INPUT idl/IGCObject_DPrimitive_gco_1_gco.json5
 )

@ -91,7 +85,6 @@ xo_add_genfacetimpl(
 xo_add_genfacetimpl(
    TARGET xo-procedure2-facetimpl-printable-primitive_gco_1_gco
    FACET_PKG xo_printable2
-#    REPR Primitive_gco_1_gco
    INPUT idl/IPrintable_DPrimitive_gco_1_gco.json5
 )

@ -101,7 +94,6 @@ xo_add_genfacetimpl(
 xo_add_genfacetimpl(
    TARGET xo-procedure2-facetimpl-procedure-primitive_gco_2_gco_gco
    FACET_PKG xo_procedure2
-#    REPR DPrimitive_gco_2_gco_gco
    INPUT idl/IProcedure_DPrimitive_gco_2_gco_gco.json5
 )

@ -109,7 +101,6 @@ xo_add_genfacetimpl(
 xo_add_genfacetimpl(
    TARGET xo-procedure2-facetimpl-gcobject-primitive_gco_2_gco_gco
    FACET_PKG xo_alloc2
-#    REPR Primitive_gco_2_gco_gco
    INPUT idl/IGCObject_DPrimitive_gco_2_gco_gco.json5
 )

@ -117,7 +108,6 @@ xo_add_genfacetimpl(
 xo_add_genfacetimpl(
    TARGET xo-procedure2-facetimpl-printable-primitive_gco_2_gco_gco
    FACET_PKG xo_printable2
-#    REPR Primitive_gco_2_gco_gco
    INPUT idl/IPrintable_DPrimitive_gco_2_gco_gco.json5
 )

@ -127,7 +117,6 @@ xo_add_genfacetimpl(
 xo_add_genfacetimpl(
    TARGET xo-procedure2-facetimpl-procedure-primitive_gco_3_dict_string_gco
    FACET_PKG xo_procedure2
-#    REPR Dprimitive_gco_3_dict_string_gco
    INPUT idl/IProcedure_DPrimitive_gco_3_dict_string_gco.json5
 )

@ -135,7 +124,6 @@ xo_add_genfacetimpl(
 xo_add_genfacetimpl(
    TARGET xo-procedure2-facetimpl-gcobject-primitive_gco_3_dict_string_gco
    FACET_PKG xo_alloc2
-#    REPR primitive_gco_3_dict_string_gco
    INPUT idl/IGCObject_DPrimitive_gco_3_dict_string_gco.json5
 )

@ -143,7 +131,6 @@ xo_add_genfacetimpl(
 xo_add_genfacetimpl(
    TARGET xo-procedure2-facetimpl-printable-primitive_gco_3_dict_string_gco
    FACET_PKG xo_printable2
-#    REPR primitive_gco_3_dict_string_gco
    INPUT idl/IPrintable_DPrimitive_gco_3_dict_string_gco.json5
 )

--- a/idl/IGCObject_DPrimitive_gco_0.json5
+++ b/idl/IGCObject_DPrimitive_gco_0.json5
@ -1,6 +1,6 @@
 {
    mode: "implementation",
-    output_cpp_dir: "src/procedure2",
+    output_cpp_dir: "src/procedure2/facet",
    output_hpp_dir: "include/xo/procedure2",
    output_impl_subdir: "detail",
    includes: [
--- a/idl/IGCObject_DPrimitive_gco_1_gco.json5
+++ b/idl/IGCObject_DPrimitive_gco_1_gco.json5
@ -1,6 +1,6 @@
 {
    mode: "implementation",
-    output_cpp_dir: "src/procedure2",
+    output_cpp_dir: "src/procedure2/facet",
    output_hpp_dir: "include/xo/procedure2",
    output_impl_subdir: "detail",
    includes: [
--- a/idl/IGCObject_DPrimitive_gco_2_gco_gco.json5
+++ b/idl/IGCObject_DPrimitive_gco_2_gco_gco.json5
@ -1,6 +1,6 @@
 {
    mode: "implementation",
-    output_cpp_dir: "src/procedure2",
+    output_cpp_dir: "src/procedure2/facet",
    output_hpp_dir: "include/xo/procedure2",
    output_impl_subdir: "detail",
    includes: [
--- a/idl/IGCObject_DPrimitive_gco_3_dict_string_gco.json5
+++ b/idl/IGCObject_DPrimitive_gco_3_dict_string_gco.json5
@ -1,6 +1,6 @@
 {
    mode: "implementation",
-    output_cpp_dir: "src/procedure2",
+    output_cpp_dir: "src/procedure2/facet",
    output_hpp_dir: "include/xo/procedure2",
    output_impl_subdir: "detail",
    includes: [
--- a/idl/IPrintable_DPrimitive_gco_0.json5
+++ b/idl/IPrintable_DPrimitive_gco_0.json5
@ -1,6 +1,6 @@
 {
    mode: "implementation",
-    output_cpp_dir: "src/procedure2",
+    output_cpp_dir: "src/procedure2/facet",
    output_hpp_dir: "include/xo/procedure2",
    output_impl_subdir: "detail",
    includes: [
--- a/idl/IPrintable_DPrimitive_gco_1_gco.json5
+++ b/idl/IPrintable_DPrimitive_gco_1_gco.json5
@ -1,6 +1,6 @@
 {
    mode: "implementation",
-    output_cpp_dir: "src/procedure2",
+    output_cpp_dir: "src/procedure2/facet",
    output_hpp_dir: "include/xo/procedure2",
    output_impl_subdir: "detail",
    includes: [
--- a/idl/IPrintable_DPrimitive_gco_2_gco_gco.json5
+++ b/idl/IPrintable_DPrimitive_gco_2_gco_gco.json5
@ -1,15 +1,11 @@
 {
    mode: "implementation",
-    output_cpp_dir: "src/procedure2",
+    output_cpp_dir: "src/procedure2/facet",
    output_hpp_dir: "include/xo/procedure2",
    output_impl_subdir: "detail",
    includes: [
        "<xo/printable2/Printable.hpp>",
        "<xo/printable2/detail/IPrintable_Xfer.hpp>",
-//        "<xo/procedure2/RuntimeContext.hpp>",
-//        "<xo/procedure2/detail/IRuntimeContext_Xfer.hpp>",
-//        "<xo/procedure2/Procedure.hpp>",
-//        "<xo/procedure2/detail/IProcedure_Xfer.hpp>",
    ],
    local_types: [ ],
    namespace1: "xo",
--- a/idl/IPrintable_DPrimitive_gco_3_dict_string_gco.json5
+++ b/idl/IPrintable_DPrimitive_gco_3_dict_string_gco.json5
@ -1,6 +1,6 @@
 {
    mode: "implementation",
-    output_cpp_dir: "src/procedure2",
+    output_cpp_dir: "src/procedure2/facet",
    output_hpp_dir: "include/xo/procedure2",
    output_impl_subdir: "detail",
    includes: [
--- a/idl/IProcedure_DPrimitive_gco_0.json5
+++ b/idl/IProcedure_DPrimitive_gco_0.json5
@ -1,6 +1,6 @@
 {
    mode: "implementation",
-    output_cpp_dir: "src/procedure2",
+    output_cpp_dir: "src/procedure2/facet",
    output_hpp_dir: "include/xo/procedure2",
    output_impl_subdir: "detail",
    includes: [
--- a/idl/IProcedure_DPrimitive_gco_1_gco.json5
+++ b/idl/IProcedure_DPrimitive_gco_1_gco.json5
@ -1,6 +1,6 @@
 {
    mode: "implementation",
-    output_cpp_dir: "src/procedure2",
+    output_cpp_dir: "src/procedure2/facet",
    output_hpp_dir: "include/xo/procedure2",
    output_impl_subdir: "detail",
    includes: [
--- a/idl/IProcedure_DPrimitive_gco_2_gco_gco.json5
+++ b/idl/IProcedure_DPrimitive_gco_2_gco_gco.json5
@ -1,6 +1,6 @@
 {
    mode: "implementation",
-    output_cpp_dir: "src/procedure2",
+    output_cpp_dir: "src/procedure2/facet",
    output_hpp_dir: "include/xo/procedure2",
    output_impl_subdir: "detail",
    includes: [
--- a/idl/IProcedure_DPrimitive_gco_3_dict_string_gco.json5
+++ b/idl/IProcedure_DPrimitive_gco_3_dict_string_gco.json5
@ -1,6 +1,6 @@
 {
    mode: "implementation",
-    output_cpp_dir: "src/procedure2",
+    output_cpp_dir: "src/procedure2/facet",
    output_hpp_dir: "include/xo/procedure2",
    output_impl_subdir: "detail",
    includes: [
--- a/idl/IRuntimeContext_DSimpleRcx.json5
+++ b/idl/IRuntimeContext_DSimpleRcx.json5
@ -1,6 +1,6 @@
 {
    mode: "implementation",
-    output_cpp_dir: "src/procedure2",
+    output_cpp_dir: "src/procedure2/facet",
    output_hpp_dir: "include/xo/procedure2",
    output_impl_subdir: "detail",
    includes: [
--- a/idl/Procedure.json5
+++ b/idl/Procedure.json5
@ -4,7 +4,7 @@

 {
    mode: "facet",
-    output_cpp_dir: "src/procedure2",
+    output_cpp_dir: "src/procedure2/facet",
    output_hpp_dir: "include/xo/procedure2",
    output_impl_subdir: "detail",
    // includes in ASyntaxStateMachine.hpp
--- a/idl/RuntimeContext.json5
+++ b/idl/RuntimeContext.json5
@ -1,6 +1,6 @@
 {
    mode: "facet",
-    output_cpp_dir: "src/procedure2",
+    output_cpp_dir: "src/procedure2/facet",
    output_hpp_dir: "include/xo/procedure2",
    output_impl_subdir: "detail",
    // includes in ARuntimeContext.hpp
--- a/src/procedure2/CMakeLists.txt
+++ b/src/procedure2/CMakeLists.txt
@ -7,23 +7,23 @@ set(SELF_SRCS
    procedure2_register_types.cpp
    procedure2_register_facets.cpp
    PrimitiveRegistry.cpp
-    DSimpleRcx.cpp
-    IRuntimeContext_Any.cpp
-    IRuntimeContext_DSimpleRcx.cpp
-    IProcedure_Any.cpp
    DPrimitive.cpp
-    IGCObject_DPrimitive_gco_0.cpp
-    IProcedure_DPrimitive_gco_0.cpp
-    IPrintable_DPrimitive_gco_0.cpp
-    IGCObject_DPrimitive_gco_1_gco.cpp
-    IProcedure_DPrimitive_gco_1_gco.cpp
-    IPrintable_DPrimitive_gco_1_gco.cpp
-    IGCObject_DPrimitive_gco_2_gco_gco.cpp
-    IProcedure_DPrimitive_gco_2_gco_gco.cpp
-    IPrintable_DPrimitive_gco_2_gco_gco.cpp
-    IGCObject_DPrimitive_gco_3_dict_string_gco.cpp
-    IProcedure_DPrimitive_gco_3_dict_string_gco.cpp
-    IPrintable_DPrimitive_gco_3_dict_string_gco.cpp
+    DSimpleRcx.cpp
+    facet/IRuntimeContext_Any.cpp
+    facet/IRuntimeContext_DSimpleRcx.cpp
+    facet/IProcedure_Any.cpp
+    facet/IGCObject_DPrimitive_gco_0.cpp
+    facet/IProcedure_DPrimitive_gco_0.cpp
+    facet/IPrintable_DPrimitive_gco_0.cpp
+    facet/IGCObject_DPrimitive_gco_1_gco.cpp
+    facet/IProcedure_DPrimitive_gco_1_gco.cpp
+    facet/IPrintable_DPrimitive_gco_1_gco.cpp
+    facet/IGCObject_DPrimitive_gco_2_gco_gco.cpp
+    facet/IProcedure_DPrimitive_gco_2_gco_gco.cpp
+    facet/IPrintable_DPrimitive_gco_2_gco_gco.cpp
+    facet/IGCObject_DPrimitive_gco_3_dict_string_gco.cpp
+    facet/IProcedure_DPrimitive_gco_3_dict_string_gco.cpp
+    facet/IPrintable_DPrimitive_gco_3_dict_string_gco.cpp
 )

 xo_add_shared_library4(${SELF_LIB} ${PROJECT_NAME}Targets ${PROJECT_VERSION} 1 ${SELF_SRCS})
--- a/src/procedure2/facet/IGCObject_DPrimitive_gco_0.cpp
+++ b/src/procedure2/facet/IGCObject_DPrimitive_gco_0.cpp
--- a/src/procedure2/facet/IGCObject_DPrimitive_gco_1_gco.cpp
+++ b/src/procedure2/facet/IGCObject_DPrimitive_gco_1_gco.cpp
--- a/src/procedure2/facet/IGCObject_DPrimitive_gco_2_gco_gco.cpp
+++ b/src/procedure2/facet/IGCObject_DPrimitive_gco_2_gco_gco.cpp
--- a/src/procedure2/facet/IGCObject_DPrimitive_gco_3_dict_string_gco.cpp
+++ b/src/procedure2/facet/IGCObject_DPrimitive_gco_3_dict_string_gco.cpp
--- a/src/procedure2/facet/IPrintable_DPrimitive_gco_0.cpp
+++ b/src/procedure2/facet/IPrintable_DPrimitive_gco_0.cpp
--- a/src/procedure2/facet/IPrintable_DPrimitive_gco_1_gco.cpp
+++ b/src/procedure2/facet/IPrintable_DPrimitive_gco_1_gco.cpp
--- a/src/procedure2/facet/IPrintable_DPrimitive_gco_2_gco_gco.cpp
+++ b/src/procedure2/facet/IPrintable_DPrimitive_gco_2_gco_gco.cpp
--- a/src/procedure2/facet/IPrintable_DPrimitive_gco_3_dict_string_gco.cpp
+++ b/src/procedure2/facet/IPrintable_DPrimitive_gco_3_dict_string_gco.cpp
--- a/src/procedure2/facet/IProcedure_Any.cpp
+++ b/src/procedure2/facet/IProcedure_Any.cpp
--- a/src/procedure2/facet/IProcedure_DPrimitive_gco_0.cpp
+++ b/src/procedure2/facet/IProcedure_DPrimitive_gco_0.cpp
--- a/src/procedure2/facet/IProcedure_DPrimitive_gco_1_gco.cpp
+++ b/src/procedure2/facet/IProcedure_DPrimitive_gco_1_gco.cpp
--- a/src/procedure2/facet/IProcedure_DPrimitive_gco_2_gco_gco.cpp
+++ b/src/procedure2/facet/IProcedure_DPrimitive_gco_2_gco_gco.cpp
--- a/src/procedure2/facet/IProcedure_DPrimitive_gco_3_dict_string_gco.cpp
+++ b/src/procedure2/facet/IProcedure_DPrimitive_gco_3_dict_string_gco.cpp
--- a/src/procedure2/facet/IRuntimeContext_Any.cpp
+++ b/src/procedure2/facet/IRuntimeContext_Any.cpp
--- a/src/procedure2/facet/IRuntimeContext_DSimpleRcx.cpp
+++ b/src/procedure2/facet/IRuntimeContext_DSimpleRcx.cpp