CI

.dockerignore

@@ -0,0 +1,3 @@
+*
+!pyproject.toml
+!poetry.lock

.github/workflows/ci.yaml

@@ -0,0 +1,32 @@
+name: "CI run"
+on: [push]
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - name: "Install dependencies"
+        run: sudo apt-get update
+
+      - name: "Install dependencies"
+        run: sudo apt-get install -y curl
+
+      - uses: actions/checkout@v4
+        with:
+          submodules: "true"
+
+      - name: Set up Python 3.11
+        uses: actions/setup-python@v4
+        with:
+          python-version: 3.11
+
+      - name: "Install poetry"
+        run: curl -sSL https://install.python-poetry.org | python3.11 -
+
+      - name: "Install python dependencies"
+        run: poetry install --no-root
+
+      - name: "Build docker image"
+        run: poetry run invoke docker-image
+
+      - name: "Execute docker CI"
+        run: poetry run invoke docker-run

.gitignore

@@ -355,6 +355,7 @@ CMakeLists.txt.user*
 **/*.tmp*
 **/*.bin
 docs/html
+docs_out/
 .xmake
 deps
 

.gitmodules

@@ -1,5 +1,5 @@
-[submodule "toolchain/RE-flex"]
-	path = toolchain/RE-flex
+[submodule "thirdparty/RE-flex"]
+	path = thirdparty/RE-flex
 	url = https://github.com/Genivia/RE-flex.git
 [submodule "thirdparty/immer"]
 	path = thirdparty/immer

CMakeLists.txt

@@ -13,7 +13,7 @@ set(CMAKE_POSITION_INDEPENDENT_CODE TRUE)
 project(haxorg LANGUAGES CXX)
 
 set(BASE "${CMAKE_SOURCE_DIR}")
-message(INFO "CMAKE_SOURCE_DIR = ${CMAKE_SOURCE_DIR}")
+message(STATUS "CMAKE_SOURCE_DIR = ${CMAKE_SOURCE_DIR}")
 set(LLVM_DIR "${BASE}/toolchain/llvm")
 
 set(AUTOGEN_BUILD_DIR "${BASE}/build/autogen")
@@ -75,7 +75,7 @@ endif()
 
 set(DEPS_DIR "${BASE}/thirdparty")
 set(DEPS_BINARY "${CMAKE_BINARY_DIR}/deps")
-message(INFO "Binary directory for dependencies ${DEPS_BINARY}")
+message(STATUS "Binary directory for dependencies ${DEPS_BINARY}")
 
 add_subdirectory("${DEPS_DIR}/yaml-cpp")
 
@@ -104,7 +104,10 @@ add_subdirectory("${DEPS_DIR}/protobuf")
 include("${DEPS_DIR}/protobuf/cmake/protobuf-generate.cmake")
 
 set(JSON_BuildTests OFF CACHE INTERNAL "")
+
 add_subdirectory(thirdparty/json)
+add_subdirectory(thirdparty/mp11)
+add_subdirectory(thirdparty/describe)
 
 include(src/cmake/target_hstd.cmake)
 include(src/cmake/target_codegen.cmake)

docs/Doxyfile

@@ -1044,7 +1044,10 @@ RECURSIVE              = YES
 # run.
 
 EXCLUDE                = deps \
-                         thirdparty
+                         thirdparty \
+                         toolchain \
+                         build \
+                         tests
 
 # The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
 # directories that are symbolic links (a Unix file system feature) are excluded
@@ -1288,7 +1291,7 @@ GENERATE_HTML          = YES
 # The default directory is: html.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-HTML_OUTPUT            = docs/html
+HTML_OUTPUT            = docs_out/html
 
 # The HTML_FILE_EXTENSION tag can be used to specify the file extension for each
 # generated HTML page (for example: .htm, .php, .asp).
@@ -2210,15 +2213,15 @@ MAN_LINKS              = NO
 # captures the structure of the code including all documentation.
 # The default value is: NO.
 
-GENERATE_XML           = NO
+GENERATE_XML           = YES
 
 # The XML_OUTPUT tag is used to specify where the XML pages will be put. If a
 # relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
 # it.
 # The default directory is: xml.
 # This tag requires that the tag GENERATE_XML is set to YES.
 
-XML_OUTPUT             = xml
+XML_OUTPUT             = docs_out/xml
 
 # If the XML_PROGRAMLISTING tag is set to YES, doxygen will dump the program
 # listings (including syntax highlighting and cross-referencing information) to
@@ -2543,7 +2546,7 @@ CLASS_GRAPH            = YES
 # The default value is: YES.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
-COLLABORATION_GRAPH    = YES
+COLLABORATION_GRAPH    = NO
 
 # If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for
 # groups, showing the direct groups dependencies. Explicit enabling a group

pyproject.toml

@@ -11,13 +11,6 @@ beartype = "^0.16.2"
 rich = "^13.5.3"
 betterproto = {extras = ["compiler"], version = "^1.2.5"}
 pytest = "^7.4.2"
-py_textlayout = {path = "./scripts/py_textlayout", develop=true}
-py_exporters = {path = "./scripts/py_exporters", develop=true}
-py_haxorg = {path = "./scripts/py_haxorg", develop=true}
-py_scriptutils = {path = "./scripts/py_scriptutils", develop=true}
-py_codegen = {path = "./scripts/py_codegen", develop=true}
-py_cli = {path = "./scripts/py_cli", develop=true}
-cxx_repository = {path = "./scripts/cxx_repository", develop=true}
 click = "^8.1.7"
 rich-click = "^1.6.1"
 toml = "^0.10.2"
@@ -41,6 +34,16 @@ matplotlib = "^3.8.2"
 compdb = "^0.2.0"
 pytest-cov = "^4.1.0"
 
+[tool.poetry.group.local.dependencies]
+py_textlayout = {path = "./scripts/py_textlayout", develop=true}
+py_exporters = {path = "./scripts/py_exporters", develop=true}
+py_haxorg = {path = "./scripts/py_haxorg", develop=true}
+py_scriptutils = {path = "./scripts/py_scriptutils", develop=true}
+py_codegen = {path = "./scripts/py_codegen", develop=true}
+py_cli = {path = "./scripts/py_cli", develop=true}
+py_repository = {path = "./scripts/py_repository", develop=true}
+cxx_repository = {path = "./scripts/cxx_repository", develop=true}
+
 [tool.poetry.group.dev.dependencies]
 yapf = "^0.40.2"
 sphinx = "^7.2.6"