From 57829e1b79914da8213c9e9c683b5ffd92adea06 Mon Sep 17 00:00:00 2001 From: "Justin C. Miller" Date: Tue, 22 May 2018 10:15:43 -0700 Subject: [PATCH] Correct the name of 'modules' folder to 'libraries' --- src/{modules => libraries}/kutil/assert.cpp | 0 src/{modules => libraries}/kutil/assert.h | 0 src/{modules => libraries}/kutil/coord.h | 0 .../kutil/enum_bitfields.h | 0 src/{modules => libraries}/kutil/guid.h | 0 src/{modules => libraries}/kutil/memory.cpp | 0 src/{modules => libraries}/kutil/memory.h | 0 .../kutil/memory_manager.cpp | 0 .../kutil/memory_manager.h | 0 src/{modules => libraries}/kutil/misc.h | 0 src/{modules => libraries}/kutil/vector.h | 0 src/{modules => libraries}/kutil/wscript | 0 wscript | 22 +++++++++---------- 13 files changed, 11 insertions(+), 11 deletions(-) rename src/{modules => libraries}/kutil/assert.cpp (100%) rename src/{modules => libraries}/kutil/assert.h (100%) rename src/{modules => libraries}/kutil/coord.h (100%) rename src/{modules => libraries}/kutil/enum_bitfields.h (100%) rename src/{modules => libraries}/kutil/guid.h (100%) rename src/{modules => libraries}/kutil/memory.cpp (100%) rename src/{modules => libraries}/kutil/memory.h (100%) rename src/{modules => libraries}/kutil/memory_manager.cpp (100%) rename src/{modules => libraries}/kutil/memory_manager.h (100%) rename src/{modules => libraries}/kutil/misc.h (100%) rename src/{modules => libraries}/kutil/vector.h (100%) rename src/{modules => libraries}/kutil/wscript (100%) diff --git a/src/modules/kutil/assert.cpp b/src/libraries/kutil/assert.cpp similarity index 100% rename from src/modules/kutil/assert.cpp rename to src/libraries/kutil/assert.cpp diff --git a/src/modules/kutil/assert.h b/src/libraries/kutil/assert.h similarity index 100% rename from src/modules/kutil/assert.h rename to src/libraries/kutil/assert.h diff --git a/src/modules/kutil/coord.h b/src/libraries/kutil/coord.h similarity index 100% rename from src/modules/kutil/coord.h rename to src/libraries/kutil/coord.h diff --git a/src/modules/kutil/enum_bitfields.h b/src/libraries/kutil/enum_bitfields.h similarity index 100% rename from src/modules/kutil/enum_bitfields.h rename to src/libraries/kutil/enum_bitfields.h diff --git a/src/modules/kutil/guid.h b/src/libraries/kutil/guid.h similarity index 100% rename from src/modules/kutil/guid.h rename to src/libraries/kutil/guid.h diff --git a/src/modules/kutil/memory.cpp b/src/libraries/kutil/memory.cpp similarity index 100% rename from src/modules/kutil/memory.cpp rename to src/libraries/kutil/memory.cpp diff --git a/src/modules/kutil/memory.h b/src/libraries/kutil/memory.h similarity index 100% rename from src/modules/kutil/memory.h rename to src/libraries/kutil/memory.h diff --git a/src/modules/kutil/memory_manager.cpp b/src/libraries/kutil/memory_manager.cpp similarity index 100% rename from src/modules/kutil/memory_manager.cpp rename to src/libraries/kutil/memory_manager.cpp diff --git a/src/modules/kutil/memory_manager.h b/src/libraries/kutil/memory_manager.h similarity index 100% rename from src/modules/kutil/memory_manager.h rename to src/libraries/kutil/memory_manager.h diff --git a/src/modules/kutil/misc.h b/src/libraries/kutil/misc.h similarity index 100% rename from src/modules/kutil/misc.h rename to src/libraries/kutil/misc.h diff --git a/src/modules/kutil/vector.h b/src/libraries/kutil/vector.h similarity index 100% rename from src/modules/kutil/vector.h rename to src/libraries/kutil/vector.h diff --git a/src/modules/kutil/wscript b/src/libraries/kutil/wscript similarity index 100% rename from src/modules/kutil/wscript rename to src/libraries/kutil/wscript diff --git a/wscript b/wscript index 716ce7d..4c6af59 100644 --- a/wscript +++ b/wscript @@ -65,15 +65,15 @@ def configure(ctx): ctx.env.append_value('INCLUDES', [ join(ctx.path.abspath(), "src", "include"), join(ctx.path.abspath(), "src", "include", ctx.env.POPCORN_ARCH), - join(ctx.path.abspath(), "src", "modules"), + join(ctx.path.abspath(), "src", "libraries"), ]) - modules = [] - mod_root = join("src", "modules") + libraries = [] + mod_root = join("src", "libraries") for module in os.listdir(mod_root): mod_path = join(mod_root, module) if exists(join(mod_path, "wscript")): - modules.append(mod_path) + libraries.append(mod_path) baseflags = [ '-nostdlib', @@ -164,8 +164,8 @@ def configure(ctx): ctx.env.append_value('CFLAGS', ['-mcmodel=large']) ctx.env.append_value('CXXFLAGS', ['-mcmodel=large']) - ctx.env.MODULES = modules - for mod_path in ctx.env.MODULES: + ctx.env.LIBRARIES = libraries + for mod_path in ctx.env.LIBRARIES: ctx.recurse(mod_path) ctx.recurse(join("src", "kernel")) @@ -178,14 +178,14 @@ def configure(ctx): ctx.env.append_value('INCLUDES', [ join(ctx.path.abspath(), "src", "include"), - join(ctx.path.abspath(), "src", "modules"), + join(ctx.path.abspath(), "src", "libraries"), ]) ctx.env.CXXFLAGS = ['-g', '-std=c++14', '-fno-rtti'] ctx.env.LINKFLAGS = ['-g'] - ctx.env.MODULES = modules - for mod_path in ctx.env.MODULES: + ctx.env.LIBRARIES = libraries + for mod_path in ctx.env.LIBRARIES: ctx.recurse(mod_path) ctx.recurse(join("src", "tests")) @@ -198,7 +198,7 @@ def build(bld): bld.recurse(join("src", "boot")) bld.env = bld.all_envs['kernel'] - for mod_path in bld.env.MODULES: + for mod_path in bld.env.LIBRARIES: bld.recurse(mod_path) bld.recurse(join("src", "kernel")) @@ -277,7 +277,7 @@ def build(bld): bld.add_to_group(copy_part) elif bld.variant == 'tests': - for mod_path in bld.env.MODULES: + for mod_path in bld.env.LIBRARIES: bld.recurse(mod_path) bld.recurse(join("src", "tests"))