mirror of
https://github.com/Xahau/xahaud.git
synced 2025-12-06 17:27:52 +00:00
Tidy up build scripts:
* Relax the boost -mt link requirement for Debian * Tidy up scons output, reduce verbosity, add color
This commit is contained in:
committed by
Vinnie Falco
parent
c2a16ddbab
commit
66b5f75142
20
SConstruct
20
SConstruct
@@ -113,7 +113,7 @@ BOOST_LIBS = [
|
||||
# included the platform can be whitelisted.
|
||||
# if FreeBSD or Ubuntu or Archlinux:
|
||||
|
||||
if not (USING_CLANG and Linux) and (FreeBSD or Ubuntu or Archlinux or OSX):
|
||||
if not (USING_CLANG and Linux) and (FreeBSD or Ubuntu or Debian or Archlinux or OSX):
|
||||
# non-mt libs do link with pthreads.
|
||||
env.Append(
|
||||
LIBS = BOOST_LIBS
|
||||
@@ -133,6 +133,24 @@ else:
|
||||
LIBS = [l + '-mt' for l in BOOST_LIBS]
|
||||
)
|
||||
|
||||
#-------------------------------------------------------------------------------
|
||||
# Change the way that information is printed so that we can get a nice
|
||||
# output
|
||||
#-------------------------------------------------------------------------------
|
||||
|
||||
def print_cmd_line(s, target, src, env):
|
||||
Tgt = (''.join([str(x) for x in target]))
|
||||
|
||||
if ('build/rippled' == Tgt):
|
||||
sys.stdout.write("Linking '\033[94m%s\033[0m'...\n" % Tgt)
|
||||
elif ('tags' == Tgt):
|
||||
sys.stdout.write("Generating tags...\n")
|
||||
else:
|
||||
sys.stdout.write("Compiling '\033[94m%s\033[0m'...\n" % \
|
||||
(' and '.join([str(x) for x in src])))
|
||||
|
||||
env['PRINT_CMD_LINE_FUNC'] = print_cmd_line
|
||||
|
||||
#-------------------------------------------------------------------------------
|
||||
#
|
||||
# VFALCO NOTE Clean area.
|
||||
|
||||
Reference in New Issue
Block a user