+ xo-expression

.github/workflows/main-stock-ubuntu.yml

@@ -102,6 +102,11 @@ jobs:
           echo "::group::xo-pyunit build"
           cmake --build .build -- xo-pyunit
 
+          ##############
+
+          echo "::group::xo-expression build"
+          cmake --build .build -- xo-expression
+
           echo "::group::xo build (catch all)"
           cmake --build .build #--verbose
 

CMakeLists.txt

@@ -78,7 +78,7 @@ add_subdirectory(xo-pyreflect)
 add_subdirectory(xo-ratio)
 add_subdirectory(xo-unit)
 add_subdirectory(xo-pyunit)
-#add_subdirectory(xo-expression)
+add_subdirectory(xo-expression)
 #add_subdirectory(xo-pyexpression)
 #add_subdirectory(xo-tokenizer)
 #add_subdirectory(xo-reader)

default.nix

@@ -51,7 +51,8 @@ let
           xo-ratio          = self.callPackage pkgs/xo-ratio.nix          {};
           xo-unit           = self.callPackage pkgs/xo-unit.nix           {};
           xo-pyunit         = self.callPackage pkgs/xo-pyunit.nix         {};
-#          xo-expression     = self.callPackage pkgs/xo-expression.nix     {};
+
+          xo-expression     = self.callPackage pkgs/xo-expression.nix     {};
 #          xo-pyexpression   = self.callPackage pkgs/xo-pyexpression.nix   {};
 #          xo-tokenizer      = self.callPackage pkgs/xo-tokenizer.nix      {};
 #          xo-reader         = self.callPackage pkgs/xo-reader.nix         {};

pkgs/xo-expression.nix

@@ -0,0 +1,21 @@
+{
+  # dependencies
+  stdenv, cmake, catch2,
+
+  xo-cmake, xo-reflect,
+} :
+
+stdenv.mkDerivation (finalattrs:
+  {
+    name = "xo-expression";
+    version = "1.0";
+
+    src = ../xo-expression;
+
+    cmakeFlags = ["-DCMAKE_MODULE_PATH=${xo-cmake}/share/cmake"];
+    doCheck = true;
+    propagatedBuildInputs = [ xo-reflect ];
+    nativeBuildInputs = [ cmake catch2
+                          xo-cmake
+                        ];
+  })

pkgs/xo-userenv.nix

@@ -35,7 +35,8 @@
   xo-pyreflect,
   xo-ratio,
   xo-unit,
-#  xo-pyunit,
+  xo-pyunit,
+
 #  xo-printjson,
 #  xo-pyprintjson,
 #  xo-callback,
@@ -46,7 +47,9 @@
 #  xo-simulator,
 #  xo-pysimulator, xo-distribution, xo-pydistribution, xo-process, xo-pyprocess, xo-statistics, xo-kalmanfilter,
 #  xo-pykalmanfilter, xo-websock, xo-pywebsock, xo-tokenizer,
-#  xo-expression, xo-pyexpression, xo-reader,
+
+  xo-expression,
+  #xo-pyexpression, xo-reader,
 #  xo-jit,
 #  xo-pyjit
 
@@ -71,7 +74,8 @@ buildEnv {
             xo-ratio
             xo-unit
             xo-pyunit
-#            xo-expression
+
+            xo-expression
 #            xo-pyexpression
 #            xo-tokenizer
 #            xo-reader