nix: Fixed dev install and moved folders

10 files changed, 102 insertions, 4 deletions

diff --git a/.nix/derivation.nix b/.nix/derivation.nix
index cf887cd..94f5bb7 100644
--- a/.nix/derivation.nix
+++ b/.nix/derivation.nix
@@ -17,10 +17,7 @@ stdenvNoCC.mkDerivation {
 
   buildInputs = [
     forstio.core
-    forstio.async
-    forstio.io
-    forstio.codec
   ];
 
-  outputs = [ "out" ];
+  outputs = [ "out" "dev" ];
 }
diff --git a/SConstruct b/SConstruct
new file mode 100644
index 0000000..ea16f95
--- /dev/null
+++ b/SConstruct
@@ -0,0 +1,66 @@
+#!/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('src/SConscript')
+
+env.Alias('cdb', env.cdb);
+env.Alias('all', [env.targets]);
+env.Default('all');
+
+env.Alias('install', '$prefix')
diff --git a/src/SConscript b/src/SConscript
new file mode 100644
index 0000000..41f12e1
--- /dev/null
+++ b/src/SConscript
@@ -0,0 +1,35 @@
+#!/bin/false
+
+import os
+import os.path
+import glob
+
+
+Import('env')
+
+dir_path = Dir('.').abspath
+
+# Environment for base library
+core_env = env.Clone();
+
+core_env.sources = sorted(glob.glob(dir_path + "/*.cpp"))
+core_env.headers = sorted(glob.glob(dir_path + "/*.h"))
+core_env.headers += sorted(glob.glob(dir_path + "/distance/*.h"))
+core_env.headers += sorted(glob.glob(dir_path + "/time/*.h"))
+
+env.sources += core_env.sources;
+env.headers += core_env.headers;
+
+## Shared lib
+objects_shared = []
+core_env.add_source_files(objects_shared, core_env.sources, shared=True);
+core_env.library_shared = core_env.SharedLibrary('#build/kel-unit', [objects_shared]);
+
+# Set Alias
+env.Alias('library_core', [core_env.library_shared, core_env.library_static]);
+
+env.targets += ['library_core'];
+
+# Install
+env.Install('$prefix/lib/', [core_env.library_shared, core_env.library_static]);
+env.Install('$prefix/include/kel/unit', [core_env.headers]);
diff --git a/src/kelunit/distance/meter.h b/src/distance/meter.h
index 0d9fb3b..0d9fb3b 100644
--- a/src/kelunit/distance/meter.h
+++ b/src/distance/meter.h
diff --git a/src/kelunit/time/second.h b/src/time/second.h
index 6dca456..6dca456 100644
--- a/src/kelunit/time/second.h
+++ b/src/time/second.h
diff --git a/src/kelunit/unit.h b/src/unit.h
index a8e8320..a8e8320 100644
--- a/src/kelunit/unit.h
+++ b/src/unit.h
diff --git a/src/kelunit/unit.tmpl.h b/src/unit.tmpl.h
index d89e0c1..d89e0c1 100644
--- a/src/kelunit/unit.tmpl.h
+++ b/src/unit.tmpl.h
diff --git a/src/kelunit/unit_cast.h b/src/unit_cast.h
index 8dc2689..8dc2689 100644
--- a/src/kelunit/unit_cast.h
+++ b/src/unit_cast.h
diff --git a/src/kelunit/unit_print.h b/src/unit_print.h
index 0f3cb72..0f3cb72 100644
--- a/src/kelunit/unit_print.h
+++ b/src/unit_print.h
diff --git a/src/kelunit/unit_reduction.h b/src/unit_reduction.h
index d9060d2..d9060d2 100644
--- a/src/kelunit/unit_reduction.h
+++ b/src/unit_reduction.h