From 99bfbeb7f32460acd2f2a2658d22431c39eb1f59 Mon Sep 17 00:00:00 2001 From: Roland Conybeare Date: Fri, 15 Mar 2024 19:39:05 -0400 Subject: [PATCH 01/37] pysimulator: initial commit --- .gitignore | 6 +++ CMakeLists.txt | 44 ++++++++++++++++++ README.md | 70 +++++++++++++++++++++++++++++ cmake/xo_pysimulatorConfig.cmake.in | 4 ++ include/README.md | 2 + src/pysimulator/CMakeLists.txt | 8 ++++ src/pysimulator/pysimulator.cpp | 66 +++++++++++++++++++++++++++ src/pysimulator/pysimulator.hpp.in | 25 +++++++++++ 8 files changed, 225 insertions(+) create mode 100644 .gitignore create mode 100644 CMakeLists.txt create mode 100644 README.md create mode 100644 cmake/xo_pysimulatorConfig.cmake.in create mode 100644 include/README.md create mode 100644 src/pysimulator/CMakeLists.txt create mode 100644 src/pysimulator/pysimulator.cpp create mode 100644 src/pysimulator/pysimulator.hpp.in diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..53a9c92f --- /dev/null +++ b/.gitignore @@ -0,0 +1,6 @@ +# lsp keeps state here +.cache +# typical build directory +.build* +# lsp: symlink to file in build directory (established manually) +compile_commands.json diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 00000000..25398891 --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,44 @@ +# xo-pysimulator/CMakeLists.txt + +cmake_minimum_required(VERSION 3.10) + +project(xo_pysimulator VERSION 0.1) +enable_language(CXX) + +# common XO cmake macros (see https://github.com:rconybea/xo-cmake.git) +include(xo_macros/xo-project-macros) + +# ---------------------------------------------------------------- +# unit test setup + +enable_testing() +# activate code coverage for all executables + libraries (when configured with -DCODE_COVERAGE=ON) +add_code_coverage() +# 1. assuming that /nix/store/ prefixes .hpp files belonging to gcc, catch2 etc. +# we're not interested in code coverage for these sources. +# 2. exclude the utest/ subdir, we don't need coverage on the unit tests themselves; +# rather, want coverage on the code that the unit tests exercise. +# +# NOTE: this seems to work only with the 'ccov-all' target. In particular, doesn't seem to do anything with the 'ccov' target +# +add_code_coverage_all_targets(EXCLUDE /nix/store/* ${PROJECT_SOURCE_DIR}/utest/* ${PROJECT_BINARY_DIR}/local/* ${PROJECT_SOURCE_DIR}/repo/*) + +# ---------------------------------------------------------------- +# c++ settings (usually temporary) + +set(PROJECT_CXX_FLAGS "") +add_definitions(${PROJECT_CXX_FLAGS}) + +xo_toplevel_compile_options() + +# ---------------------------------------------------------------- +# sources + +add_subdirectory(src/pysimulator) +#add_subdirectory(utest) + +# ---------------------------------------------------------------- +# provide find_package() support + +xo_export_cmake_config(${PROJECT_NAME} ${PROJECT_VERSION} ${PROJECT_NAME}Targets) + diff --git a/README.md b/README.md new file mode 100644 index 00000000..676fe720 --- /dev/null +++ b/README.md @@ -0,0 +1,70 @@ +# python bindings for c++ reflection library (xo-pysimulator) + +## Getting Started + +### build + install dependencies + +- [github/Rconybea/xo-simulator](https://github.com/Rconybea/xo-simulator) +- [github/Rconybea/xo-pyutil](https://github.com/Rconybea/xo-pyutil) +- [github/Rconybea/xo-pyreflect](https://github.com/Rconybea/xo-pyreflect) +- [github/Rconybea/xo-pyprintjson](https://github.com/Rconybea/xo-pyprintjson) +- [github/Rconybea/xo-pyreactor](https://github.com/Rconybea/xo-pyreactor) + +### build + install +``` +$ cd xo-pysimulator +$ mkdir build +$ cd build +$ INSTALL_PREFIX=/usr/local # or wherever you prefer, e.g. ~/local +$ cmake \ + -DCMAKE_MODULE_PATH=${INSTALL_PREFIX}/share/cmake \ + -DCMAKE_PREFIX_PATH=${INSTALL_PREFIX} \ + -DCMAKE_INSTALL_PREFIX=${INSTALL_PREFIX} .. +$ make +$ make install +``` +(also see .github/workflows/main.yml) + +## Examples + +Assumes `xo-pysimulator` installed to `~/local2/lib` +``` +PYTHONPATH=~/local2/lib:$PYTHONPATH python +>>> import xo_pysimulator +>>> dir(xo_pysimulator) +['Simulator', 'SourceTimestamp', 'TimeSlip', '__doc__', '__file__', '__loader__', '__name__', '__package__', '__spec__', 'make_simulator'] +>>> + +## Development + +### build for unit test coverage +``` +$ cd xo-pysimulator +$ mkdir build-ccov +$ cd build-ccov +$ cmake \ + -DCMAKE_MODULE_PATH=${INSTALL_PREFIX}/share/cmake \ + -DCMAKE_PREFIX_PATH=${INSTALL_PREFIX} \ + -DCODE_COVERAGE=ON \ + -DCMAKE_BUILD_TYPE=Debug .. +``` + +### LSP (language server) support + +LSP looks for compile commands in the root of the source tree; +while `cmake` creates them in the root of its build directory. + +``` +$ cd xo-pysimulator +$ ln -s build/compile_commands.json # supply compile commands to LSP +``` + +## Examples + +Assumes `xo-pysimulator` installed to `~/local2/lib` + +``` +PYTHONPATH=~/local2/lib python +>>> import pysimulator +>>> dir(pysimulator) +``` diff --git a/cmake/xo_pysimulatorConfig.cmake.in b/cmake/xo_pysimulatorConfig.cmake.in new file mode 100644 index 00000000..9c15f36a --- /dev/null +++ b/cmake/xo_pysimulatorConfig.cmake.in @@ -0,0 +1,4 @@ +@PACKAGE_INIT@ + +include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake") +check_required_components("@PROJECT_NAME@") diff --git a/include/README.md b/include/README.md new file mode 100644 index 00000000..12c02f54 --- /dev/null +++ b/include/README.md @@ -0,0 +1,2 @@ +placeholder for future pysimulator #include files + diff --git a/src/pysimulator/CMakeLists.txt b/src/pysimulator/CMakeLists.txt new file mode 100644 index 00000000..c88c44d0 --- /dev/null +++ b/src/pysimulator/CMakeLists.txt @@ -0,0 +1,8 @@ +# xo_pysimulator/src/pysimulator/CMakeLists.txt + +set(SELF_LIB xo_pysimulator) +set(SELF_SRCS pysimulator.cpp) + +xo_pybind11_library(${SELF_LIB} ${PROJECT_NAME}Targets ${SELF_SRCS}) +xo_pybind11_dependency(${SELF_LIB} simulator) +xo_pybind11_dependency(${SELF_LIB} xo_pyutil) diff --git a/src/pysimulator/pysimulator.cpp b/src/pysimulator/pysimulator.cpp new file mode 100644 index 00000000..c1077b0a --- /dev/null +++ b/src/pysimulator/pysimulator.cpp @@ -0,0 +1,66 @@ +/* @file pysimulator.cpp */ + +#include "pysimulator.hpp" +#include "xo/pyreactor/pyreactor.hpp" + +#include "xo/simulator/Simulator.hpp" +#include "xo/simulator/SourceTimestamp.hpp" +#include "xo/simulator/TimeSlip.hpp" +#include "xo/pyutil/pyutil.hpp" +//#include +//#include +//#include + +namespace xo { + using xo::reactor::Reactor; + //using xo::scope; + namespace py = pybind11; + + namespace sim { + PYBIND11_MODULE(PYSIMULATOR_MODULE_NAME(), m) { + /* e.g. for Reactor */ + PYREACTOR_IMPORT_MODULE(); //py::module_::import("pyreactor") + + /* module docstring */ + m.doc() = "pybind11 plugin for xo.simulator"; + + m.def("make_simulator", + []() { + return xo::sim::Simulator::make(xo::time::timeutil::epoch()); + }, + "create new Simulator instance"); + + py::class_(m, "TimeSlip") + .def_property_readonly("sim_tm", &TimeSlip::sim_tm) + .def_property_readonly("real_tm", &TimeSlip::real_tm) + // .def("__repr__", &TimeSlip::display_string) // TODO + ; + + py::class_>(m, "Simulator") + .def_static("make", []() { return xo::sim::Simulator::make(xo::time::timeutil::epoch()); }) + .def_property_readonly("start_tm", &Simulator::t0) + .def_property_readonly("last_tm", &Simulator::last_tm) + .def_property_readonly("n_event", &Simulator::n_event) + .def_property_readonly("is_exhausted", &Simulator::is_exhausted) + .def("next_tm", &Simulator::next_tm) + .def("next_src", &Simulator::next_src) + .def("timeslip", &Simulator::timeslip) + .def("throttled_event_dt", &Simulator::throttled_event_dt) + .def("heap_contents", &Simulator::heap_contents) + .def("log_heap_contents", + [](Simulator & self) { + scope log(XO_LITERAL(log_level::always, "pysimulator", ".log_heap_contents")); + self.log_heap_contents(&log); + }) + .def("__repr__", &Simulator::display_string); + + py::class_(m, "SourceTimestamp") + .def("__repr__", &SourceTimestamp::display_string); + + } /*pysimulator*/ + } /*namespace sim*/ +} /*namespace xo*/ + +/* end pysimulator.cpp */ diff --git a/src/pysimulator/pysimulator.hpp.in b/src/pysimulator/pysimulator.hpp.in new file mode 100644 index 00000000..db3656c5 --- /dev/null +++ b/src/pysimulator/pysimulator.hpp.in @@ -0,0 +1,25 @@ +/* @file pysimulator.hpp + * + * automatically generated from src/xo_pysimulator/pysimulator.hpp.in + * see src/xo_pysimulator/CMakeLists.txt + */ + +/* python requires module name = library name + * example: + * PYBIND11_MODULE(PYSIMULATOR_MODULE_NAME(), m) { ... } + */ +#define PYSIMULATOR_MODULE_NAME() @SELF_LIB@ + +/* example: + * py::module_::import(PYSIMULATOR_MODULE_NAME_STR) + */ +#define PYSIMULATOR_MODULE_NAME_STR "@SELF_LIB@" + +/* example: + * PYSIMULATOR_IMPORT_MODULE() + * replaces + * py::module_::import("pysimulator") + */ +#define PYSIMULATOR_IMPORT_MODULE() py::module_::import("@SELF_LIB@") + +/* end pysimulator.hpp */ From 45d718820aace6f9a1d373c64f43c0bec18164b0 Mon Sep 17 00:00:00 2001 From: Roland Conybeare Date: Fri, 15 Mar 2024 19:57:00 -0400 Subject: [PATCH 02/37] github: initial workflow (wip -- broken) --- .github/workflows/main.yml | 63 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) create mode 100644 .github/workflows/main.yml diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 00000000..8223aab6 --- /dev/null +++ b/.github/workflows/main.yml @@ -0,0 +1,63 @@ +name: build xo-pyreflect + dependencies + +on: + push: + branches: [ "main" ] + pull_request: + branches: [ "main" ] + +env: + # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.) + BUILD_TYPE: Release + +jobs: + build: + # The CMake configure and build commands are platform agnostic and should work equally well on Windows or Mac. + # You can convert this to a matrix build if you need cross-platform coverage. + # See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix + runs-on: ubuntu-latest + + steps: + - name: checkout source + uses: actions/checkout@v3 + + - name: Install catch2 + # install catch2. see [[https://stackoverflow.com/questions/57982945/how-to-apt-get-install-in-a-github-actions-workflow]] + run: sudo apt-get install -y catch2 + + - name: Install pybind11-dev + run: sudo apt-get install -y pybind11-dev + + # ---------------------------------------------------------------- + + - name: clone xo-cmake + uses: actions/checkout@v3 + with: + repository: Rconybea/xo-cmake + path: repo/xo-cmake + + - name: Configure xo-cmake + run: cmake -B ${{github.workspace}}/build_xo-cmake -DCMAKE_INSTALL_PREFIX=${{github.workspace}}/local repo/xo-cmake + + - name: Build xo-cmake (trivial) + run: cmake --build ${{github.workspace}}/build_xo-cmake --config ${{env.BUILD_TYPE}} + + - name: Install xo-cmake + run: cmake --install ${{github.workspace}}/build_xo-cmake + + # ---------------------------------------------------------------- + + - name: Configure self (pysimulator) + # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make. + # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type + run: cmake -B ${{github.workspace}}/build_pysimulator -DCMAKE_MODULE_PATH=${{github.workspace}}/local/share/cmake -DCMAKE_PREFIX_PATH=${{github.workspace}}/local -DCMAKE_INSTALL_PREFIX=${{github.workspace}}/local -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} + + - name: Build self (pysimulator) + # Build your program with the given configuration + run: cmake --build ${{github.workspace}}/build_pysimulator --config ${{env.BUILD_TYPE}} + + - name: Test self (pysimulator) + working-directory: ${{github.workspace}}/build_pysimulator + # Execute tests defined by the CMake configuration. + # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail + run: ctest -C ${{env.BUILD_TYPE}} From 9430b4ee59b13f56383ca075bdd0fc6a37ac2d5a Mon Sep 17 00:00:00 2001 From: Roland Conybeare Date: Fri, 15 Mar 2024 19:59:55 -0400 Subject: [PATCH 03/37] workflow: streamlining (wip - broken) --- .github/workflows/main.yml | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8223aab6..e6ad516f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -21,12 +21,16 @@ jobs: - name: checkout source uses: actions/checkout@v3 - - name: Install catch2 - # install catch2. see [[https://stackoverflow.com/questions/57982945/how-to-apt-get-install-in-a-github-actions-workflow]] - run: sudo apt-get install -y catch2 + - name: Install dependencies + run: | + echo "::group::install catch2" + # install catch2. see [[https://stackoverflow.com/questions/57982945/how-to-apt-get-install-in-a-github-actions-workflow]] + sudo apt-get install -y catch2 + echo "::endgroup" - - name: Install pybind11-dev - run: sudo apt-get install -y pybind11-dev + echo "::group::install pybind11" + run: sudo apt-get install -y pybind11-dev + echo "::endgroup" # ---------------------------------------------------------------- @@ -35,9 +39,8 @@ jobs: with: repository: Rconybea/xo-cmake path: repo/xo-cmake - - - name: Configure xo-cmake - run: cmake -B ${{github.workspace}}/build_xo-cmake -DCMAKE_INSTALL_PREFIX=${{github.workspace}}/local repo/xo-cmake + run: | + cmake -B ${{github.workspace}}/build_xo-cmake -DCMAKE_INSTALL_PREFIX=${{github.workspace}}/local repo/xo-cmake - name: Build xo-cmake (trivial) run: cmake --build ${{github.workspace}}/build_xo-cmake --config ${{env.BUILD_TYPE}} From 9c36ab7e2eb593f449ddd0d18109949334da79be Mon Sep 17 00:00:00 2001 From: Roland Conybeare Date: Fri, 15 Mar 2024 20:02:25 -0400 Subject: [PATCH 04/37] workflow: streamline xo-cmake prep --- .github/workflows/main.yml | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e6ad516f..d6a7adae 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -39,14 +39,20 @@ jobs: with: repository: Rconybea/xo-cmake path: repo/xo-cmake + + - name: build xo-cmake run: | + echo "::group::configure xo-cmake" cmake -B ${{github.workspace}}/build_xo-cmake -DCMAKE_INSTALL_PREFIX=${{github.workspace}}/local repo/xo-cmake + echo "::endgroup" - - name: Build xo-cmake (trivial) - run: cmake --build ${{github.workspace}}/build_xo-cmake --config ${{env.BUILD_TYPE}} + echo "::group::compile xo-cmake" + cmake --build ${{github.workspace}}/build_xo-cmake --config ${{env.BUILD_TYPE}} + echo "::endgroup" - - name: Install xo-cmake - run: cmake --install ${{github.workspace}}/build_xo-cmake + echo "::group::local install xo-cmake" + cmake --install ${{github.workspace}}/build_xo-cmake + echo "::endgroup" # ---------------------------------------------------------------- From 3817677fc8372480ea64e9dd49e6d9c1cc38631b Mon Sep 17 00:00:00 2001 From: Roland Conybeare Date: Fri, 15 Mar 2024 20:03:18 -0400 Subject: [PATCH 05/37] workflow: bugfix: typo in apt-get for pybind11-dev --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d6a7adae..4aafb3b2 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -29,7 +29,7 @@ jobs: echo "::endgroup" echo "::group::install pybind11" - run: sudo apt-get install -y pybind11-dev + sudo apt-get install -y pybind11-dev echo "::endgroup" # ---------------------------------------------------------------- From 4693064fd3b3f1ecce7e6adf8041a1527e8291e9 Mon Sep 17 00:00:00 2001 From: Roland Conybeare Date: Fri, 15 Mar 2024 20:11:39 -0400 Subject: [PATCH 06/37] workflow: + build xo-simulator (wip - broken) --- .github/workflows/main.yml | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4aafb3b2..95a81b40 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -24,7 +24,8 @@ jobs: - name: Install dependencies run: | echo "::group::install catch2" - # install catch2. see [[https://stackoverflow.com/questions/57982945/how-to-apt-get-install-in-a-github-actions-workflow]] + # install catch2. see + # [[https://stackoverflow.com/questions/57982945/how-to-apt-get-install-in-a-github-actions-workflow]] sudo apt-get install -y catch2 echo "::endgroup" @@ -54,8 +55,36 @@ jobs: cmake --install ${{github.workspace}}/build_xo-cmake echo "::endgroup" + echo "::group::local dir tree" + tree ${{github.workspace}}/local + echo "::endgroup" + # ---------------------------------------------------------------- + - name: clone xo-simulator + uses: actions/checkout@v3 + with: + repository: Rconybea/xo-simulator + path: repo/xo-simulator + + - name: build xo-simulator + run: | + echo "::group::configure xo-simulator + cmake -B ${{github.workspace}}/build_xo-simulator -DCMAKE_INSTALL_PREFIX=${{github.workspace}}/local repo/xo-simulator + echo "::endgroup" + + echo "::group::compile xo-simulator" + cmake --build ${{github.workspace}}/build_xo-simulator --config ${{env.BUILD_TYPE}} + echo "::endgroup" + + echo "::group::local install xo-simulator"; + cmake --install ${{github.workspace}}/build_xo-simulator + echo "::endgroup" + + echo "::group::local dir tree" + tree ${{github.workspace}//local + echo "::endgroup" + - name: Configure self (pysimulator) # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make. # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type From 14cec30749dd882def5f8a071b9bf3b2fe9538f7 Mon Sep 17 00:00:00 2001 From: Roland Conybeare Date: Fri, 15 Mar 2024 20:12:41 -0400 Subject: [PATCH 07/37] workflow: bugfix: typo in .yml file --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 95a81b40..d64f7f5f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -69,7 +69,7 @@ jobs: - name: build xo-simulator run: | - echo "::group::configure xo-simulator + echo "::group::configure xo-simulator" cmake -B ${{github.workspace}}/build_xo-simulator -DCMAKE_INSTALL_PREFIX=${{github.workspace}}/local repo/xo-simulator echo "::endgroup" From 963ba96f6cd441c3833f2dd44eb49967eae20e57 Mon Sep 17 00:00:00 2001 From: Roland Conybeare Date: Fri, 15 Mar 2024 20:13:20 -0400 Subject: [PATCH 08/37] workflow: bugfix: syntax! --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d64f7f5f..71a02ba7 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -82,7 +82,7 @@ jobs: echo "::endgroup" echo "::group::local dir tree" - tree ${{github.workspace}//local + tree ${{github.workspace}}/local echo "::endgroup" - name: Configure self (pysimulator) From 1348ba81c89b68318538948f71ae1089158f5ca5 Mon Sep 17 00:00:00 2001 From: Roland Conybeare Date: Fri, 15 Mar 2024 20:16:02 -0400 Subject: [PATCH 09/37] workflow: build xo-reactor (wip - broken) --- .github/workflows/main.yml | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 71a02ba7..17bd0709 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -61,24 +61,29 @@ jobs: # ---------------------------------------------------------------- - - name: clone xo-simulator + - name: clone xo-reactor uses: actions/checkout@v3 with: - repository: Rconybea/xo-simulator - path: repo/xo-simulator + repository: Rconybea/xo-reactor + path: repo/xo-reactor - - name: build xo-simulator + - name: build xo-reactor run: | - echo "::group::configure xo-simulator" - cmake -B ${{github.workspace}}/build_xo-simulator -DCMAKE_INSTALL_PREFIX=${{github.workspace}}/local repo/xo-simulator + XONAME=xo-reactor + XOSRC=repo/${XONAME} + BUILDDIR=${{github.workspace}}/build_${XONAME} + PREFIX=${{github.workspace}}/local + + echo "::group::configure xo-reactor" + cmake -B ${BUILDDIR} -DCMAKE_INSTALL_PREFIX=${PREFIX} ${XOSRC} echo "::endgroup" - echo "::group::compile xo-simulator" - cmake --build ${{github.workspace}}/build_xo-simulator --config ${{env.BUILD_TYPE}} + echo "::group::compile xo-reactor" + cmake --build ${{github.workspace}}/build_xo-reactor --config ${{env.BUILD_TYPE}} echo "::endgroup" - echo "::group::local install xo-simulator"; - cmake --install ${{github.workspace}}/build_xo-simulator + echo "::group::local install xo-reactor"; + cmake --install ${{github.workspace}}/build_xo-reactor echo "::endgroup" echo "::group::local dir tree" From b5590ce449713ed66dc47b798f0a75a261beedd0 Mon Sep 17 00:00:00 2001 From: Roland Conybeare Date: Fri, 15 Mar 2024 20:18:57 -0400 Subject: [PATCH 10/37] workflow: build xo-reflect (wip - broken) --- .github/workflows/main.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 17bd0709..672c052d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -61,33 +61,33 @@ jobs: # ---------------------------------------------------------------- - - name: clone xo-reactor + - name: clone xo-reflect uses: actions/checkout@v3 with: - repository: Rconybea/xo-reactor - path: repo/xo-reactor + repository: Rconybea/xo-reflect + path: repo/xo-reflect - - name: build xo-reactor + - name: build xo-reflect run: | - XONAME=xo-reactor + XONAME=xo-reflect XOSRC=repo/${XONAME} BUILDDIR=${{github.workspace}}/build_${XONAME} PREFIX=${{github.workspace}}/local - echo "::group::configure xo-reactor" + echo "::group::configure ${XONAME} cmake -B ${BUILDDIR} -DCMAKE_INSTALL_PREFIX=${PREFIX} ${XOSRC} echo "::endgroup" - echo "::group::compile xo-reactor" - cmake --build ${{github.workspace}}/build_xo-reactor --config ${{env.BUILD_TYPE}} + echo "::group::compile ${XONAME} + cmake --build ${BUILDDIR} --config ${{env.BUILD_TYPE}} echo "::endgroup" - echo "::group::local install xo-reactor"; - cmake --install ${{github.workspace}}/build_xo-reactor + echo "::group::local install ${XONAME}; + cmake --install ${BUILDDIR} echo "::endgroup" echo "::group::local dir tree" - tree ${{github.workspace}}/local + tree ${PREFIX} echo "::endgroup" - name: Configure self (pysimulator) From 8d83e37ac7e10df72535c9c3d45fc9ef426136b9 Mon Sep 17 00:00:00 2001 From: Roland Conybeare Date: Fri, 15 Mar 2024 20:20:25 -0400 Subject: [PATCH 11/37] workflow: bugfix: remote repo name --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 672c052d..47f656a6 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -64,7 +64,7 @@ jobs: - name: clone xo-reflect uses: actions/checkout@v3 with: - repository: Rconybea/xo-reflect + repository: Rconybea/reflect # not xo-reflect ! path: repo/xo-reflect - name: build xo-reflect From 76c7733f7728bd398d96b6761ae1af16a641ed6c Mon Sep 17 00:00:00 2001 From: Roland Conybeare Date: Fri, 15 Mar 2024 20:26:02 -0400 Subject: [PATCH 12/37] workflow: xo-simulator: debugging (wip - broken) --- .github/workflows/main.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 47f656a6..cb4c9442 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -64,7 +64,7 @@ jobs: - name: clone xo-reflect uses: actions/checkout@v3 with: - repository: Rconybea/reflect # not xo-reflect ! + repository: Rconybea/reflect path: repo/xo-reflect - name: build xo-reflect @@ -74,6 +74,10 @@ jobs: BUILDDIR=${{github.workspace}}/build_${XONAME} PREFIX=${{github.workspace}}/local + echo "::group::repo dir tree" + tree repo + echo "::endgroup" + echo "::group::configure ${XONAME} cmake -B ${BUILDDIR} -DCMAKE_INSTALL_PREFIX=${PREFIX} ${XOSRC} echo "::endgroup" From 05357a639808806e30cd9d7cbf98944953fef46a Mon Sep 17 00:00:00 2001 From: Roland Conybeare Date: Fri, 15 Mar 2024 20:28:08 -0400 Subject: [PATCH 13/37] workflow: bugfix: yaml typos! (wip - broken) --- .github/workflows/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index cb4c9442..34526171 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -75,10 +75,10 @@ jobs: PREFIX=${{github.workspace}}/local echo "::group::repo dir tree" - tree repo + tree -L 2 repo echo "::endgroup" - echo "::group::configure ${XONAME} + echo "::group::configure ${XONAME}" cmake -B ${BUILDDIR} -DCMAKE_INSTALL_PREFIX=${PREFIX} ${XOSRC} echo "::endgroup" @@ -86,7 +86,7 @@ jobs: cmake --build ${BUILDDIR} --config ${{env.BUILD_TYPE}} echo "::endgroup" - echo "::group::local install ${XONAME}; + echo "::group::local install ${XONAME}" cmake --install ${BUILDDIR} echo "::endgroup" From daa42fcaddc3a4f92a564233a0636e7b27afcdf9 Mon Sep 17 00:00:00 2001 From: Roland Conybeare Date: Fri, 15 Mar 2024 20:31:00 -0400 Subject: [PATCH 14/37] workflow: build xo-refcnt (wip - broken) --- .github/workflows/main.yml | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 34526171..5a9f6d1c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -43,33 +43,38 @@ jobs: - name: build xo-cmake run: | - echo "::group::configure xo-cmake" - cmake -B ${{github.workspace}}/build_xo-cmake -DCMAKE_INSTALL_PREFIX=${{github.workspace}}/local repo/xo-cmake + XONAME=xo-cmake + XOSRC=repo/${XONAME} + BUILDDIR=${{github.workspace}}/build_${XONAME} + PREFIX=${{github.workspace}}/local + + echo "::group::configure ${XONAME} + cmake -B ${BUILDDIR} -DCMAKE_INSTALL_PREFIX=${PREFIX} ${XOSRC} echo "::endgroup" - echo "::group::compile xo-cmake" + echo "::group::compile ${XONAME} cmake --build ${{github.workspace}}/build_xo-cmake --config ${{env.BUILD_TYPE}} echo "::endgroup" - echo "::group::local install xo-cmake" + echo "::group::local install ${XONAME} cmake --install ${{github.workspace}}/build_xo-cmake echo "::endgroup" echo "::group::local dir tree" - tree ${{github.workspace}}/local + tree ${PREFIX} echo "::endgroup" # ---------------------------------------------------------------- - - name: clone xo-reflect + - name: clone xo-refcnt uses: actions/checkout@v3 with: - repository: Rconybea/reflect - path: repo/xo-reflect + repository: Rconybea/refcnt + path: repo/xo-refcnt - - name: build xo-reflect + - name: build xo-refcnt run: | - XONAME=xo-reflect + XONAME=xo-refcnt XOSRC=repo/${XONAME} BUILDDIR=${{github.workspace}}/build_${XONAME} PREFIX=${{github.workspace}}/local From c520ad82945a27617549bd7fa13fffcf0349677e Mon Sep 17 00:00:00 2001 From: Roland Conybeare Date: Fri, 15 Mar 2024 20:31:37 -0400 Subject: [PATCH 15/37] workflow: bugfix: yaml typos! (wip - broken) --- .github/workflows/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5a9f6d1c..945c720c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -48,15 +48,15 @@ jobs: BUILDDIR=${{github.workspace}}/build_${XONAME} PREFIX=${{github.workspace}}/local - echo "::group::configure ${XONAME} + echo "::group::configure ${XONAME}" cmake -B ${BUILDDIR} -DCMAKE_INSTALL_PREFIX=${PREFIX} ${XOSRC} echo "::endgroup" - echo "::group::compile ${XONAME} + echo "::group::compile ${XONAME}" cmake --build ${{github.workspace}}/build_xo-cmake --config ${{env.BUILD_TYPE}} echo "::endgroup" - echo "::group::local install ${XONAME} + echo "::group::local install ${XONAME}" cmake --install ${{github.workspace}}/build_xo-cmake echo "::endgroup" From 99190e461551d06aa84e14af463f209472b297bc Mon Sep 17 00:00:00 2001 From: Roland Conybeare Date: Fri, 15 Mar 2024 20:35:35 -0400 Subject: [PATCH 16/37] workflow: build indentlog (wip - broken) --- .github/workflows/main.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 945c720c..3ed07489 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -53,11 +53,11 @@ jobs: echo "::endgroup" echo "::group::compile ${XONAME}" - cmake --build ${{github.workspace}}/build_xo-cmake --config ${{env.BUILD_TYPE}} + cmake --build ${BUILDDIR} --config ${{env.BUILD_TYPE}} echo "::endgroup" echo "::group::local install ${XONAME}" - cmake --install ${{github.workspace}}/build_xo-cmake + cmake --install ${BUILDDIR} echo "::endgroup" echo "::group::local dir tree" @@ -66,15 +66,15 @@ jobs: # ---------------------------------------------------------------- - - name: clone xo-refcnt + - name: clone xo-indentlog uses: actions/checkout@v3 with: - repository: Rconybea/refcnt - path: repo/xo-refcnt + repository: Rconybea/indentlog + path: repo/xo-indentlog - - name: build xo-refcnt + - name: build xo-indentlog run: | - XONAME=xo-refcnt + XONAME=xo-indentlog XOSRC=repo/${XONAME} BUILDDIR=${{github.workspace}}/build_${XONAME} PREFIX=${{github.workspace}}/local @@ -87,7 +87,7 @@ jobs: cmake -B ${BUILDDIR} -DCMAKE_INSTALL_PREFIX=${PREFIX} ${XOSRC} echo "::endgroup" - echo "::group::compile ${XONAME} + echo "::group::compile ${XONAME}" cmake --build ${BUILDDIR} --config ${{env.BUILD_TYPE}} echo "::endgroup" From 3ed31ad824dc67afeab67559ed8ed52c1847852d Mon Sep 17 00:00:00 2001 From: Roland Conybeare Date: Fri, 15 Mar 2024 20:38:01 -0400 Subject: [PATCH 17/37] workflow: back to xo-indentlog build (wip - broken) --- .github/workflows/main.yml | 39 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 37 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3ed07489..763f0782 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -88,7 +88,7 @@ jobs: echo "::endgroup" echo "::group::compile ${XONAME}" - cmake --build ${BUILDDIR} --config ${{env.BUILD_TYPE}} + cmake --build ${BUILDDIR} --config ${{env.BUILD_TYPE}} -j echo "::endgroup" echo "::group::local install ${XONAME}" @@ -96,7 +96,42 @@ jobs: echo "::endgroup" echo "::group::local dir tree" - tree ${PREFIX} + tree -L 3 ${PREFIX} + echo "::endgroup" + + # ---------------------------------------------------------------- + + - name: clone xo-refcnt + uses: actions/checkout@v3 + with: + repository: Rconybea/refcnt + path: repo/xo-refcnt + + - name: build xo-refcnt + run: | + XONAME=xo-refcnt + XOSRC=repo/${XONAME} + BUILDDIR=${{github.workspace}}/build_${XONAME} + PREFIX=${{github.workspace}}/local + + echo "::group::repo dir tree" + tree -L 2 repo + echo "::endgroup" + + echo "::group::configure ${XONAME}" + cmake -B ${BUILDDIR} -DCMAKE_INSTALL_PREFIX=${PREFIX} ${XOSRC} + echo "::endgroup" + + echo "::group::compile ${XONAME}" + cmake --build ${BUILDDIR} --config ${{env.BUILD_TYPE}} -j + echo "::endgroup" + + echo "::group::local install ${XONAME}" + cmake --install ${BUILDDIR} + echo "::endgroup" + + echo "::group::local dir tree" + tree -L 3 ${PREFIX} echo "::endgroup" - name: Configure self (pysimulator) From 6417e0e098fb87f1a34ff053399efcd96f7bfad4 Mon Sep 17 00:00:00 2001 From: Roland Conybeare Date: Fri, 15 Mar 2024 20:39:59 -0400 Subject: [PATCH 18/37] workflow: back to xo-reflect build (wip - broken) --- .github/workflows/main.yml | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 763f0782..610dfbe3 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -134,6 +134,41 @@ jobs: tree -L 3 ${PREFIX} echo "::endgroup" + # ---------------------------------------------------------------- + + - name: clone xo-reflect + uses: actions/checkout@v3 + with: + repository: Rconybea/reflect + path: repo/xo-reflect + + - name: build xo-reflect + run: | + XONAME=xo-reflect + XOSRC=repo/${XONAME} + BUILDDIR=${{github.workspace}}/build_${XONAME} + PREFIX=${{github.workspace}}/local + + echo "::group::repo dir tree" + tree -L 2 repo + echo "::endgroup" + + echo "::group::configure ${XONAME}" + cmake -B ${BUILDDIR} -DCMAKE_INSTALL_PREFIX=${PREFIX} ${XOSRC} + echo "::endgroup" + + echo "::group::compile ${XONAME}" + cmake --build ${BUILDDIR} --config ${{env.BUILD_TYPE}} -j + echo "::endgroup" + + echo "::group::local install ${XONAME}" + cmake --install ${BUILDDIR} + echo "::endgroup" + + echo "::group::local dir tree" + tree -L 3 ${PREFIX} + echo "::endgroup" + - name: Configure self (pysimulator) # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make. # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type From 4c912d6fe02b6d210fe54cb4f3d03fc27c526cf3 Mon Sep 17 00:00:00 2001 From: Roland Conybeare Date: Fri, 15 Mar 2024 20:43:24 -0400 Subject: [PATCH 19/37] workflow: + xo-subsys build (wip - broken) --- .github/workflows/main.yml | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 610dfbe3..040ee495 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -136,6 +136,41 @@ jobs: # ---------------------------------------------------------------- + - name: clone xo-subsys + uses: actions/checkout@v3 + with: + repository: Rconybea/subsys + path: repo/xo-subsys + + - name: build xo-subsys + run: | + XONAME=xo-subsys + XOSRC=repo/${XONAME} + BUILDDIR=${{github.workspace}}/build_${XONAME} + PREFIX=${{github.workspace}}/local + + echo "::group::repo dir tree" + tree -L 2 repo + echo "::endgroup" + + echo "::group::configure ${XONAME}" + cmake -B ${BUILDDIR} -DCMAKE_INSTALL_PREFIX=${PREFIX} ${XOSRC} + echo "::endgroup" + + echo "::group::compile ${XONAME}" + cmake --build ${BUILDDIR} --config ${{env.BUILD_TYPE}} -j + echo "::endgroup" + + echo "::group::local install ${XONAME}" + cmake --install ${BUILDDIR} + echo "::endgroup" + + echo "::group::local dir tree" + tree -L 3 ${PREFIX} + echo "::endgroup" + + # ---------------------------------------------------------------- + - name: clone xo-reflect uses: actions/checkout@v3 with: From 1021889c01438a3279967f9042092927f17f6954 Mon Sep 17 00:00:00 2001 From: Roland Conybeare Date: Fri, 15 Mar 2024 20:45:34 -0400 Subject: [PATCH 20/37] workflow: bugfix: return to xo-reactor build (wip - broken) --- .github/workflows/main.yml | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 040ee495..3aaa0a36 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -204,6 +204,41 @@ jobs: tree -L 3 ${PREFIX} echo "::endgroup" + # ---------------------------------------------------------------- + + - name: clone xo-reactor + uses: actions/checkout@v3 + with: + repository: Rconybea/reactor + path: repo/xo-reactor + + - name: build xo-reactor + run: | + XONAME=xo-reactor + XOSRC=repo/${XONAME} + BUILDDIR=${{github.workspace}}/build_${XONAME} + PREFIX=${{github.workspace}}/local + + echo "::group::repo dir tree" + tree -L 2 repo + echo "::endgroup" + + echo "::group::configure ${XONAME}" + cmake -B ${BUILDDIR} -DCMAKE_INSTALL_PREFIX=${PREFIX} ${XOSRC} + echo "::endgroup" + + echo "::group::compile ${XONAME}" + cmake --build ${BUILDDIR} --config ${{env.BUILD_TYPE}} -j + echo "::endgroup" + + echo "::group::local install ${XONAME}" + cmake --install ${BUILDDIR} + echo "::endgroup" + + echo "::group::local dir tree" + tree -L 3 ${PREFIX} + echo "::endgroup" + - name: Configure self (pysimulator) # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make. # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type From d0700cb3619b5c4ebef38a5a7caddaf9dd4e985a Mon Sep 17 00:00:00 2001 From: Roland Conybeare Date: Fri, 15 Mar 2024 20:46:48 -0400 Subject: [PATCH 21/37] workflow: bugfix: fix xo-reactor repo name --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3aaa0a36..f420f343 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -209,7 +209,7 @@ jobs: - name: clone xo-reactor uses: actions/checkout@v3 with: - repository: Rconybea/reactor + repository: Rconybea/xo-reactor path: repo/xo-reactor - name: build xo-reactor From 3e7b9a000a66ecf1ac23cafa8daad0e101718e8f Mon Sep 17 00:00:00 2001 From: Roland Conybeare Date: Fri, 15 Mar 2024 20:49:18 -0400 Subject: [PATCH 22/37] workflow: + xo-webutil (wip - broken) --- .github/workflows/main.yml | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f420f343..f760ece0 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -206,6 +206,41 @@ jobs: # ---------------------------------------------------------------- + - name: clone xo-webutil + uses: actions/checkout@v3 + with: + repository: Rconybea/xo-webutil + path: repo/xo-webutil + + - name: build xo-webutil + run: | + XONAME=xo-webutil + XOSRC=repo/${XONAME} + BUILDDIR=${{github.workspace}}/build_${XONAME} + PREFIX=${{github.workspace}}/local + + echo "::group::repo dir tree" + tree -L 2 repo + echo "::endgroup" + + echo "::group::configure ${XONAME}" + cmake -B ${BUILDDIR} -DCMAKE_INSTALL_PREFIX=${PREFIX} ${XOSRC} + echo "::endgroup" + + echo "::group::compile ${XONAME}" + cmake --build ${BUILDDIR} --config ${{env.BUILD_TYPE}} -j + echo "::endgroup" + + echo "::group::local install ${XONAME}" + cmake --install ${BUILDDIR} + echo "::endgroup" + + echo "::group::local dir tree" + tree -L 3 ${PREFIX} + echo "::endgroup" + + # ---------------------------------------------------------------- + - name: clone xo-reactor uses: actions/checkout@v3 with: From ee82037ba9ba9fd179ec70548742063fe2cc96d2 Mon Sep 17 00:00:00 2001 From: Roland Conybeare Date: Fri, 15 Mar 2024 20:51:07 -0400 Subject: [PATCH 23/37] workflow: + xo-callback (wip - broken) --- .github/workflows/main.yml | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f760ece0..e36d85a1 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -206,6 +206,41 @@ jobs: # ---------------------------------------------------------------- + - name: clone xo-callback + uses: actions/checkout@v3 + with: + repository: Rconybea/xo-callback + path: repo/xo-callback + + - name: build xo-callback + run: | + XONAME=xo-callback + XOSRC=repo/${XONAME} + BUILDDIR=${{github.workspace}}/build_${XONAME} + PREFIX=${{github.workspace}}/local + + echo "::group::repo dir tree" + tree -L 2 repo + echo "::endgroup" + + echo "::group::configure ${XONAME}" + cmake -B ${BUILDDIR} -DCMAKE_INSTALL_PREFIX=${PREFIX} ${XOSRC} + echo "::endgroup" + + echo "::group::compile ${XONAME}" + cmake --build ${BUILDDIR} --config ${{env.BUILD_TYPE}} -j + echo "::endgroup" + + echo "::group::local install ${XONAME}" + cmake --install ${BUILDDIR} + echo "::endgroup" + + echo "::group::local dir tree" + tree -L 3 ${PREFIX} + echo "::endgroup" + + # ---------------------------------------------------------------- + - name: clone xo-webutil uses: actions/checkout@v3 with: From 591b7388fed02b9946a11ee8513d7c3a1a9d1cd0 Mon Sep 17 00:00:00 2001 From: Roland Conybeare Date: Fri, 15 Mar 2024 20:53:31 -0400 Subject: [PATCH 24/37] workflow: + xo-printjson (wip - broken) --- .github/workflows/main.yml | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e36d85a1..e7eb52f0 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -241,6 +241,41 @@ jobs: # ---------------------------------------------------------------- + - name: clone xo-printjson + uses: actions/checkout@v3 + with: + repository: Rconybea/xo-printjson + path: repo/xo-printjson + + - name: build xo-printjson + run: | + XONAME=xo-printjson + XOSRC=repo/${XONAME} + BUILDDIR=${{github.workspace}}/build_${XONAME} + PREFIX=${{github.workspace}}/local + + echo "::group::repo dir tree" + tree -L 2 repo + echo "::endgroup" + + echo "::group::configure ${XONAME}" + cmake -B ${BUILDDIR} -DCMAKE_INSTALL_PREFIX=${PREFIX} ${XOSRC} + echo "::endgroup" + + echo "::group::compile ${XONAME}" + cmake --build ${BUILDDIR} --config ${{env.BUILD_TYPE}} -j + echo "::endgroup" + + echo "::group::local install ${XONAME}" + cmake --install ${BUILDDIR} + echo "::endgroup" + + echo "::group::local dir tree" + tree -L 3 ${PREFIX} + echo "::endgroup" + + # ---------------------------------------------------------------- + - name: clone xo-webutil uses: actions/checkout@v3 with: From aa77c5f4b493efae91433d0d507cf0c3dd4cdea5 Mon Sep 17 00:00:00 2001 From: Roland Conybeare Date: Fri, 15 Mar 2024 20:57:09 -0400 Subject: [PATCH 25/37] workflow: + xo-ordinaltree (wip - broken) --- .github/workflows/main.yml | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e7eb52f0..f1d95a42 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -276,6 +276,41 @@ jobs: # ---------------------------------------------------------------- + - name: clone xo-ordinaltree + uses: actions/checkout@v3 + with: + repository: Rconybea/xo-ordinaltree + path: repo/xo-ordinaltree + + - name: build xo-ordinaltree + run: | + XONAME=xo-ordinaltree + XOSRC=repo/${XONAME} + BUILDDIR=${{github.workspace}}/build_${XONAME} + PREFIX=${{github.workspace}}/local + + echo "::group::repo dir tree" + tree -L 2 repo + echo "::endgroup" + + echo "::group::configure ${XONAME}" + cmake -B ${BUILDDIR} -DCMAKE_INSTALL_PREFIX=${PREFIX} ${XOSRC} + echo "::endgroup" + + echo "::group::compile ${XONAME}" + cmake --build ${BUILDDIR} --config ${{env.BUILD_TYPE}} -j + echo "::endgroup" + + echo "::group::local install ${XONAME}" + cmake --install ${BUILDDIR} + echo "::endgroup" + + echo "::group::local dir tree" + tree -L 3 ${PREFIX} + echo "::endgroup" + + # ---------------------------------------------------------------- + - name: clone xo-webutil uses: actions/checkout@v3 with: From b1e08d791a93087c66730f4794fb75b671125cd6 Mon Sep 17 00:00:00 2001 From: Roland Conybeare Date: Fri, 15 Mar 2024 20:59:09 -0400 Subject: [PATCH 26/37] workflow: + xo-randomgen (wip - broken) --- .github/workflows/main.yml | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f1d95a42..d0a7c5e2 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -276,6 +276,41 @@ jobs: # ---------------------------------------------------------------- + - name: clone xo-randomgen + uses: actions/checkout@v3 + with: + repository: Rconybea/xo-randomgen + path: repo/xo-randomgen + + - name: build xo-randomgen + run: | + XONAME=xo-randomgen + XOSRC=repo/${XONAME} + BUILDDIR=${{github.workspace}}/build_${XONAME} + PREFIX=${{github.workspace}}/local + + echo "::group::repo dir tree" + tree -L 2 repo + echo "::endgroup" + + echo "::group::configure ${XONAME}" + cmake -B ${BUILDDIR} -DCMAKE_INSTALL_PREFIX=${PREFIX} ${XOSRC} + echo "::endgroup" + + echo "::group::compile ${XONAME}" + cmake --build ${BUILDDIR} --config ${{env.BUILD_TYPE}} -j + echo "::endgroup" + + echo "::group::local install ${XONAME}" + cmake --install ${BUILDDIR} + echo "::endgroup" + + echo "::group::local dir tree" + tree -L 3 ${PREFIX} + echo "::endgroup" + + # ---------------------------------------------------------------- + - name: clone xo-ordinaltree uses: actions/checkout@v3 with: From 6276893847f2ab19743f512c32b2b4757c957955 Mon Sep 17 00:00:00 2001 From: Roland Conybeare Date: Fri, 15 Mar 2024 21:02:50 -0400 Subject: [PATCH 27/37] workflow: bugfix: xo-randomgen repo name --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d0a7c5e2..6121a8d1 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -279,7 +279,7 @@ jobs: - name: clone xo-randomgen uses: actions/checkout@v3 with: - repository: Rconybea/xo-randomgen + repository: Rconybea/randomgen path: repo/xo-randomgen - name: build xo-randomgen From 78bb709ddc2b3ac0c1737ce4734f1a9e3f020c67 Mon Sep 17 00:00:00 2001 From: Roland Conybeare Date: Fri, 15 Mar 2024 21:06:04 -0400 Subject: [PATCH 28/37] workflow: + xo-simulator (wip - broken) --- .github/workflows/main.yml | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6121a8d1..7f4e8374 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -414,6 +414,41 @@ jobs: tree -L 3 ${PREFIX} echo "::endgroup" + # ---------------------------------------------------------------- + + - name: clone xo-simulator + uses: actions/checkout@v3 + with: + repository: Rconybea/xo-simulator + path: repo/xo-simulator + + - name: build xo-simulator + run: | + XONAME=xo-simulator + XOSRC=repo/${XONAME} + BUILDDIR=${{github.workspace}}/build_${XONAME} + PREFIX=${{github.workspace}}/local + + echo "::group::repo dir tree" + tree -L 2 repo + echo "::endgroup" + + echo "::group::configure ${XONAME}" + cmake -B ${BUILDDIR} -DCMAKE_INSTALL_PREFIX=${PREFIX} ${XOSRC} + echo "::endgroup" + + echo "::group::compile ${XONAME}" + cmake --build ${BUILDDIR} --config ${{env.BUILD_TYPE}} -j + echo "::endgroup" + + echo "::group::local install ${XONAME}" + cmake --install ${BUILDDIR} + echo "::endgroup" + + echo "::group::local dir tree" + tree -L 3 ${PREFIX} + echo "::endgroup" + - name: Configure self (pysimulator) # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make. # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type From 204e3bae4f902de142cc2d14658239bafab88b43 Mon Sep 17 00:00:00 2001 From: Roland Conybeare Date: Fri, 15 Mar 2024 21:11:08 -0400 Subject: [PATCH 29/37] workflow: + xo-pyutil (wip - broken) --- .github/workflows/main.yml | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7f4e8374..03e17a9c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -449,6 +449,43 @@ jobs: tree -L 3 ${PREFIX} echo "::endgroup" + # ---------------------------------------------------------------- + + - name: clone xo-pyutil + uses: actions/checkout@v3 + with: + repository: Rconybea/xo-pyutil + path: repo/xo-pyutil + + - name: build xo-pyutil + run: | + XONAME=xo-pyutil + XOSRC=repo/${XONAME} + BUILDDIR=${{github.workspace}}/build_${XONAME} + PREFIX=${{github.workspace}}/local + + echo "::group::repo dir tree" + tree -L 2 repo + echo "::endgroup" + + echo "::group::configure ${XONAME}" + cmake -B ${BUILDDIR} -DCMAKE_INSTALL_PREFIX=${PREFIX} ${XOSRC} + echo "::endgroup" + + echo "::group::compile ${XONAME}" + cmake --build ${BUILDDIR} --config ${{env.BUILD_TYPE}} -j + echo "::endgroup" + + echo "::group::local install ${XONAME}" + cmake --install ${BUILDDIR} + echo "::endgroup" + + echo "::group::local dir tree" + tree -L 3 ${PREFIX} + echo "::endgroup" + + # ---------------------------------------------------------------- + - name: Configure self (pysimulator) # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make. # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type From 630ab081c62a510ebc2d70709496c1f894811861 Mon Sep 17 00:00:00 2001 From: Roland Conybeare Date: Fri, 15 Mar 2024 21:15:18 -0400 Subject: [PATCH 30/37] build: report xo_pyreactor dependency --- src/pysimulator/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pysimulator/CMakeLists.txt b/src/pysimulator/CMakeLists.txt index c88c44d0..541c3378 100644 --- a/src/pysimulator/CMakeLists.txt +++ b/src/pysimulator/CMakeLists.txt @@ -4,5 +4,6 @@ set(SELF_LIB xo_pysimulator) set(SELF_SRCS pysimulator.cpp) xo_pybind11_library(${SELF_LIB} ${PROJECT_NAME}Targets ${SELF_SRCS}) +xo_pybind11_dependency(${SELF_LIB} xo_pyreactor) xo_pybind11_dependency(${SELF_LIB} simulator) xo_pybind11_dependency(${SELF_LIB} xo_pyutil) From a8161f301ee2f8e1d63c59fe41ba8f6d54ec5223 Mon Sep 17 00:00:00 2001 From: Roland Conybeare Date: Fri, 15 Mar 2024 21:16:08 -0400 Subject: [PATCH 31/37] workflow: + xo-pyreactor (wip - broken) --- .github/workflows/main.yml | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 03e17a9c..17201d86 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -486,6 +486,41 @@ jobs: # ---------------------------------------------------------------- + - name: clone xo-pyreactor + uses: actions/checkout@v3 + with: + repository: Rconybea/xo-pyreactor + path: repo/xo-pyreactor + + - name: build xo-pyreactor + run: | + XONAME=xo-pyreactor + XOSRC=repo/${XONAME} + BUILDDIR=${{github.workspace}}/build_${XONAME} + PREFIX=${{github.workspace}}/local + + echo "::group::repo dir tree" + tree -L 2 repo + echo "::endgroup" + + echo "::group::configure ${XONAME}" + cmake -B ${BUILDDIR} -DCMAKE_INSTALL_PREFIX=${PREFIX} ${XOSRC} + echo "::endgroup" + + echo "::group::compile ${XONAME}" + cmake --build ${BUILDDIR} --config ${{env.BUILD_TYPE}} -j + echo "::endgroup" + + echo "::group::local install ${XONAME}" + cmake --install ${BUILDDIR} + echo "::endgroup" + + echo "::group::local dir tree" + tree -L 3 ${PREFIX} + echo "::endgroup" + + # ---------------------------------------------------------------- + - name: Configure self (pysimulator) # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make. # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type From 15f42c083a71d73ff6b7647cdabe1bf344928f23 Mon Sep 17 00:00:00 2001 From: Roland Conybeare Date: Fri, 15 Mar 2024 21:19:33 -0400 Subject: [PATCH 32/37] workflow: + xo-pyprintjson (wip - broken) --- .github/workflows/main.yml | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 17201d86..e125db88 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -486,6 +486,41 @@ jobs: # ---------------------------------------------------------------- + - name: clone xo-pyprintjson + uses: actions/checkout@v3 + with: + repository: Rconybea/xo-pyprintjson + path: repo/xo-pyprintjson + + - name: build xo-pyprintjson + run: | + XONAME=xo-pyprintjson + XOSRC=repo/${XONAME} + BUILDDIR=${{github.workspace}}/build_${XONAME} + PREFIX=${{github.workspace}}/local + + echo "::group::repo dir tree" + tree -L 2 repo + echo "::endgroup" + + echo "::group::configure ${XONAME}" + cmake -B ${BUILDDIR} -DCMAKE_INSTALL_PREFIX=${PREFIX} ${XOSRC} + echo "::endgroup" + + echo "::group::compile ${XONAME}" + cmake --build ${BUILDDIR} --config ${{env.BUILD_TYPE}} -j + echo "::endgroup" + + echo "::group::local install ${XONAME}" + cmake --install ${BUILDDIR} + echo "::endgroup" + + echo "::group::local dir tree" + tree -L 3 ${PREFIX} + echo "::endgroup" + + # ---------------------------------------------------------------- + - name: clone xo-pyreactor uses: actions/checkout@v3 with: From 209f2be30432aceb666b0d14862d4b9e480ac9c9 Mon Sep 17 00:00:00 2001 From: Roland Conybeare Date: Fri, 15 Mar 2024 21:22:35 -0400 Subject: [PATCH 33/37] workflow: + xo-pyreflect (wip - broken) --- .github/workflows/main.yml | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e125db88..2c07e63a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -521,6 +521,41 @@ jobs: # ---------------------------------------------------------------- + - name: clone xo-pyreflect + uses: actions/checkout@v3 + with: + repository: Rconybea/xo-pyreflect + path: repo/xo-pyreflect + + - name: build xo-pyreflect + run: | + XONAME=xo-pyreflect + XOSRC=repo/${XONAME} + BUILDDIR=${{github.workspace}}/build_${XONAME} + PREFIX=${{github.workspace}}/local + + echo "::group::repo dir tree" + tree -L 2 repo + echo "::endgroup" + + echo "::group::configure ${XONAME}" + cmake -B ${BUILDDIR} -DCMAKE_INSTALL_PREFIX=${PREFIX} ${XOSRC} + echo "::endgroup" + + echo "::group::compile ${XONAME}" + cmake --build ${BUILDDIR} --config ${{env.BUILD_TYPE}} -j + echo "::endgroup" + + echo "::group::local install ${XONAME}" + cmake --install ${BUILDDIR} + echo "::endgroup" + + echo "::group::local dir tree" + tree -L 3 ${PREFIX} + echo "::endgroup" + + # ---------------------------------------------------------------- + - name: clone xo-pyreactor uses: actions/checkout@v3 with: From 692078e1a0878d34bb5bdbea9ed57f5e98b87315 Mon Sep 17 00:00:00 2001 From: Roland Conybeare Date: Fri, 15 Mar 2024 21:25:56 -0400 Subject: [PATCH 34/37] workflow: need xo-pyreflect before xo-pyprintjson (wip - broken) --- .github/workflows/main.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2c07e63a..6cf1b768 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -486,15 +486,15 @@ jobs: # ---------------------------------------------------------------- - - name: clone xo-pyprintjson + - name: clone xo-pyreflect uses: actions/checkout@v3 with: - repository: Rconybea/xo-pyprintjson - path: repo/xo-pyprintjson + repository: Rconybea/xo-pyreflect + path: repo/xo-pyreflect - - name: build xo-pyprintjson + - name: build xo-pyreflect run: | - XONAME=xo-pyprintjson + XONAME=xo-pyreflect XOSRC=repo/${XONAME} BUILDDIR=${{github.workspace}}/build_${XONAME} PREFIX=${{github.workspace}}/local @@ -521,15 +521,15 @@ jobs: # ---------------------------------------------------------------- - - name: clone xo-pyreflect + - name: clone xo-pyprintjson uses: actions/checkout@v3 with: - repository: Rconybea/xo-pyreflect - path: repo/xo-pyreflect + repository: Rconybea/xo-pyprintjson + path: repo/xo-pyprintjson - - name: build xo-pyreflect + - name: build xo-pyprintjson run: | - XONAME=xo-pyreflect + XONAME=xo-pyprintjson XOSRC=repo/${XONAME} BUILDDIR=${{github.workspace}}/build_${XONAME} PREFIX=${{github.workspace}}/local From 66abd390bd81607e06298f9581e2898cc6f5e4f2 Mon Sep 17 00:00:00 2001 From: Roland Conybeare Date: Fri, 15 Mar 2024 21:34:20 -0400 Subject: [PATCH 35/37] workflow: streamline xo-pysimulator build step --- .github/workflows/main.yml | 31 ++++++++++++++++++++++--------- 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6cf1b768..621046c5 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -594,14 +594,27 @@ jobs: - name: Configure self (pysimulator) # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make. # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type - run: cmake -B ${{github.workspace}}/build_pysimulator -DCMAKE_MODULE_PATH=${{github.workspace}}/local/share/cmake -DCMAKE_PREFIX_PATH=${{github.workspace}}/local -DCMAKE_INSTALL_PREFIX=${{github.workspace}}/local -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} + run: | + XONAME=xo-pysimulator + BUILDDIR=${{github.workspace}}/build_${XONAME} + PREFIX=${{github.workspace}}/local - - name: Build self (pysimulator) - # Build your program with the given configuration - run: cmake --build ${{github.workspace}}/build_pysimulator --config ${{env.BUILD_TYPE}} + echo "::group::repo dir tree" + tree -L 2 repo + echo "::endgroup" - - name: Test self (pysimulator) - working-directory: ${{github.workspace}}/build_pysimulator - # Execute tests defined by the CMake configuration. - # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail - run: ctest -C ${{env.BUILD_TYPE}} + echo "::group::configure ${XONAME}" + cmake -B ${BUILDDIR} -DCMAKE_MODULE_PATH=${PREFIX}/share/cmake -DCMAKE_PREFIX_PATH=${PREFIX} -DCMAKE_INSTALL_PREFIX=${PREFIX} -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} + echo "::endgroup" + + echo "::group::compile ${XONAME}" + cmake --build ${BUILDDIR} --config ${{env.BUILD_TYPE}} + echo "::endgroup" + + echo "::group::local dir tree" + tree -L 3 ${PREFIX} + echo "::endgroup" + + # Execute tests defined by the CMake configuration. + # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail + (cd ${BUILDDIR} && ctest -C ${{env.BUILD_TYPE}}) From 31a544dd03e27a07c10a45f2ac654478003df6c2 Mon Sep 17 00:00:00 2001 From: Roland Conybeare Date: Sat, 14 Sep 2024 14:13:06 -0500 Subject: [PATCH 36/37] xo-pysimulator: build: update to latest xo-cmake macros --- CMakeLists.txt | 23 +++------------------- cmake/xo-bootstrap-macros.cmake | 35 +++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 20 deletions(-) create mode 100644 cmake/xo-bootstrap-macros.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index 25398891..03088e39 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,25 +3,11 @@ cmake_minimum_required(VERSION 3.10) project(xo_pysimulator VERSION 0.1) -enable_language(CXX) -# common XO cmake macros (see https://github.com:rconybea/xo-cmake.git) -include(xo_macros/xo-project-macros) +include(GNUInstallDirs) +include(cmake/xo-bootstrap-macros.cmake) -# ---------------------------------------------------------------- -# unit test setup - -enable_testing() -# activate code coverage for all executables + libraries (when configured with -DCODE_COVERAGE=ON) -add_code_coverage() -# 1. assuming that /nix/store/ prefixes .hpp files belonging to gcc, catch2 etc. -# we're not interested in code coverage for these sources. -# 2. exclude the utest/ subdir, we don't need coverage on the unit tests themselves; -# rather, want coverage on the code that the unit tests exercise. -# -# NOTE: this seems to work only with the 'ccov-all' target. In particular, doesn't seem to do anything with the 'ccov' target -# -add_code_coverage_all_targets(EXCLUDE /nix/store/* ${PROJECT_SOURCE_DIR}/utest/* ${PROJECT_BINARY_DIR}/local/* ${PROJECT_SOURCE_DIR}/repo/*) +xo_cxx_toplevel_options3() # ---------------------------------------------------------------- # c++ settings (usually temporary) @@ -29,8 +15,6 @@ add_code_coverage_all_targets(EXCLUDE /nix/store/* ${PROJECT_SOURCE_DIR}/utest/* set(PROJECT_CXX_FLAGS "") add_definitions(${PROJECT_CXX_FLAGS}) -xo_toplevel_compile_options() - # ---------------------------------------------------------------- # sources @@ -41,4 +25,3 @@ add_subdirectory(src/pysimulator) # provide find_package() support xo_export_cmake_config(${PROJECT_NAME} ${PROJECT_VERSION} ${PROJECT_NAME}Targets) - diff --git a/cmake/xo-bootstrap-macros.cmake b/cmake/xo-bootstrap-macros.cmake new file mode 100644 index 00000000..aba31169 --- /dev/null +++ b/cmake/xo-bootstrap-macros.cmake @@ -0,0 +1,35 @@ +# ---------------------------------------------------------------- +# for example: +# $ PREFIX=/usr/local # for example +# $ cmake -DCMAKE_MODULE_PATH=prefix -DCMAKE_INSTALL_PREFIX=$PREFIX -B .build +# +# will get +# CMAKE_MODULE_PATH +# from xo-cmake-config --cmake-module-path +# +# and expect .cmake macros in +# CMAKE_MODULE_PATH/xo_macros/xo_cxx.cmake +# ---------------------------------------------------------------- + +find_program(XO_CMAKE_CONFIG_EXECUTABLE NAMES xo-cmake-config REQUIRED) + +if ("${XO_CMAKE_CONFIG_EXECUTABLE}" STREQUAL "XO_CMAKE_CONFIG_EXECUTABLE-NOT_FOUND") + message(FATAL "could not find xo-cmake-config executable") +endif() + +message(STATUS "XO_CMAKE_CONFIG_EXECUTABLE=${XO_CMAKE_CONFIG_EXECUTABLE}") + +if (NOT XO_SUBMODULE_BUILD) + if (("${CMAKE_MODULE_PATH}" STREQUAL "") OR ("${CMAKE_MODULE_PATH}" STREQUAL prefix)) + # default to typical install location for xo-project-macros + execute_process(COMMAND ${XO_CMAKE_CONFIG_EXECUTABLE} --cmake-module-path OUTPUT_VARIABLE CMAKE_MODULE_PATH) + message(STATUS "CMAKE_MODULE_PATH=${CMAKE_MODULE_PATH}") + endif() +endif() + +# needs to have been installed somewhere on CMAKE_MODULE_PATH, +# (e.g. from xo-cmake with the same value for CMAKE_INSTALL_PREFIX) +# +include(xo_macros/xo_cxx) + +xo_cxx_bootstrap_message() From f94005141181b8458cf1b1b2979a3a2cda04a1df Mon Sep 17 00:00:00 2001 From: Roland Conybeare Date: Thu, 8 May 2025 23:55:33 -0500 Subject: [PATCH 37/37] xo-pysimulator: cmake py2py dep fixes --- src/pysimulator/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pysimulator/CMakeLists.txt b/src/pysimulator/CMakeLists.txt index 541c3378..08616537 100644 --- a/src/pysimulator/CMakeLists.txt +++ b/src/pysimulator/CMakeLists.txt @@ -4,6 +4,6 @@ set(SELF_LIB xo_pysimulator) set(SELF_SRCS pysimulator.cpp) xo_pybind11_library(${SELF_LIB} ${PROJECT_NAME}Targets ${SELF_SRCS}) -xo_pybind11_dependency(${SELF_LIB} xo_pyreactor) +xo_pybind11_header_dependency(${SELF_LIB} xo_pyreactor) xo_pybind11_dependency(${SELF_LIB} simulator) -xo_pybind11_dependency(${SELF_LIB} xo_pyutil) +xo_pybind11_header_dependency(${SELF_LIB} xo_pyutil)