From c0549d71b2109f10c1238db8b22362e7826ba61b Mon Sep 17 00:00:00 2001 From: "Claudius \"keldu\" Holeksa" Date: Sun, 5 Jul 2026 15:59:23 +0200 Subject: Just rename from lib to modules --- lib/heterogenous/.nix/derivation.nix | 41 -------------------- lib/heterogenous/SConstruct | 75 ------------------------------------ lib/heterogenous/c++/SConscript | 27 ------------- lib/heterogenous/c++/common.hpp | 12 ------ lib/heterogenous/tests/SConscript | 32 --------------- 5 files changed, 187 deletions(-) delete mode 100644 lib/heterogenous/.nix/derivation.nix delete mode 100644 lib/heterogenous/SConstruct delete mode 100644 lib/heterogenous/c++/SConscript delete mode 100644 lib/heterogenous/c++/common.hpp delete mode 100644 lib/heterogenous/tests/SConscript (limited to 'lib/heterogenous') diff --git a/lib/heterogenous/.nix/derivation.nix b/lib/heterogenous/.nix/derivation.nix deleted file mode 100644 index 3686e21..0000000 --- a/lib/heterogenous/.nix/derivation.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ lib -, stdenv -, scons -, clang-tools -, pname -, version -, forstio -, kel-lbm -, adaptive-cpp -}: - -stdenv.mkDerivation { - pname = "${pname}-heterogenous"; - inherit version; - src = ./..; - - nativeBuildInputs = [ - scons - clang-tools - ]; - - buildInputs = [ - forstio.core - forstio.async - forstio.codec - forstio.codec-unit - forstio.codec-json - forstio.remote - kel-lbm.core - ]; - - doCheck = true; - checkPhase = '' - scons test - ./bin/tests - ''; - - preferLocalBuild = true; - - outputs = [ "out" "dev" ]; -} diff --git a/lib/heterogenous/SConstruct b/lib/heterogenous/SConstruct deleted file mode 100644 index 8b3ab01..0000000 --- a/lib/heterogenous/SConstruct +++ /dev/null @@ -1,75 +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-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/lib/heterogenous/c++/SConscript b/lib/heterogenous/c++/SConscript deleted file mode 100644 index b66e979..0000000 --- a/lib/heterogenous/c++/SConscript +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/false - -import os -import os.path -import glob - - -Import('env') - -dir_path = Dir('.').abspath - -# Environment for base library -hetero_env = env.Clone(); - -hetero_env.sources = sorted(glob.glob(dir_path + "/*.cpp")); -hetero_env.headers = sorted(glob.glob(dir_path + "/*.hpp")); - -env.sources += hetero_env.sources; -env.headers += hetero_env.headers; - -## Static lib -objects = [] -hetero_env.add_source_files(objects, hetero_env.sources, shared=False); -env.library_static = hetero_env.StaticLibrary('#build/kel-lbm-hetero', [objects]); - -env.Install('$prefix/lib/', env.library_static); -env.Install('$prefix/include/kel/lbm/hetero/', hetero_env.headers); diff --git a/lib/heterogenous/c++/common.hpp b/lib/heterogenous/c++/common.hpp deleted file mode 100644 index 789c876..0000000 --- a/lib/heterogenous/c++/common.hpp +++ /dev/null @@ -1,12 +0,0 @@ -#pragma once - -#include - -namespace kel { -namespace lbm { -template -class super_block { -}; - -} -} diff --git a/lib/heterogenous/tests/SConscript b/lib/heterogenous/tests/SConscript deleted file mode 100644 index d1b381e..0000000 --- a/lib/heterogenous/tests/SConscript +++ /dev/null @@ -1,32 +0,0 @@ -#!/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']; -- cgit v1.2.3