5 files changed, 177 insertions, 0 deletions
diff --git a/modules/util/.nix/derivation.nix b/modules/util/.nix/derivation.nix
new file mode 100644
index 0000000..8ec1bb8
--- /dev/null
+++ b/modules/util/.nix/derivation.nix
@@ -0,0 +1,35 @@
+{ lib
+, stdenv
+, scons
+, clang-tools
+, version
+, forstio
+}:
+
+let
+
+in stdenv.mkDerivation {
+  pname = "forstio-util";
+  inherit version;
+  src = ./..;
+
+  enableParallelBuilding = true;
+
+  nativeBuildInputs = [
+    scons
+    clang-tools
+  ];
+
+  buildInputs = [
+		forstio.core
+		forstio.codec
+ ];
+
+ doCheck = true;
+ checkPhase = ''
+   scons test
+	./bin/tests
+ '';
+
+  outputs = ["out" "dev"];
+}
diff --git a/modules/util/SConstruct b/modules/util/SConstruct
new file mode 100644
index 0000000..f71db5a
--- /dev/null
+++ b/modules/util/SConstruct
@@ -0,0 +1,67 @@
+#!/usr/bin/env python3
+
+import sys
+import os
+import os.path
+import glob
+import re
+
+
+if sys.version_info < (3,):
+    def isbasestring(s):
+        return isinstance(s,basestring)
+else:
+    def isbasestring(s):
+        return isinstance(s, (str,bytes))
+
+def add_kel_source_files(self, sources, filetype, lib_env=None, shared=False, target_post=""):
+
+    if isbasestring(filetype):
+        dir_path = self.Dir('.').abspath
+        filetype = sorted(glob.glob(dir_path+"/"+filetype))
+
+    for path in filetype:
+        target_name = re.sub( r'(.*?)(\.cpp|\.c\+\+)', r'\1' + target_post, path )
+        if shared:
+            target_name+='.os'
+            sources.append( self.SharedObject( target=target_name, source=path ) )
+        else:
+            target_name+='.o'
+            sources.append( self.StaticObject( target=target_name, source=path ) )
+    pass
+
+def isAbsolutePath(key, dirname, env):
+	assert os.path.isabs(dirname), "%r must have absolute path syntax" % (key,)
+
+env_vars = Variables(
+	args=ARGUMENTS
+)
+
+env_vars.Add('prefix',
+	help='Installation target location of build results and headers',
+	default='/usr/local/',
+	validator=isAbsolutePath
+)
+
+env=Environment(ENV=os.environ, variables=env_vars, CPPPATH=[],
+    CPPDEFINES=['SAW_UNIX'],
+    CXXFLAGS=['-std=c++20','-g','-Wall','-Wextra'],
+    LIBS=['forstio-core'])
+env.__class__.add_source_files = add_kel_source_files
+env.Tool('compilation_db');
+env.cdb = env.CompilationDatabase('compile_commands.json');
+
+env.objects = [];
+env.sources = [];
+env.headers = [];
+env.targets = [];
+
+Export('env')
+SConscript('c++/SConscript')
+SConscript('tests/SConscript')
+
+env.Alias('cdb', env.cdb);
+env.Alias('all', [env.targets]);
+env.Default('all');
+
+env.Alias('install', '$prefix')
diff --git a/modules/util/c++/SConscript b/modules/util/c++/SConscript
new file mode 100644
index 0000000..e2d7ef0
--- /dev/null
+++ b/modules/util/c++/SConscript
@@ -0,0 +1,38 @@
+#!/bin/false
+
+import os
+import os.path
+import glob
+
+
+Import('env')
+
+dir_path = Dir('.').abspath
+
+# Environment for base library
+util_env = env.Clone();
+
+util_env.sources = sorted(glob.glob(dir_path + "/*.cpp"))
+util_env.headers = sorted(glob.glob(dir_path + "/*.hpp"))
+
+env.sources += util_env.sources;
+env.headers += util_env.headers;
+
+## Shared lib
+#objects_shared = []
+#util_env.add_source_files(objects_shared, util_env.sources, shared=True);
+#env.library_shared = util_env.SharedLibrary('#build/forstio-util', [objects_shared]);
+
+## Static lib
+#objects_static = []
+#util_env.add_source_files(objects_static, util_env.sources, shared=False);
+#env.library_static = util_env.StaticLibrary('#build/forstio-util', [objects_static]);
+
+# Set Alias
+env.Alias('library_util', [env.library_shared, env.library_static]);
+
+env.targets += ['library_util'];
+
+# Install
+env.Install('$prefix/lib/', [env.library_shared, env.library_static]);
+env.Install('$prefix/include/forstio/util/', [util_env.headers]);
diff --git a/modules/util/tests/SConscript b/modules/util/tests/SConscript
new file mode 100644
index 0000000..f8ffc92
--- /dev/null
+++ b/modules/util/tests/SConscript
@@ -0,0 +1,31 @@
+#!/bin/false
+
+import os
+import os.path
+import glob
+
+
+Import('env')
+
+dir_path = Dir('.').abspath
+
+# Environment for base library
+test_cases_env = env.Clone();
+
+test_cases_env.Append(LIBS=['forstio-test']);
+
+test_cases_env.sources = sorted(glob.glob(dir_path + "/*.cpp"))
+test_cases_env.headers = sorted(glob.glob(dir_path + "/*.hpp"))
+
+env.sources += test_cases_env.sources;
+env.headers += test_cases_env.headers;
+
+objects_static = []
+test_cases_env.add_source_files(objects_static, test_cases_env.sources, shared=False);
+test_cases_env.program = test_cases_env.Program('#bin/tests', [objects_static, env.library_static]);
+
+# Set Alias
+env.Alias('test', test_cases_env.program);
+env.Alias('check', test_cases_env.program);
+
+env.targets += ['test','check'];
diff --git a/modules/util/tests/base.cpp b/modules/util/tests/base.cpp
new file mode 100644
index 0000000..f975c76
--- /dev/null
+++ b/modules/util/tests/base.cpp
@@ -0,0 +1,6 @@
+#include <forstio/test/suite.hpp>
+
+#include <forstio/templates.hpp>
+
+namespace {
+}