This commit is contained in:
jed
2012-06-18 07:27:49 -07:00
parent 2caa4861c8
commit 7a9607492d
3 changed files with 89 additions and 3 deletions

View File

@@ -88,3 +88,87 @@ newcoind = env.Program('newcoind', NEWCOIN_OBJS)
tags = env.CTags('obj/tags', NEWCOIN_SRCS)
Default(newcoind, tags)
#####################
#
# Newcoin - SConstruct
#
import glob
CTAGS = '/usr/bin/exuberant-ctags'
#
# scons tools
#
env = Environment(
tools = ['default', 'protoc']
)
#
# Builder for CTags
#
#ctags = Builder(action = '$CTAGS $CTAGSOPTIONS -f $TARGET $SOURCES')
#env.Append(BUILDERS = { 'CTags' : ctags })
#env.Replace(CTAGS = CTAGS, CTAGSOPTIONS = '--tag-relative')
#
# Put objects files in their own directory.
#
for dir in ['src', 'database', 'json', 'util']:
VariantDir('obj/'+dir, dir, duplicate=0)
# Use openssl
env.ParseConfig('pkg-config --cflags --libs openssl')
env.Append(LIBS = [
'boost_date_time',
'boost_filesystem',
'boost_program_options',
'boost_regex',
'boost_system',
'boost_thread',
'protobuf',
'dl', # dynamic linking
'z'
])
DEBUGFLAGS = ['-g', '-DDEBUG']
BOOSTFLAGS = ['-DBOOST_TEST_DYN_LINK', '-DBOOST_FILESYSTEM_NO_DEPRECATED']
#env.Append(LINKFLAGS = ['-static', '-pthread','-L/home/ubuntu/boost_1_49_0/stage/lib'])
env.Append(LINKFLAGS = ['-rdynamic', '-pthread','-L/home/ubuntu/boost_1_49_0/stage/lib'])
env.Append(CCFLAGS = ['-I/home/ubuntu/boost_1_49_0','-pthread', '-Wall', '-Wno-sign-compare', '-Wno-char-subscripts', '-DSQLITE_THREADSAFE'])
env.Append(CXXFLAGS = ['-O0', '-pthread', '-Wno-invalid-offsetof', '-Wformat']+BOOSTFLAGS+DEBU GFLAGS)
DB_SRCS = glob.glob('database/*.c') + glob.glob('database/*.cpp')
JSON_SRCS = glob.glob('json/*.cpp')
NEWCOIN_SRCS = glob.glob('src/*.cpp')
PROTO_SRCS = env.Protoc([], 'src/newcoin.proto', PROTOCOUTDIR='obj', PROTOCPYTHONOUTDIR=N one)
env.Clean(PROTO_SRCS, 'site_scons/site_tools/protoc.pyc')
# Remove unused source files.
UNUSED_SRCS = ['src/HttpReply.cpp', 'src/ValidationCollection.cpp']
for file in UNUSED_SRCS:
NEWCOIN_SRCS.remove(file)
NEWCOIN_SRCS += DB_SRCS + JSON_SRCS
# Derive the object files from the source files.
NEWCOIN_OBJS = []
for file in NEWCOIN_SRCS:
NEWCOIN_OBJS.append('obj/' + file)
NEWCOIN_OBJS += PROTO_SRCS
newcoind = env.Program('newcoind', NEWCOIN_OBJS)
#tags = env.CTags('obj/tags', NEWCOIN_SRCS)
Default(newcoind)

View File

@@ -27,7 +27,7 @@ Log::~Log()
boost::recursive_mutex::scoped_lock sl(sLock);
if (mSeverity >= sMinSeverity)
{
// TEMP std::cerr << logMsg << std::endl;
std::cerr << logMsg << std::endl;
}
}

View File

@@ -6,7 +6,7 @@
#
# This file is UTF-8 with Dos, UNIX, or Mac style end of lines.
# Blank lines and lines starting with a '#' are ignored.
# All other lines should be domain names.
# All other lines should be hankos or domain names.
#
# [validators]:
# To acquire a UNL, newcoind will probe for https web servers at the domains
@@ -14,4 +14,6 @@
#
[validators]
n9LQC4xFSWXNv1SU1sKtjrW6TZpBZSwp1nRWej8saGs155x42YFZ
n9LQC4xFSWXNv1SU1sKtjrW6TZpBZSwp1nRWej8saGs155x42YFZ first
n9LFzWuhKNvXStHAuemfRKFVECLApowncMAM5chSCL9R5ECHGN4V second
n9KXAZxiHkWuVGxDEE8boW7WmcycpZNmWei4vxVaywLZ391Nbuqx third