From 623cf274b3e9b2bba3103b2c3e4ba3b91143040c Mon Sep 17 00:00:00 2001 From: jed Date: Wed, 13 Jun 2012 12:01:29 -0700 Subject: [PATCH 1/3] . --- src/RPCServer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/RPCServer.cpp b/src/RPCServer.cpp index 6f56fe499e..64125cb176 100644 --- a/src/RPCServer.cpp +++ b/src/RPCServer.cpp @@ -102,7 +102,7 @@ Json::Value RPCServer::RPCError(int iError) void RPCServer::connected() { //BOOST_LOG_TRIVIAL(info) << "RPC request"; - std::cout << "RPC request" << std::endl; + //std::cout << "RPC request" << std::endl; mSocket.async_read_some(boost::asio::buffer(mReadBuffer), boost::bind(&RPCServer::handle_read, shared_from_this(), From 7a9607492d60b90bd7cadbb4b367627a884b3ac1 Mon Sep 17 00:00:00 2001 From: jed Date: Mon, 18 Jun 2012 07:27:49 -0700 Subject: [PATCH 2/3] . --- SConstruct | 84 ++++++++++++++++++++++++++++++++++++++++++++++++++ src/Log.cpp | 2 +- validators.txt | 6 ++-- 3 files changed, 89 insertions(+), 3 deletions(-) diff --git a/SConstruct b/SConstruct index b6e2809475..10ec3f1b77 100644 --- a/SConstruct +++ b/SConstruct @@ -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) + diff --git a/src/Log.cpp b/src/Log.cpp index 243e9ee592..ded888a6d6 100644 --- a/src/Log.cpp +++ b/src/Log.cpp @@ -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; } } diff --git a/validators.txt b/validators.txt index 786db55654..bbd2c3f2e8 100644 --- a/validators.txt +++ b/validators.txt @@ -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 From 3e46abf9b8783150dc0c28f7523a47e61fa6c5bf Mon Sep 17 00:00:00 2001 From: jed Date: Mon, 18 Jun 2012 07:29:26 -0700 Subject: [PATCH 3/3] . --- SConstruct | 83 ----------------------------------------- newcoin.vcxproj | 1 + newcoin.vcxproj.filters | 1 + 3 files changed, 2 insertions(+), 83 deletions(-) diff --git a/SConstruct b/SConstruct index 10ec3f1b77..820d9e2328 100644 --- a/SConstruct +++ b/SConstruct @@ -89,86 +89,3 @@ 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) - diff --git a/newcoin.vcxproj b/newcoin.vcxproj index d012dcb838..830dc5098c 100644 --- a/newcoin.vcxproj +++ b/newcoin.vcxproj @@ -251,6 +251,7 @@ + diff --git a/newcoin.vcxproj.filters b/newcoin.vcxproj.filters index e1589e2b82..41af172d3c 100644 --- a/newcoin.vcxproj.filters +++ b/newcoin.vcxproj.filters @@ -485,6 +485,7 @@ +