diff options
author | Claudius 'keldu' Holeksa <mail@keldu.de> | 2024-08-15 14:21:43 +0200 |
---|---|---|
committer | Claudius 'keldu' Holeksa <mail@keldu.de> | 2024-08-15 14:21:43 +0200 |
commit | d8fe9dc48b640fc977cd03b483e6fd6b620785ad (patch) | |
tree | 4e3403bdd12d90ae39fd96dac27efe21ac68b428 | |
parent | 1a88c40cad88eab0674a30eff581c96a82d808c7 (diff) |
removing stale files
-rw-r--r-- | default.nix | 2 | ||||
-rw-r--r-- | modules/codec/c++/schema.hpp | 7 | ||||
-rw-r--r-- | modules/io-fs/.nix/derivation.nix | 33 | ||||
-rw-r--r-- | modules/io-fs/SConscript | 38 | ||||
-rw-r--r-- | modules/io-fs/SConstruct | 66 | ||||
-rw-r--r-- | modules/remote-thread/.nix/derivation.nix (renamed from modules/thread/.nix/derivation.nix) | 3 | ||||
-rw-r--r-- | modules/remote-thread/SConstruct (renamed from modules/thread/SConstruct) | 0 | ||||
-rw-r--r-- | modules/remote-thread/c++/SConscript (renamed from modules/thread/c++/SConscript) | 0 | ||||
-rw-r--r-- | modules/remote-thread/c++/remote.hpp (renamed from modules/thread/c++/remote.hpp) | 0 | ||||
-rw-r--r-- | modules/remote-thread/examples/SConscript (renamed from modules/thread/examples/SConscript) | 0 | ||||
-rw-r--r-- | modules/remote-thread/tests/SConscript (renamed from modules/thread/tests/SConscript) | 0 |
11 files changed, 10 insertions, 139 deletions
diff --git a/default.nix b/default.nix index 5ece5b6..84a71b1 100644 --- a/default.nix +++ b/default.nix @@ -81,7 +81,7 @@ in rec { build_examples = "true"; }; - thread = pkgs.callPackage modules/thread/.nix/derivation.nix { + remote-thread = pkgs.callPackage modules/remote-thread/.nix/derivation.nix { inherit version; inherit forstio; inherit stdenv; diff --git a/modules/codec/c++/schema.hpp b/modules/codec/c++/schema.hpp index 7df47b3..3820cf3 100644 --- a/modules/codec/c++/schema.hpp +++ b/modules/codec/c++/schema.hpp @@ -33,6 +33,13 @@ template <typename Schema, string_literal Literal> struct Member { static constexpr string_literal KeyLiteral = Literal; }; +template<typename Key, typename Value> struct Map { + static constexpr string_literal name = "Map"; + + using KeyType = Key; + using ValueType = Value; +}; + template <typename... T> struct Struct { static_assert( always_false<T...>, diff --git a/modules/io-fs/.nix/derivation.nix b/modules/io-fs/.nix/derivation.nix deleted file mode 100644 index c8a4962..0000000 --- a/modules/io-fs/.nix/derivation.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib -, stdenvNoCC -, scons -, clang -, clang-tools -, version -, forstio -}: - -let - -in stdenvNoCC.mkDerivation { - pname = "forstio-io-fs"; - inherit version; - src = ./..; - - enableParallelBuilding = true; - - nativeBuildInputs = [ - scons - clang - clang-tools - ]; - - buildInputs = [ - forstio.core - forstio.async - forstio.codec - forstio.io - ]; - - outputs = ["out" "dev"]; -} diff --git a/modules/io-fs/SConscript b/modules/io-fs/SConscript deleted file mode 100644 index dfc3b76..0000000 --- a/modules/io-fs/SConscript +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/false - -import os -import os.path -import glob - - -Import('env') - -dir_path = Dir('.').abspath - -# Environment for base library -io_env = env.Clone(); - -io_env.sources = sorted(glob.glob(dir_path + "/*.cpp")) -io_env.headers = sorted(glob.glob(dir_path + "/*.hpp")) - -env.sources += io_env.sources; -env.headers += io_env.headers; - -## Shared lib -objects_shared = [] -io_env.add_source_files(objects_shared, io_env.sources, shared=True); -io_env.library_shared = io_env.SharedLibrary('#build/forstio-io-fs', [objects_shared]); - -## Static lib -objects_static = [] -io_env.add_source_files(objects_static, io_env.sources, shared=False); -io_env.library_static = io_env.StaticLibrary('#build/forstio-io-fs', [objects_static]); - -# Set Alias -env.Alias('library_io', [io_env.library_shared, io_env.library_static]); - -env.targets += ['library_io']; - -# Install -env.Install('$prefix/lib/', [io_env.library_shared, io_env.library_static]); -env.Install('$prefix/include/forstio/io/fs/', [io_env.headers]); diff --git a/modules/io-fs/SConstruct b/modules/io-fs/SConstruct deleted file mode 100644 index 4cccf82..0000000 --- a/modules/io-fs/SConstruct +++ /dev/null @@ -1,66 +0,0 @@ -#!/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-async']) -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('SConscript') - -env.Alias('cdb', env.cdb); -env.Alias('all', [env.targets]); -env.Default('all'); - -env.Alias('install', '$prefix') diff --git a/modules/thread/.nix/derivation.nix b/modules/remote-thread/.nix/derivation.nix index 9175d6a..917789a 100644 --- a/modules/thread/.nix/derivation.nix +++ b/modules/remote-thread/.nix/derivation.nix @@ -8,7 +8,7 @@ }: stdenv.mkDerivation { - pname = "forstio-thread"; + pname = "forstio-remote-thread"; inherit version; src = ./..; @@ -25,6 +25,7 @@ stdenv.mkDerivation { forstio.io forstio.codec forstio.io_codec + forstio.remote ]; outputs = [ diff --git a/modules/thread/SConstruct b/modules/remote-thread/SConstruct index fe16748..fe16748 100644 --- a/modules/thread/SConstruct +++ b/modules/remote-thread/SConstruct diff --git a/modules/thread/c++/SConscript b/modules/remote-thread/c++/SConscript index 6194362..6194362 100644 --- a/modules/thread/c++/SConscript +++ b/modules/remote-thread/c++/SConscript diff --git a/modules/thread/c++/remote.hpp b/modules/remote-thread/c++/remote.hpp index 39c64a6..39c64a6 100644 --- a/modules/thread/c++/remote.hpp +++ b/modules/remote-thread/c++/remote.hpp diff --git a/modules/thread/examples/SConscript b/modules/remote-thread/examples/SConscript index df8e0c6..df8e0c6 100644 --- a/modules/thread/examples/SConscript +++ b/modules/remote-thread/examples/SConscript diff --git a/modules/thread/tests/SConscript b/modules/remote-thread/tests/SConscript index f8ffc92..f8ffc92 100644 --- a/modules/thread/tests/SConscript +++ b/modules/remote-thread/tests/SConscript |