justin/jsix
1
1
Fork 0
mirror of https://github.com/justinian/jsix.git synced 2025-12-10 00:14:32 -08:00
Code Issues Packages Projects Releases Wiki Activity

Correct the name of 'modules' folder to 'libraries'

Browse Source
This commit is contained in:
Justin C. Miller
2018-05-22 10:15:43 -07:00
parent bc26d7d01d
commit 57829e1b79
13 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
src/modules/kutil/assert.cpp → src/libraries/kutil/assert.cpp
View File

0
src/modules/kutil/assert.h → src/libraries/kutil/assert.h
View File

0
src/modules/kutil/coord.h → src/libraries/kutil/coord.h
View File

0
src/modules/kutil/enum_bitfields.h → src/libraries/kutil/enum_bitfields.h
View File

0
src/modules/kutil/guid.h → src/libraries/kutil/guid.h
View File

0
src/modules/kutil/memory.cpp → src/libraries/kutil/memory.cpp
View File

0
src/modules/kutil/memory.h → src/libraries/kutil/memory.h
View File

0
src/modules/kutil/memory_manager.cpp → src/libraries/kutil/memory_manager.cpp
View File

0
src/modules/kutil/memory_manager.h → src/libraries/kutil/memory_manager.h
View File

0
src/modules/kutil/misc.h → src/libraries/kutil/misc.h
View File

0
src/modules/kutil/vector.h → src/libraries/kutil/vector.h
View File

0
src/modules/kutil/wscript → src/libraries/kutil/wscript
View File

22
wscript
View File

@@ -65,15 +65,15 @@ def configure(ctx):
ctx.env.append_value('INCLUDES', [ ctx.env.append_value('INCLUDES', [
join(ctx.path.abspath(), "src", "include"), join(ctx.path.abspath(), "src", "include"),
join(ctx.path.abspath(), "src", "include", ctx.env.POPCORN_ARCH), join(ctx.path.abspath(), "src", "include", ctx.env.POPCORN_ARCH),
join(ctx.path.abspath(), "src", "modules"), join(ctx.path.abspath(), "src", "libraries"),
]) ])
modules = [] libraries = []
mod_root = join("src", "modules") mod_root = join("src", "libraries")
for module in os.listdir(mod_root): for module in os.listdir(mod_root):
mod_path = join(mod_root, module) mod_path = join(mod_root, module)
if exists(join(mod_path, "wscript")): if exists(join(mod_path, "wscript")):
modules.append(mod_path) libraries.append(mod_path)
baseflags = [ baseflags = [
'-nostdlib', '-nostdlib',
@@ -164,8 +164,8 @@ def configure(ctx):
ctx.env.append_value('CFLAGS', ['-mcmodel=large']) ctx.env.append_value('CFLAGS', ['-mcmodel=large'])
ctx.env.append_value('CXXFLAGS', ['-mcmodel=large']) ctx.env.append_value('CXXFLAGS', ['-mcmodel=large'])
ctx.env.MODULES = modules ctx.env.LIBRARIES = libraries
for mod_path in ctx.env.MODULES: for mod_path in ctx.env.LIBRARIES:
ctx.recurse(mod_path) ctx.recurse(mod_path)
ctx.recurse(join("src", "kernel")) ctx.recurse(join("src", "kernel"))
@@ -178,14 +178,14 @@ def configure(ctx):
ctx.env.append_value('INCLUDES', [ ctx.env.append_value('INCLUDES', [
join(ctx.path.abspath(), "src", "include"), 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.CXXFLAGS = ['-g', '-std=c++14', '-fno-rtti']
ctx.env.LINKFLAGS = ['-g'] ctx.env.LINKFLAGS = ['-g']
ctx.env.MODULES = modules ctx.env.LIBRARIES = libraries
for mod_path in ctx.env.MODULES: for mod_path in ctx.env.LIBRARIES:
ctx.recurse(mod_path) ctx.recurse(mod_path)
ctx.recurse(join("src", "tests")) ctx.recurse(join("src", "tests"))
@@ -198,7 +198,7 @@ def build(bld):
bld.recurse(join("src", "boot")) bld.recurse(join("src", "boot"))
bld.env = bld.all_envs['kernel'] 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(mod_path)
bld.recurse(join("src", "kernel")) bld.recurse(join("src", "kernel"))
@@ -277,7 +277,7 @@ def build(bld):
bld.add_to_group(copy_part) bld.add_to_group(copy_part)
elif bld.variant == 'tests': elif bld.variant == 'tests':
for mod_path in bld.env.MODULES: for mod_path in bld.env.LIBRARIES:
bld.recurse(mod_path) bld.recurse(mod_path)
bld.recurse(join("src", "tests")) bld.recurse(join("src", "tests"))