roland/xo-umbrella2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

nix-build, cmake build: levelling

Browse source
This commit is contained in:
Roland Conybeare 2026-05-25 23:57:31 -04:00
commit e6034adc3b
6 changed files with 15 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CMakeLists.txt
View file

@ -84,6 +84,8 @@ add_subdirectory(xo-reflectutil) # header-only reflect support
add_subdirectory(xo-randomgen) # xoshiro256ss
add_subdirectory(xo-arena) # arena allocator (DArena)
add_subdirectory(xo-facet) # sep iface,data
add_subdirectory(xo-printable2) # experiment w/ facet object model
add_subdirectory(xo-gc) # experiment w/ facet object model
add_subdirectory(xo-allocutil)
add_subdirectory(xo-refcnt)
add_subdirectory(xo-subsys)
@ -96,14 +98,12 @@ add_subdirectory(xo-ratio)
add_subdirectory(xo-unit)
add_subdirectory(xo-pyunit)
add_subdirectory(xo-callback)
add_subdirectory(xo-printable2) # experiment w/ facet object model
add_subdirectory(xo-alloc)
add_subdirectory(xo-alloc2) # experiment w/ facet object model
add_subdirectory(xo-stringtable2) # experiment w/ facet object model
#add_subdirectory(xo-reflect2) # experiment w/ facet object model
add_subdirectory(xo-object)
add_subdirectory(xo-object2) # experiment w/ facet object model
add_subdirectory(xo-gc) # experiment w/ facet object model
add_subdirectory(xo-type) # experiment w/ fomo
add_subdirectory(xo-procedure2) # schematika procedure abstraction + runtime context (fomo)
add_subdirectory(xo-numeric) # experiment w/ facet object model

8
ci.nix
View file

@ -22,19 +22,19 @@ in
xo-facet
xo-printable2
xo-alloc2
xo-refcnt
xo-reflect
xo-stringtable2
xo-object2
xo-gc
xo-allocutil
xo-refcnt
xo-testutil
xo-reflect
xo-ratio
xo-unit
xo-callback
xo-alloc
xo-stringtable2
xo-object
xo-type
xo-object2
xo-procedure2
xo-numeric
xo-ordinaltree

4
pkgs/xo-stringtable2.nix
View file

@ -7,8 +7,6 @@
xo-printable2,
xo-arena,
xo-cmake,
# xo-reflectutil,
# xo-indentlog,
} :
stdenv.mkDerivation (finalattrs:
@ -28,7 +26,5 @@ stdenv.mkDerivation (finalattrs:
xo-alloc2
xo-printable2
xo-arena
# xo-reflectutil
# xo-indentlog
];
})

2
shells.nix
View file

@ -324,6 +324,7 @@ in
arena = pkgs.xo-arena;
facet = pkgs.xo-facet;
alloc2 = pkgs.xo-alloc2;
object2 = pkgs.xo-object2;
gc = pkgs.xo-gc;
allocutil = pkgs.xo-allocutil;
refcnt = pkgs.xo-refcnt;
@ -340,7 +341,6 @@ in
stringtable2 = pkgs.xo-stringtable2;
object = pkgs.xo-object;
type = pkgs.xo-type;
object2 = pkgs.xo-object2;
procedure2 = pkgs.xo-procedure2;
numeric = pkgs.xo-numeric;
ordinaltree = pkgs.xo-ordinaltree;

2
xo-cmake/cmake/xo_macros/xo_cxx.cmake
View file

@ -1855,7 +1855,7 @@ function(xo_add_genfacetimpl)
# dependency (e.g. in a standalone nix build).
#
if(NOT TARGET share_${GF_FACET_PKG})
message(FATAL_ERROR "xo_add_genfacetimpl: share_${GF_FACET_PKG} not available; skipping ${GF_TARGET}")
message(STATUS "xo_add_genfacetimpl: share_${GF_FACET_PKG} not available; skipping ${GF_TARGET}")
return()
endif()
get_target_property(_facet_dir share_${GF_FACET_PKG} path)

16
xo.nix
View file

@ -27,30 +27,30 @@ let
xoPackages = {
xo-cmake = callPackage pkgs/xo-cmake.nix { stdenv = jitStdenv; };
xo-indentlog = callPackage pkgs/xo-indentlog.nix { stdenv = jitStdenv; buildDocs = true; buildExamples = true; };
xo-subsys = callPackage pkgs/xo-subsys.nix { stdenv = jitStdenv; };
xo-flatstring = callPackage pkgs/xo-flatstring.nix { stdenv = jitStdenv; buildDocs = true; buildExamples = true; };
xo-randomgen = callPackage pkgs/xo-randomgen.nix { stdenv = jitStdenv; buildExamples = true; };
xo-reflectutil = callPackage pkgs/xo-reflectutil.nix { stdenv = jitStdenv; };
xo-arena = callPackage pkgs/xo-arena.nix { stdenv = jitStdenv; buildDocs = true; };
xo-facet = callPackage pkgs/xo-facet.nix { stdenv = jitStdenv; };
xo-printable2 = callPackage pkgs/xo-printable2.nix { stdenv = jitStdenv; };
xo-alloc2 = callPackage pkgs/xo-alloc2.nix { stdenv = jitStdenv; buildDocs = true; };
xo-allocutil = callPackage pkgs/xo-allocutil.nix { stdenv = jitStdenv; };
xo-refcnt = callPackage pkgs/xo-refcnt.nix { stdenv = jitStdenv; };
xo-subsys = callPackage pkgs/xo-subsys.nix { stdenv = jitStdenv; };
xo-testutil = callPackage pkgs/xo-testutil.nix { stdenv = jitStdenv; };
xo-flatstring = callPackage pkgs/xo-flatstring.nix { stdenv = jitStdenv; buildDocs = true; buildExamples = true; };
xo-pyutil = callPackage pkgs/xo-pyutil.nix { stdenv = jitStdenv; };
xo-reflect = callPackage pkgs/xo-reflect.nix { stdenv = jitStdenv; };
xo-stringtable2 = callPackage pkgs/xo-stringtable2.nix { stdenv = jitStdenv; };
xo-object2 = callPackage pkgs/xo-object2.nix { stdenv = jitStdenv; };
xo-gc = callPackage pkgs/xo-gc.nix { stdenv = jitStdenv; buildDocs = true; };
xo-allocutil = callPackage pkgs/xo-allocutil.nix { stdenv = jitStdenv; };
xo-testutil = callPackage pkgs/xo-testutil.nix { stdenv = jitStdenv; };
xo-pyutil = callPackage pkgs/xo-pyutil.nix { stdenv = jitStdenv; };
xo-pyreflect = callPackage pkgs/xo-pyreflect.nix { stdenv = jitStdenv; };
xo-ratio = callPackage pkgs/xo-ratio.nix { stdenv = jitStdenv; buildDocs = true; buildExamples = true; };
xo-unit = callPackage pkgs/xo-unit.nix { stdenv = jitStdenv; buildDocs = true; buildExamples = true; };
xo-pyunit = callPackage pkgs/xo-pyunit.nix { stdenv = jitStdenv; };
xo-callback = callPackage pkgs/xo-callback.nix { stdenv = jitStdenv; };
xo-alloc = callPackage pkgs/xo-alloc.nix { stdenv = jitStdenv; buildDocs = true; };
xo-stringtable2 = callPackage pkgs/xo-stringtable2.nix { stdenv = jitStdenv; };
xo-gc = callPackage pkgs/xo-gc.nix { stdenv = jitStdenv; buildDocs = true; };
xo-object = callPackage pkgs/xo-object.nix { stdenv = jitStdenv; };
xo-type = callPackage pkgs/xo-type.nix { stdenv = jitStdenv; };
xo-object2 = callPackage pkgs/xo-object2.nix { stdenv = jitStdenv; };
xo-procedure2 = callPackage pkgs/xo-procedure2.nix { stdenv = jitStdenv; };
xo-numeric = callPackage pkgs/xo-numeric.nix { stdenv = jitStdenv; };
xo-ordinaltree = callPackage pkgs/xo-ordinaltree.nix { stdenv = jitStdenv; };