From fe2e8b6f1ea78bd1922635be9d62db3728bb5b57 Mon Sep 17 00:00:00 2001
From: "Meredith L. Patterson" <mlp@thesmartpolitenerd.com>
Date: Thu, 21 Nov 2013 02:17:17 -0600
Subject: [PATCH] scons test is working, scons and scons examples aren't
---
SConstruct | 8 +++++---
src/SConscript | 3 ++-
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/SConstruct b/SConstruct
index 8a9946d9..be571aee 100644
--- a/SConstruct
+++ b/SConstruct
@@ -87,10 +87,12 @@ env["ENV"].update(x for x in os.environ.items() if x[0].startswith("CCC_"))
Export('env')
-env.SConscript(["src/SConscript"], variant_dir='build/$VARIANT/src')
-env.SConscript(["examples/SConscript"], variant_dir='build/$VARIANT/examples')
+lib = env.SConscript(["src/SConscript"], variant_dir='build/$VARIANT/src')
+Default(lib)
-env.Command('test', 'build/$VARIANT/src/test_suite', 'env LD_LIBRARY_PATH=build/$VARIANT/src $SOURCE')
+env.Alias("examples", env.SConscript(["examples/SConscript"], variant_dir='build/$VARIANT/examples'))
+
+env.Alias("test", env.Command('test', 'build/$VARIANT/src/test_suite', 'env LD_LIBRARY_PATH=build/$VARIANT/src $SOURCE'))
env.Alias("install", "$libpath")
env.Alias("install", "$incpath")
diff --git a/src/SConscript b/src/SConscript
index 216c04d3..a0a8545d 100644
--- a/src/SConscript
+++ b/src/SConscript
@@ -59,6 +59,7 @@ tests = ['t_benchmark.c',
libhammer_shared = env.SharedLibrary('hammer', parsers + backends + misc_hammer_parts)
libhammer_static = env.StaticLibrary('hammer', parsers + backends + misc_hammer_parts)
+Default(libhammer_shared, libhammer_static)
env.Install("$libpath", [libhammer_static, libhammer_shared])
env.Install("$incpath", dist_headers)
@@ -67,7 +68,7 @@ env.Install("$pkgconfigpath", "../../../libhammer.pc")
testenv = env.Clone()
testenv.ParseConfig('pkg-config --cflags --libs glib-2.0')
testenv.Append(LIBS=['hammer'], LIBPATH=['.'])
-testenv.Program('test_suite', tests + ['test_suite.c'])
+test = testenv.Program('test_suite', tests + ['test_suite.c'])
Export("libhammer_static libhammer_shared")
--
GitLab