From bms_fbsd at users.sourceforge.net Mon Nov 2 20:09:15 2009 From: bms_fbsd at users.sourceforge.net (bms_fbsd at users.sourceforge.net) Date: Tue, 03 Nov 2009 04:09:15 +0000 Subject: [Xorp-cvs] SF.net SVN: xorp:[11574] trunk/xorp/xrl/scripts/skel-gen Message-ID: Revision: 11574 http://xorp.svn.sourceforge.net/xorp/?rev=11574&view=rev Author: bms_fbsd Date: 2009-11-03 04:09:15 +0000 (Tue, 03 Nov 2009) Log Message: ----------- Add a new script, skel-gen, derived from tgt-gen. This is a convenience script for developers who need to implement XRL targets. It is used identically to the tgt-gen script. Added Paths: ----------- trunk/xorp/xrl/scripts/skel-gen Added: trunk/xorp/xrl/scripts/skel-gen =================================================================== --- trunk/xorp/xrl/scripts/skel-gen (rev 0) +++ trunk/xorp/xrl/scripts/skel-gen 2009-11-03 04:09:15 UTC (rev 11574) @@ -0,0 +1,261 @@ +#! /usr/bin/env python + +"""Program to generate a skeleton Xrl Target derived class""" + +from optparse import OptionParser +import os, sys + +# This is a bit of mess as this code was split into separate files +import Xif.util + +from Xif.util import \ + joining_csv, csv, cpp_name, cpp_classname, xorp_indent_string, xorp_indent + +from Xif.xiftypes import \ + XrlArg, XrlMethod, XrlInterface, XrlTarget + +from Xif.parse import \ + XifParser + +from Xif.kdoc import \ + XifKdocThing + +# ----------------------------------------------------------------------------- +# Xrl output list +# ----------------------------------------------------------------------------- + +def xrl_arg_str(a): + return a.name() + ":" + a.type() + +def output_xrls(tgt_name, methods): + s = "" + + for m in methods: + kdoc_note = kdoc_comment(m, "") + if len(kdoc_note): + s += kdoc_note + "\n" + + s += "finder://%s/%s" % (tgt_name, m.name()) + if len(m.args()): + s += "?" + s += csv(map(xrl_arg_str, m.args()), "&") + if len(m.rargs()): + s += "->" + s += csv(map(xrl_arg_str, m.rargs()), "&") + s += "\n\n" + + return s + +# ----------------------------------------------------------------------------- +# Target file output related +# ----------------------------------------------------------------------------- + +def kdoc_comment(method, indent_chars, preamble = ""): + kdoc_source = method.annotation() + if kdoc_source == "": + return "" + kdt = Xif.kdoc.parse_kdoc_comment(kdoc_source) + params = [] + for a in method.args(): + params.append(a.name()) + for a in method.rargs(): + params.append(a.name()) + return kdt.output_kdoc(indent_chars, params, preamble) + +def generate_method_args(method, indent_level): + args = [] + # input args + if len(method.args()): + args.append("\n%s// Input values" % xorp_indent(indent_level)) + for a in method.args(): + cpa = "\n%sconst %s&\t%s" % \ + (xorp_indent(indent_level), a.cpp_type(), cpp_name(a.name())) + args.append(cpa) + # output args + if len(method.rargs()): + args.append("\n%s// Output values" % xorp_indent(indent_level)) + for r in method.rargs(): + cpa = "\n%s%s&\t%s" % \ + (xorp_indent(indent_level), r.cpp_type(), cpp_name(r.name())) + args.append(cpa) + return csv(args) + +def target_declare_derived(methods): + s = "" + for m in methods: + cpp_method_name = cpp_name(m.name()) + args = generate_method_args(m, indent_level=2) + s += " XrlCmdError %s(%s);\n\n" % (cpp_method_name, args) + return s; + +def target_derived_methods(cls, name, methods): + s = "" + for m in methods: + cpp_method_name = cpp_name(m.name()) + args = generate_method_args(m, indent_level=1) + s += "XrlCmdError\n%s::%s(%s)\n" % (cls, cpp_method_name, args) + s += "{\n" + s += " return XrlCmdError::COMMAND_FAILED(\"Not implemented\");\n" + for a in m.args(): + s += " UNUSED(%s);\n" % a.name(); + for r in m.rargs(): + s += " UNUSED(%s);\n" % r.name(); + s += "}\n" + s += "\n" + return s + +def protect(file): + # remove direcory component + r = file.rfind("/") + 1 + return "__%s__" % file[r:].upper().replace(".", "_") + +# TODO: make path to XRL target retargettable. +def prepare_target_hh(base_hh_file, hh_file): + s = Xif.util.standard_preamble(1, hh_file) + s += \ +""" +#ifndef %s +#define %s + +#include "libxipc/xrl_router.h" +#include "xrl/targets/%s" +""" % (protect(hh_file), protect(hh_file), base_hh_file) + return s + +def output_target_hh(cls, tgt_name, tgt_version, methods): + s = """ +class %s { +public: + %s(XrlRouter& rtr); + ~%s(); + +protected: +""" % (cls, cls, cls) + s += target_declare_derived(methods) + s += "private:\n" + s += " XrlRouter&\t\t_rtr;\n" + s += "};\n" + return s + +def finish_target_hh(hh_file): + return "\n#endif // %s\n" % protect(hh_file) + +def prepare_target_cc(target_hh, target_cc, base_modulename): + r = target_hh.rfind("/") + 1 + s = Xif.util.standard_preamble(0, target_cc) + s += "#include \"%s_module.h\"\n" % base_modulename + s += "#include \"libxorp/xorp.h\"\n" + s += "#include \"libxorp/xlog.h\"\n" + s += "#include \"libxorp/status_codes.h\"\n\n" + s += "#include \"%s\"\n\n" % target_hh[r:] + return s + +def output_target_cc(cls, tgt_name, methods): + s = "" + s += """ +%s::%s(XrlRouter& rtr) + : %sBase(&rtr), + _rtr(rtr) +{ +} + +%s::~%s() +{ +} + +""" % tuple([cls] * 5) + s += target_derived_methods(cls, tgt_name, methods) + return s + +def generate_target_methods(tgt, interfaces): + methods = [] + # tgt.interfaces is a list of tuples ("interface_name", "interface_version") + # Convert this to a list of methods + for tif_info in tgt.interfaces(): + found = 0 + for tif in interfaces: + if (tif.name() == tif_info[0]) & (tif.version() == tif_info[1]): + found = 1 + break + if found == 0: + print "Error interface %s data not found" % tif_info[0] + sys.exit(1) + for m in tif.methods(): + full_name = Xif.util.xrl_method_name(tif.name(), tif.version(), m.name()) + fq_method = m + fq_method.set_name(full_name) + methods.append(fq_method) + return methods + + +def main(): + usage = "usage: %prog [options] arg" + parser = OptionParser(usage) + parser.add_option("-o", "--output-dir", + action="store", + type="string", + dest="output_dir", + metavar="DIR") + parser.add_option("-I", + action="append", + type="string", + dest="includes", + metavar="DIR") + (options,args) = parser.parse_args() + + if len(args) != 1: + parser_error("incorrect number of arguments") + + # Command line arguments passed on to cpp + pipe_string = "cpp -C " + if options.includes: + for a in options.includes: + pipe_string += "-I%s " % a + pipe_string += args[0] + + cpp_pipe = os.popen(pipe_string, 'r') + + xp = XifParser(cpp_pipe) + + tgts = xp.targets() + if len(tgts) == 0: + print "Not targets found in input files." + sys.exit(1) + + sourcefile = tgts[0].sourcefile() + for tgt in tgts: + if (tgt.sourcefile() != sourcefile): + print "Multiple .tgt files presented, expected just one." + sys.exit(1) + + # basename transformation - this is a lame test + if sourcefile[-4:] != ".tgt": + print "Source file does not end in .tgt suffix - basename transform failure." + sys.exit(1) + + basename = sourcefile[:-4] + basename = basename[basename.rfind("/") + 1:] + + base_hh_filename = "%s_base.hh" % basename + hh_file = "xrl_target_%s.hh" % basename + cc_file = "xrl_target_%s.cc" % basename + + if options.output_dir: + hh_file = os.path.join(options.output_dir, hh_file) + cc_file = os.path.join(options.output_dir, cc_file) + + hh_txt = prepare_target_hh(base_hh_filename, hh_file) + cc_txt = prepare_target_cc(hh_file, cc_file, basename) + + for tgt in tgts: + tgt_methods = generate_target_methods(tgt, xp.interfaces()) + cls = "Xrl%sTarget" % cpp_classname(tgt.name()) + hh_txt += output_target_hh(cls, tgt.name(), tgt.version(), tgt_methods) + hh_txt += finish_target_hh(hh_file) + cc_txt += output_target_cc(cls, tgt.name(), tgt_methods) + + Xif.util.file_write_string(hh_file, hh_txt) + Xif.util.file_write_string(cc_file, cc_txt) + +if __name__ == '__main__': + main() Property changes on: trunk/xorp/xrl/scripts/skel-gen ___________________________________________________________________ Added: svn:executable + * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bms_fbsd at users.sourceforge.net Tue Nov 10 05:05:46 2009 From: bms_fbsd at users.sourceforge.net (bms_fbsd at users.sourceforge.net) Date: Tue, 10 Nov 2009 13:05:46 +0000 Subject: [Xorp-cvs] SF.net SVN: xorp:[11575] trunk/xorp/libxipc/finder_messenger.hh Message-ID: Revision: 11575 http://xorp.svn.sourceforge.net/xorp/?rev=11575&view=rev Author: bms_fbsd Date: 2009-11-10 13:05:45 +0000 (Tue, 10 Nov 2009) Log Message: ----------- Purge an outdated comment. Modified Paths: -------------- trunk/xorp/libxipc/finder_messenger.hh Modified: trunk/xorp/libxipc/finder_messenger.hh =================================================================== --- trunk/xorp/libxipc/finder_messenger.hh 2009-11-03 04:09:15 UTC (rev 11574) +++ trunk/xorp/libxipc/finder_messenger.hh 2009-11-10 13:05:45 UTC (rev 11575) @@ -106,8 +106,7 @@ protected: /** - * Find command associated with Xrl and dispatch it. pre_dispatch_xrl() - * and post_dispatch_xrl() are called either side of Xrl. + * Find command associated with Xrl and dispatch it. */ void dispatch_xrl(uint32_t seqno, const Xrl& x); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bms_fbsd at users.sourceforge.net Wed Nov 18 06:08:12 2009 From: bms_fbsd at users.sourceforge.net (bms_fbsd at users.sourceforge.net) Date: Wed, 18 Nov 2009 14:08:12 +0000 Subject: [Xorp-cvs] SF.net SVN: xorp:[11576] trunk/xorp/site_scons/config/allconfig.py Message-ID: Revision: 11576 http://xorp.svn.sourceforge.net/xorp/?rev=11576&view=rev Author: bms_fbsd Date: 2009-11-18 14:08:12 +0000 (Wed, 18 Nov 2009) Log Message: ----------- Catch up with change in host_os naming convention from config.guess change. Submitted by: Ben Greear Modified Paths: -------------- trunk/xorp/site_scons/config/allconfig.py Modified: trunk/xorp/site_scons/config/allconfig.py =================================================================== --- trunk/xorp/site_scons/config/allconfig.py 2009-11-10 13:05:45 UTC (rev 11575) +++ trunk/xorp/site_scons/config/allconfig.py 2009-11-18 14:08:12 UTC (rev 11576) @@ -191,7 +191,7 @@ conf.Define('HAVE_TCPUDP_UNIX_SOCKETS') if has_af_inet and has_sock_raw: conf.Define('HAVE_IP_RAW_SOCKETS') - if host_os == 'linux' or host_os == 'openbsd': + if host_os == 'linux-gnu' or host_os == 'openbsd': conf.Define('IPV4_RAW_OUTPUT_IS_RAW') conf.Define('IPV4_RAW_INPUT_IS_RAW') @@ -259,7 +259,7 @@ if has_linux_netlink_h: conf.Define('HAVE_NETLINK_SOCKETS') - elif has_net_route_h and host_os != 'linux': + elif has_net_route_h and host_os != 'linux-gnu': conf.Define('HAVE_ROUTING_SOCKETS') if has_linux_netlink_h: @@ -418,7 +418,7 @@ rfc3542_includes = [] for s in prereq_rfc3542: # XXX: __USE_GNU must be defined for RFC3542 defines under Linux. - if host_os == 'linux' and s == 'netinet/in.h': + if host_os == 'linux-gnu' and s == 'netinet/in.h': rfc3542_includes.append("#define __USE_GNU\n") rfc3542_includes.append("#include <%s>\n" % s) rfc3542_includes = string.join(rfc3542_includes, '') This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bms_fbsd at users.sourceforge.net Wed Nov 18 07:00:36 2009 From: bms_fbsd at users.sourceforge.net (bms_fbsd at users.sourceforge.net) Date: Wed, 18 Nov 2009 15:00:36 +0000 Subject: [Xorp-cvs] SF.net SVN: xorp:[11577] trunk/xorp/SConstruct Message-ID: Revision: 11577 http://xorp.svn.sourceforge.net/xorp/?rev=11577&view=rev Author: bms_fbsd Date: 2009-11-18 15:00:36 +0000 (Wed, 18 Nov 2009) Log Message: ----------- Drop comment: JT's change makes arch spec unambiguous. Modified Paths: -------------- trunk/xorp/SConstruct Modified: trunk/xorp/SConstruct =================================================================== --- trunk/xorp/SConstruct 2009-11-18 14:08:12 UTC (rev 11576) +++ trunk/xorp/SConstruct 2009-11-18 15:00:36 UTC (rev 11577) @@ -27,7 +27,6 @@ # TODO Merge scons-unfamiliar syntactic sugar from YHC's sconsfiles. # TODO support non-gnu strip # TODO support static *and* shared library build in same tree/run -# TODO disambiguate arch specification cross-platform # TODO conditionalize new directory layout here # The XRL tgt-gen and clnt-gen scripts use Python 2.3+'s optparse This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bms_fbsd at users.sourceforge.net Mon Nov 23 14:50:59 2009 From: bms_fbsd at users.sourceforge.net (bms_fbsd at users.sourceforge.net) Date: Mon, 23 Nov 2009 22:50:59 +0000 Subject: [Xorp-cvs] SF.net SVN: xorp:[11578] trunk/xorp/SConstruct Message-ID: Revision: 11578 http://xorp.svn.sourceforge.net/xorp/?rev=11578&view=rev Author: bms_fbsd Date: 2009-11-23 22:50:59 +0000 (Mon, 23 Nov 2009) Log Message: ----------- Add -rdynamic to the default link flags. Mostly a no-op for shared library targets. However, all non-local symbols are now exported to the runtime linker. This is a prerequisite for runtime backtrace support to work. Modified Paths: -------------- trunk/xorp/SConstruct Modified: trunk/xorp/SConstruct =================================================================== --- trunk/xorp/SConstruct 2009-11-18 15:00:36 UTC (rev 11577) +++ trunk/xorp/SConstruct 2009-11-23 22:50:59 UTC (rev 11578) @@ -388,6 +388,11 @@ '$libdir', ]) +# Export dynamic symbols in executables for runtime backtraces w/o GDB. +env.AppendUnique(LINKFLAGS = [ + '-rdynamic', + ]) + env.SConscript(['SConscript'], variant_dir='$BUILDDIR', exports='env', duplicate=0) env.Help(vars.GenerateHelpText(env)) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bms_fbsd at users.sourceforge.net Thu Nov 26 08:15:43 2009 From: bms_fbsd at users.sourceforge.net (bms_fbsd at users.sourceforge.net) Date: Thu, 26 Nov 2009 16:15:43 +0000 Subject: [Xorp-cvs] SF.net SVN: xorp:[11579] trunk/xorp/libxipc/tests/SConscript Message-ID: Revision: 11579 http://xorp.svn.sourceforge.net/xorp/?rev=11579&view=rev Author: bms_fbsd Date: 2009-11-26 16:15:43 +0000 (Thu, 26 Nov 2009) Log Message: ----------- Fix libxipc 'scons check' build by commenting out tests which depend on functionality no built in libxipc by default. test_xrl_router uses UDP, not TCP, so it is not a true reflection of typical use. Modified Paths: -------------- trunk/xorp/libxipc/tests/SConscript Modified: trunk/xorp/libxipc/tests/SConscript =================================================================== --- trunk/xorp/libxipc/tests/SConscript 2009-11-23 22:50:59 UTC (rev 11578) +++ trunk/xorp/libxipc/tests/SConscript 2009-11-26 16:15:43 UTC (rev 11579) @@ -53,20 +53,20 @@ #'finder_msgs', #'finder_tcp', #'finder_to', - 'header', - 'inproc', + #'header', # no longer used in shipping libxipc + #'inproc', # no longer used in shipping libxipc 'lemming', #'receiver', # compound 'stcp', 'stcppf', - 'sudp', + #'sudp', # no longer used in shipping libxipc 'xrl', 'xrl_args', 'xrl_atom', 'xrl_error', 'xrl_parser', #'xrl_receiver', # compound - 'xrl_router', + #'xrl_router', # uses XrlPFUDP* #'xrl_sender', # compound ] This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bms_fbsd at users.sourceforge.net Thu Nov 26 11:14:41 2009 From: bms_fbsd at users.sourceforge.net (bms_fbsd at users.sourceforge.net) Date: Thu, 26 Nov 2009 19:14:41 +0000 Subject: [Xorp-cvs] SF.net SVN: xorp:[11582] trunk/xorp/site_scons/site_tools/autotest.py Message-ID: Revision: 11582 http://xorp.svn.sourceforge.net/xorp/?rev=11582&view=rev Author: bms_fbsd Date: 2009-11-26 19:14:41 +0000 (Thu, 26 Nov 2009) Log Message: ----------- Add comment about where to cut running a 'scons check' if you're cross-compiling. We should really print a warning in this instance (i.e. you're cross-compiling, host != target, we can't run the test, but we can build it for compile coverage.) Modified Paths: -------------- trunk/xorp/site_scons/site_tools/autotest.py Modified: trunk/xorp/site_scons/site_tools/autotest.py =================================================================== --- trunk/xorp/site_scons/site_tools/autotest.py 2009-11-26 17:39:12 UTC (rev 11581) +++ trunk/xorp/site_scons/site_tools/autotest.py 2009-11-26 19:14:41 UTC (rev 11582) @@ -65,6 +65,8 @@ kwargs["CXXFLAGS"] = cxxflags kwargs["CCFLAGS"] = ccflags test = env.Program(target, source = source, **kwargs) + + # FIXME: Skip this step if we are cross-compiling (don't run the runner). if multiget([kwargs, env], 'AUTOTEST_SKIP_ERRORS', False): runner = env.Action(test[0].abspath, exitstatfunc=lambda x:0) else: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bms_fbsd at users.sourceforge.net Thu Nov 26 09:17:20 2009 From: bms_fbsd at users.sourceforge.net (bms_fbsd at users.sourceforge.net) Date: Thu, 26 Nov 2009 17:17:20 +0000 Subject: [Xorp-cvs] SF.net SVN: xorp:[11580] trunk/xorp/ospf/tests/SConscript Message-ID: Revision: 11580 http://xorp.svn.sourceforge.net/xorp/?rev=11580&view=rev Author: bms_fbsd Date: 2009-11-26 17:17:20 +0000 (Thu, 26 Nov 2009) Log Message: ----------- Fix a typo in LIBS. Modified Paths: -------------- trunk/xorp/ospf/tests/SConscript Modified: trunk/xorp/ospf/tests/SConscript =================================================================== --- trunk/xorp/ospf/tests/SConscript 2009-11-26 16:15:43 UTC (rev 11579) +++ trunk/xorp/ospf/tests/SConscript 2009-11-26 17:17:20 UTC (rev 11580) @@ -46,7 +46,7 @@ 'ospf', #'ospfv2base', #'ospfv3base', - 'ripxif', + 'ribxif', 'findereventnotifierxif', 'feaclient', 'feaifmgrmirrorxif', This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bms_fbsd at users.sourceforge.net Thu Nov 26 09:39:12 2009 From: bms_fbsd at users.sourceforge.net (bms_fbsd at users.sourceforge.net) Date: Thu, 26 Nov 2009 17:39:12 +0000 Subject: [Xorp-cvs] SF.net SVN: xorp:[11581] trunk/xorp/ospf/tests/SConscript Message-ID: Revision: 11581 http://xorp.svn.sourceforge.net/xorp/?rev=11581&view=rev Author: bms_fbsd Date: 2009-11-26 17:39:12 +0000 (Thu, 26 Nov 2009) Log Message: ----------- OSPF tests need to link against XRL target base shims for OSPF, when shared=true. Modified Paths: -------------- trunk/xorp/ospf/tests/SConscript Modified: trunk/xorp/ospf/tests/SConscript =================================================================== --- trunk/xorp/ospf/tests/SConscript 2009-11-26 17:17:20 UTC (rev 11580) +++ trunk/xorp/ospf/tests/SConscript 2009-11-26 17:39:12 UTC (rev 11581) @@ -21,6 +21,7 @@ Import("env") env = env.Clone() +is_shared = env.has_key('SHAREDLIBS') env.AppendUnique(CPPPATH = [ '#', @@ -43,9 +44,6 @@ ]) env.AppendUnique(LIBS = [ - 'ospf', - #'ospfv2base', - #'ospfv3base', 'ribxif', 'findereventnotifierxif', 'feaclient', @@ -62,6 +60,17 @@ 'comm', ]) +# XXX Do we need to link against this now? +if is_shared: + env.PrependUnique(LIBS = [ + 'ospfv2base', + 'ospfv3base', + ]) + +env.PrependUnique(LIBS = [ + 'ospf', +]) + # XXX NOTYET: compound test; two modules, one test scaffold, run from # test_routing.py. #'build_lsa', 'build_lsa_main' This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bms_fbsd at users.sourceforge.net Thu Nov 26 12:15:21 2009 From: bms_fbsd at users.sourceforge.net (bms_fbsd at users.sourceforge.net) Date: Thu, 26 Nov 2009 20:15:21 +0000 Subject: [Xorp-cvs] SF.net SVN: xorp:[11583] trunk/xorp/SConstruct Message-ID: Revision: 11583 http://xorp.svn.sourceforge.net/xorp/?rev=11583&view=rev Author: bms_fbsd Date: 2009-11-26 20:15:21 +0000 (Thu, 26 Nov 2009) Log Message: ----------- When allowing the user to override CFLAGS/CXXFLAGS/LINKFLAGS on the command line, don't obliterate what's already there. SCons stashes some useful defaults in there, and RPATH support breaks if you clobber LINKFLAGS in this way. This isn't a bug in SCons, rather how we use it. We need RPATH working to resolve some issues with: 1) installing shared libraries in a retargettable system location (i.e. by using $ORIGIN relative paths in ELF rtld), 2) running the regression tests in a non-cross, shared-library build. Currently, we need to relink every time we change DESTDIR. Don't forget that the RPATH variable needs to see expanded paths, as they are passed to the linker unescaped. For $ORIGIN, each SConscript will need to compute its own relative paths, depending on which directory layout we're using in the stage tree or installation tree. Use Python 2.6 os.path.relpath() for this. While we're here, allow the user to override the AutoTest() builder's default behaviour to ignore errors during a 'scons check' run, by passing 'ignore_check_errors=true' on the command line. SCons bug ID: http://scons.tigris.org/issues/show_bug.cgi?id=1644 Modified Paths: -------------- trunk/xorp/SConstruct Modified: trunk/xorp/SConstruct =================================================================== --- trunk/xorp/SConstruct 2009-11-26 19:14:41 UTC (rev 11582) +++ trunk/xorp/SConstruct 2009-11-26 20:15:21 UTC (rev 11583) @@ -61,6 +61,7 @@ vars.AddVariables( BoolVariable('shared', 'build with shared libraries', False), BoolVariable('strip', 'strip executables and libraries when installed', False), + BoolVariable('ignore_check_errors', 'Ignore errors when building tests', False), BoolVariable('debug_stl', 'Build with checked STL operations', False), BoolVariable('debug_msg', 'Build with debug messages', False), BoolVariable('debug_fn', 'Build with function names in debug_msg output', False), @@ -138,6 +139,10 @@ env['SHAREDLIBS'] = "defined" print 'Shared libraries: ', env.has_key('SHAREDLIBS') +if env['ignore_check_errors']: + env['AUTOTEST_SKIP_ERRORS'] = True +print 'Ignore test errors: ', env.has_key('AUTOTEST_SKIP_ERRORS') + print 'Debug STL: ', env['debug_stl'] # XXX Enabling debug messages for the whole tree may not be what you want, # as it can lead to premature timeouts. @@ -317,9 +322,9 @@ ########## end configure magic -env['CFLAGS'] = Split(ARGUMENTS.get('CFLAGS', "-g")) -env['CXXFLAGS'] = Split(ARGUMENTS.get('CXXFLAGS', "-g")) -env['LINKFLAGS'] = Split(ARGUMENTS.get('LINKFLAGS', "")) +env.AppendUnique( CFLAGS = Split(ARGUMENTS.get('CFLAGS', "-g")) ) +env.AppendUnique( CXXFLAGS = Split(ARGUMENTS.get('CXXFLAGS', "-g")) ) +env.AppendUnique( LINKFLAGS = Split(ARGUMENTS.get('LINKFLAGS', "")) ) env.AppendUnique(CPPDEFINES = [ ( '_FORTIFY_SOURCE', 0 ), @@ -384,9 +389,11 @@ '-DDEBUG_CALLBACKS', ]) -env.AppendUnique(RPATH = [ - '$libdir', - ]) +# XXX: This should not yet be needed, we do not yet install +# libs into a single libdir in the community XORP installation layout. +#env.AppendUnique(RPATH = [ +# '$libdir', +# ]) # Export dynamic symbols in executables for runtime backtraces w/o GDB. env.AppendUnique(LINKFLAGS = [ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bms_fbsd at users.sourceforge.net Thu Nov 26 12:50:43 2009 From: bms_fbsd at users.sourceforge.net (bms_fbsd at users.sourceforge.net) Date: Thu, 26 Nov 2009 20:50:43 +0000 Subject: [Xorp-cvs] SF.net SVN: xorp:[11584] trunk/xorp/SConstruct Message-ID: Revision: 11584 http://xorp.svn.sourceforge.net/xorp/?rev=11584&view=rev Author: bms_fbsd Date: 2009-11-26 20:50:42 +0000 (Thu, 26 Nov 2009) Log Message: ----------- Fix syntax of printing ignore_check_errors option status. It is set as a default inside site_scons/site_tools/autotest.py, so we need to print it as though it is already set. Modified Paths: -------------- trunk/xorp/SConstruct Modified: trunk/xorp/SConstruct =================================================================== --- trunk/xorp/SConstruct 2009-11-26 20:15:21 UTC (rev 11583) +++ trunk/xorp/SConstruct 2009-11-26 20:50:42 UTC (rev 11584) @@ -139,9 +139,11 @@ env['SHAREDLIBS'] = "defined" print 'Shared libraries: ', env.has_key('SHAREDLIBS') +# AUTOTEST_SKIP_ERRORS is SetDefault() by site_scons/site_tools/autotest.py, +# so print its value here. if env['ignore_check_errors']: env['AUTOTEST_SKIP_ERRORS'] = True -print 'Ignore test errors: ', env.has_key('AUTOTEST_SKIP_ERRORS') +print 'Ignore check errors: ', env['AUTOTEST_SKIP_ERRORS'] print 'Debug STL: ', env['debug_stl'] # XXX Enabling debug messages for the whole tree may not be what you want, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bms_fbsd at users.sourceforge.net Thu Nov 26 13:24:26 2009 From: bms_fbsd at users.sourceforge.net (bms_fbsd at users.sourceforge.net) Date: Thu, 26 Nov 2009 21:24:26 +0000 Subject: [Xorp-cvs] SF.net SVN: xorp:[11585] trunk/xorp/libcomm/tests/SConscript Message-ID: Revision: 11585 http://xorp.svn.sourceforge.net/xorp/?rev=11585&view=rev Author: bms_fbsd Date: 2009-11-26 21:24:26 +0000 (Thu, 26 Nov 2009) Log Message: ----------- s/AppendUnique/PrependUnique/ We are adding to global paths, link lines etc so keep them sorted most-specific first. Modified Paths: -------------- trunk/xorp/libcomm/tests/SConscript Modified: trunk/xorp/libcomm/tests/SConscript =================================================================== --- trunk/xorp/libcomm/tests/SConscript 2009-11-26 20:50:42 UTC (rev 11584) +++ trunk/xorp/libcomm/tests/SConscript 2009-11-26 21:24:26 UTC (rev 11585) @@ -22,9 +22,9 @@ env = env.Clone() -env.AppendUnique(CPPPATH = [ '#', '$BUILDDIR', '$BUILDDIR/libcomm', ]) -env.AppendUnique(LIBPATH = [ '$BUILDDIR/libxorp', '$BUILDDIR/libcomm', ]) -env.AppendUnique(LIBS = [ 'xorp', 'comm' ]) +env.PrependUnique(CPPPATH = [ '#', '$BUILDDIR', '$BUILDDIR/libcomm', ]) +env.PrependUnique(LIBPATH = [ '$BUILDDIR/libxorp', '$BUILDDIR/libcomm', ]) +env.PrependUnique(LIBS = [ 'xorp', 'comm' ]) # XXX Not for cross-compilation. test_comm = env.AutoTest(target = 'test_comm', source = 'test_comm.c') This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bms_fbsd at users.sourceforge.net Thu Nov 26 13:30:28 2009 From: bms_fbsd at users.sourceforge.net (bms_fbsd at users.sourceforge.net) Date: Thu, 26 Nov 2009 21:30:28 +0000 Subject: [Xorp-cvs] SF.net SVN: xorp:[11586] trunk/xorp/SConstruct Message-ID: Revision: 11586 http://xorp.svn.sourceforge.net/xorp/?rev=11586&view=rev Author: bms_fbsd Date: 2009-11-26 21:30:28 +0000 (Thu, 26 Nov 2009) Log Message: ----------- Add use_rtld_origin parameter to control use of rtld ORIGIN feature when shared libraries are in use. This is currently commented out, and may be fully implemented later. Requires support from the runtime linker; most modern ELF systems support the ORIGIN feature, and it's used by KDE, Firefox and others. If the user passes use_rtld_origin=true on the scons command line, the RPATH will use the ELF runtime linker's ORIGIN feature; shared libraries will be searched relative to the executable's path. This feature will enable us to build the world once, without relinking whenever DESTDIR is changed. Modified Paths: -------------- trunk/xorp/SConstruct Modified: trunk/xorp/SConstruct =================================================================== --- trunk/xorp/SConstruct 2009-11-26 21:24:26 UTC (rev 11585) +++ trunk/xorp/SConstruct 2009-11-26 21:30:28 UTC (rev 11586) @@ -61,6 +61,7 @@ vars.AddVariables( BoolVariable('shared', 'build with shared libraries', False), BoolVariable('strip', 'strip executables and libraries when installed', False), + #BoolVariable('use_rtld_origin', 'Use ORIGIN in dynamically linked programs ', False), BoolVariable('ignore_check_errors', 'Ignore errors when building tests', False), BoolVariable('debug_stl', 'Build with checked STL operations', False), BoolVariable('debug_msg', 'Build with debug messages', False), This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bms_fbsd at users.sourceforge.net Thu Nov 26 13:34:55 2009 From: bms_fbsd at users.sourceforge.net (bms_fbsd at users.sourceforge.net) Date: Thu, 26 Nov 2009 21:34:55 +0000 Subject: [Xorp-cvs] SF.net SVN: xorp:[11587] trunk/xorp/site_scons/site_tools/autotest.py Message-ID: Revision: 11587 http://xorp.svn.sourceforge.net/xorp/?rev=11587&view=rev Author: bms_fbsd Date: 2009-11-26 21:34:54 +0000 (Thu, 26 Nov 2009) Log Message: ----------- Add support for running regression tests in a shared library world. With this change, 'scons check shared=true' runs to completion. Note: ORIGIN support is not yet enabled. The shared library paths are hardcoded to the $BUILDDIR. This hard-coding happens in the ELF .dynamic section (specifically the DT_RPATH entry) of each compiled test program. The rtld RPATH feature needs an expanded (i.e. non-SCons) path name, as the SCons builders pass it directly to the linker. This path changes if we install all .so into a $libdir (new XORP layout), or if we install them into a subdir of the destination tree for each subsystem (current XORP layout). For tests, we want RPATH directories to be passed either as absolute paths rooted at $BUILDDIR, or relative to the executable (../../subdir) if using ORIGIN. If we use rtld's ORIGIN feature to let it find our .so using a path relative to where the Program is installed, we need to turn each $BUILDDIR in $RPATH into a path relative to the Program. This requires SCons is run under Python 2.6 or later, as os.path.relpath() is used to determine the relative path for ORIGIN. Modified Paths: -------------- trunk/xorp/site_scons/site_tools/autotest.py Modified: trunk/xorp/site_scons/site_tools/autotest.py =================================================================== --- trunk/xorp/site_scons/site_tools/autotest.py 2009-11-26 21:30:28 UTC (rev 11586) +++ trunk/xorp/site_scons/site_tools/autotest.py 2009-11-26 21:34:54 UTC (rev 11587) @@ -60,10 +60,36 @@ # get the c and cxx flags to process. ccflags = Split( multiget([kwargs, env], 'CCFLAGS' )) cxxflags = Split( multiget([kwargs, env], 'CXXFLAGS')) + libpath = Split( multiget([kwargs, env], 'LIBPATH')) + rpath = Split( multiget([kwargs, env], 'RPATH')) + linkflags = Split( multiget([kwargs, env], 'LINKFLAGS')) + myrpath = rpath + + # For a test, take the our passed in LIBPATH, expand it, and prepend + # to our passed in RPATH, so that tests can build using shared + # libraries, even though they are not installed. + if env.has_key('SHAREDLIBS'): + # Figure out our absolute BUILDDIR path. If we're not using + # ORIGIN, then the test can be run + my_rpath_base = Dir(env['BUILDDIR']).abspath + # If ORIGIN is enabled, figure out our test's path relative + # to the BUILDDIR, and pass that to the linker in RPATH. + # XXX: Perhaps we should set '-z origin' at the top level? + #if env['use_rtld_origin']: + # env.PrependUnique( LINKFLAGS = Split('-z origin') ) + # my_rpath_base = os.path.relpath(my_rpath_base, Dir('.').abspath) + # Expand the RPATH according to destdir layout. + myrpath += [ x.replace('$BUILDDIR', my_rpath_base) for x in libpath ] + # fill the flags into kwargs kwargs["CXXFLAGS"] = cxxflags kwargs["CCFLAGS"] = ccflags + kwargs["LIBPATH"] = libpath + kwargs["RPATH"] = myrpath + kwargs["LINKFLAGS"] = linkflags + + # build the test program test = env.Program(target, source = source, **kwargs) # FIXME: Skip this step if we are cross-compiling (don't run the runner). @@ -73,6 +99,7 @@ runner = env.Action(test[0].abspath) env.Alias(env['AUTOTEST_TARGET'], test, runner) env.AlwaysBuild(env['AUTOTEST_TARGET']) + return test def generate(env, **kwargs): This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bms_fbsd at users.sourceforge.net Thu Nov 26 13:41:16 2009 From: bms_fbsd at users.sourceforge.net (bms_fbsd at users.sourceforge.net) Date: Thu, 26 Nov 2009 21:41:16 +0000 Subject: [Xorp-cvs] SF.net SVN: xorp:[11588] trunk/xorp/libxipc/tests Message-ID: Revision: 11588 http://xorp.svn.sourceforge.net/xorp/?rev=11588&view=rev Author: bms_fbsd Date: 2009-11-26 21:41:16 +0000 (Thu, 26 Nov 2009) Log Message: ----------- Implement required virtual functions in test targets. Submitted by: Ben Greear Modified Paths: -------------- trunk/xorp/libxipc/tests/test_finder_events.cc trunk/xorp/libxipc/tests/test_receiver.hh Modified: trunk/xorp/libxipc/tests/test_finder_events.cc =================================================================== --- trunk/xorp/libxipc/tests/test_finder_events.cc 2009-11-26 21:34:54 UTC (rev 11587) +++ trunk/xorp/libxipc/tests/test_finder_events.cc 2009-11-26 21:41:16 UTC (rev 11588) @@ -244,6 +244,11 @@ return XrlCmdError::OKAY(); } + XrlCmdError common_0_1_startup() + { + return XrlCmdError::OKAY(); + } + XrlCmdError common_0_1_shutdown() { //We don't normally want to shutdown a process through this Modified: trunk/xorp/libxipc/tests/test_receiver.hh =================================================================== --- trunk/xorp/libxipc/tests/test_receiver.hh 2009-11-26 21:34:54 UTC (rev 11587) +++ trunk/xorp/libxipc/tests/test_receiver.hh 2009-11-26 21:41:16 UTC (rev 11588) @@ -48,6 +48,7 @@ string& reason); XrlCmdError common_0_1_shutdown(); + XrlCmdError common_0_1_startup() { return XrlCmdError::OKAY(); } XrlCmdError test_xrls_0_1_start_transmission(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bms_fbsd at users.sourceforge.net Thu Nov 26 14:36:04 2009 From: bms_fbsd at users.sourceforge.net (bms_fbsd at users.sourceforge.net) Date: Thu, 26 Nov 2009 22:36:04 +0000 Subject: [Xorp-cvs] SF.net SVN: xorp:[11589] trunk/xorp/SConstruct Message-ID: Revision: 11589 http://xorp.svn.sourceforge.net/xorp/?rev=11589&view=rev Author: bms_fbsd Date: 2009-11-26 22:36:04 +0000 (Thu, 26 Nov 2009) Log Message: ----------- POSIX strip has no options by the strict letter of the law. Assume we have GNU binutils strip until proven otherwise. Modified Paths: -------------- trunk/xorp/SConstruct Modified: trunk/xorp/SConstruct =================================================================== --- trunk/xorp/SConstruct 2009-11-26 21:41:16 UTC (rev 11588) +++ trunk/xorp/SConstruct 2009-11-26 22:36:04 UTC (rev 11589) @@ -25,7 +25,6 @@ # TODO Add separate toolchain test for GNU varargs macros. # TODO Fix default include/lib paths, pass in from environment. # TODO Merge scons-unfamiliar syntactic sugar from YHC's sconsfiles. -# TODO support non-gnu strip # TODO support static *and* shared library build in same tree/run # TODO conditionalize new directory layout here @@ -136,6 +135,13 @@ env['strip'] = True print 'Strip binaries: ', env.has_key('strip') +# POSIX strip has no options by the strict letter of the law. +# Assume we have GNU binutils strip until proven otherwise. +gnustrip = True +env['_STRIP_UNNEEDED'] = "" +if gnustrip: + env['_STRIP_UNNEEDED'] = "--strip-unneeded" + if env['shared']: env['SHAREDLIBS'] = "defined" print 'Shared libraries: ', env.has_key('SHAREDLIBS') @@ -189,7 +195,7 @@ for i in obj: env.AddPostAction(i, env.Chmod(str(i), perm)) if env['strip']: - env.AddPostAction(i, Action("$STRIP --strip-unneeded $TARGET")) + env.AddPostAction(i, Action("$STRIP $_STRIP_UNNEEDED $TARGET")) return obj SConsEnvironment.InstallLibrary = InstallLibrary This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bms_fbsd at users.sourceforge.net Thu Nov 26 14:51:15 2009 From: bms_fbsd at users.sourceforge.net (bms_fbsd at users.sourceforge.net) Date: Thu, 26 Nov 2009 22:51:15 +0000 Subject: [Xorp-cvs] SF.net SVN: xorp:[11590] trunk/xorp/SConstruct Message-ID: Revision: 11590 http://xorp.svn.sourceforge.net/xorp/?rev=11590&view=rev Author: bms_fbsd Date: 2009-11-26 22:51:14 +0000 (Thu, 26 Nov 2009) Log Message: ----------- Fix shared library install. Put $libdir back into RPATH, now that it can co-exist with the regression tests. Modified Paths: -------------- trunk/xorp/SConstruct Modified: trunk/xorp/SConstruct =================================================================== --- trunk/xorp/SConstruct 2009-11-26 22:36:04 UTC (rev 11589) +++ trunk/xorp/SConstruct 2009-11-26 22:51:14 UTC (rev 11590) @@ -398,11 +398,10 @@ '-DDEBUG_CALLBACKS', ]) -# XXX: This should not yet be needed, we do not yet install -# libs into a single libdir in the community XORP installation layout. -#env.AppendUnique(RPATH = [ -# '$libdir', -# ]) +# Shared libraries are installed in $exec_prefix/lib by default. +env.AppendUnique(RPATH = [ + '$libdir', + ]) # Export dynamic symbols in executables for runtime backtraces w/o GDB. env.AppendUnique(LINKFLAGS = [ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bms_fbsd at users.sourceforge.net Thu Nov 26 15:25:22 2009 From: bms_fbsd at users.sourceforge.net (bms_fbsd at users.sourceforge.net) Date: Thu, 26 Nov 2009 23:25:22 +0000 Subject: [Xorp-cvs] SF.net SVN: xorp:[11591] trunk/xorp/SConstruct Message-ID: Revision: 11591 http://xorp.svn.sourceforge.net/xorp/?rev=11591&view=rev Author: bms_fbsd Date: 2009-11-26 23:25:22 +0000 (Thu, 26 Nov 2009) Log Message: ----------- Teach SCons to print a warning if GNU ld is not available. This check must be made after Environment() is constructed. Most of our shared library magic is specific to GNU ld. The exposure is a few flags here and there; it would be portable to e.g. the Solaris linker without too much effort. Fix some comments. Modified Paths: -------------- trunk/xorp/SConstruct Modified: trunk/xorp/SConstruct =================================================================== --- trunk/xorp/SConstruct 2009-11-26 22:51:14 UTC (rev 11590) +++ trunk/xorp/SConstruct 2009-11-26 23:25:22 UTC (rev 11591) @@ -18,7 +18,6 @@ # $ID$ # TODO build static and shared libraries. do so concisely and without bugs. -# TODO make shared library linker flags portable to non-gnu linkers. # TODO tone down linker line spamming, -lpcre etc; stage use of LIBS please. # TODO cross compiles. # TODO Add separate toolchain test for C99 varargs macros. @@ -142,8 +141,17 @@ if gnustrip: env['_STRIP_UNNEEDED'] = "--strip-unneeded" +# Most of our shared library tweaks are specific to GNU ld. +# Check if the GNU linker is available, and print a warning if not. if env['shared']: env['SHAREDLIBS'] = "defined" + if SCons.Tool.FindTool(['gnulink'], env) is None: + print \ +""" +WARNING: The GNU linker was not detected on your system. +Some combinations of linker and compiler flags, specific to building +shared libraries, may not function correctly. +""" print 'Shared libraries: ', env.has_key('SHAREDLIBS') # AUTOTEST_SKIP_ERRORS is SetDefault() by site_scons/site_tools/autotest.py, @@ -339,6 +347,7 @@ ( '_FORTIFY_SOURCE', 0 ), ]) +# NOTE: gcc specific flags. env.AppendUnique(CFLAGS = [ '-Werror', '-W', @@ -366,14 +375,14 @@ '-ftemplate-depth-25' ]) -# XXX For GNU STL only at this time. +# NOTE: For GNU STL only at this time. if env['debug_stl']: env.AppendUnique(CXXFLAGS = [ '-D_GLIBCXX_DEBUG', '-D_GLIBCXX_DEBUG_PEDANTIC', ]) -# XXX DEBUG_LOGGING_GLOBAL current a no-op. +# NOTE: DEBUG_LOGGING_GLOBAL currently a no-op. if env['debug_msg']: env.AppendUnique(CFLAGS = [ '-DDEBUG_LOGGING', @@ -404,6 +413,7 @@ ]) # Export dynamic symbols in executables for runtime backtraces w/o GDB. +# NOTE: GNU ld specific flag. env.AppendUnique(LINKFLAGS = [ '-rdynamic', ]) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bms_fbsd at users.sourceforge.net Thu Nov 26 15:26:46 2009 From: bms_fbsd at users.sourceforge.net (bms_fbsd at users.sourceforge.net) Date: Thu, 26 Nov 2009 23:26:46 +0000 Subject: [Xorp-cvs] SF.net SVN: xorp:[11592] trunk/xorp/SConstruct Message-ID: Revision: 11592 http://xorp.svn.sourceforge.net/xorp/?rev=11592&view=rev Author: bms_fbsd Date: 2009-11-26 23:26:46 +0000 (Thu, 26 Nov 2009) Log Message: ----------- Bite the bullet, and build with shared libraries by default. This is a reasonable assumption, given that we now have regression test support for a shared library build, and the tests pass. The commercial product is also using shared libraries by default. Not all of the tree will fully use shared libraries. BGP in particular needs to be revisited, because of some inter-module coupling. Static libraries will continue to be semi-supported for debugging purposes, however, it's expected that they will *not* co-exist in the same build run. Modified Paths: -------------- trunk/xorp/SConstruct Modified: trunk/xorp/SConstruct =================================================================== --- trunk/xorp/SConstruct 2009-11-26 23:25:22 UTC (rev 11591) +++ trunk/xorp/SConstruct 2009-11-26 23:26:46 UTC (rev 11592) @@ -17,14 +17,12 @@ # $ID$ -# TODO build static and shared libraries. do so concisely and without bugs. # TODO tone down linker line spamming, -lpcre etc; stage use of LIBS please. # TODO cross compiles. # TODO Add separate toolchain test for C99 varargs macros. # TODO Add separate toolchain test for GNU varargs macros. # TODO Fix default include/lib paths, pass in from environment. # TODO Merge scons-unfamiliar syntactic sugar from YHC's sconsfiles. -# TODO support static *and* shared library build in same tree/run # TODO conditionalize new directory layout here # The XRL tgt-gen and clnt-gen scripts use Python 2.3+'s optparse @@ -57,7 +55,7 @@ vars = Variables() vars.AddVariables( - BoolVariable('shared', 'build with shared libraries', False), + BoolVariable('shared', 'build with shared libraries', True), BoolVariable('strip', 'strip executables and libraries when installed', False), #BoolVariable('use_rtld_origin', 'Use ORIGIN in dynamically linked programs ', False), BoolVariable('ignore_check_errors', 'Ignore errors when building tests', False), This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bms_fbsd at users.sourceforge.net Thu Nov 26 16:19:41 2009 From: bms_fbsd at users.sourceforge.net (bms_fbsd at users.sourceforge.net) Date: Fri, 27 Nov 2009 00:19:41 +0000 Subject: [Xorp-cvs] SF.net SVN: xorp:[11593] trunk/xorp/SConstruct Message-ID: Revision: 11593 http://xorp.svn.sourceforge.net/xorp/?rev=11593&view=rev Author: bms_fbsd Date: 2009-11-27 00:19:41 +0000 (Fri, 27 Nov 2009) Log Message: ----------- Add a warning about GCC/G++ specific options being in use which will be printed if these tools are not detected by SCons when constructing the Environment(). Reword the GNU tool warning to be more generic. Modified Paths: -------------- trunk/xorp/SConstruct Modified: trunk/xorp/SConstruct =================================================================== --- trunk/xorp/SConstruct 2009-11-26 23:26:46 UTC (rev 11592) +++ trunk/xorp/SConstruct 2009-11-27 00:19:41 UTC (rev 11593) @@ -25,6 +25,12 @@ # TODO Merge scons-unfamiliar syntactic sugar from YHC's sconsfiles. # TODO conditionalize new directory layout here +gnutoolwarning = """ +WARNING: The GNU %s was not detected on your system. +Some combinations of linker or compiler flags, specific to building XORP, +may not function correctly. +""" + # The XRL tgt-gen and clnt-gen scripts use Python 2.3+'s optparse # class. EnsurePythonVersion(2, 3) @@ -142,14 +148,9 @@ # Most of our shared library tweaks are specific to GNU ld. # Check if the GNU linker is available, and print a warning if not. if env['shared']: + if SCons.Tool.FindTool(['gnulink'], env) is None: + print gnutoolwarning % 'ld linker' env['SHAREDLIBS'] = "defined" - if SCons.Tool.FindTool(['gnulink'], env) is None: - print \ -""" -WARNING: The GNU linker was not detected on your system. -Some combinations of linker and compiler flags, specific to building -shared libraries, may not function correctly. -""" print 'Shared libraries: ', env.has_key('SHAREDLIBS') # AUTOTEST_SKIP_ERRORS is SetDefault() by site_scons/site_tools/autotest.py, @@ -337,6 +338,10 @@ ########## end configure magic +if SCons.Tool.FindTool(['gcc'], env) is None or \ + SCons.Tool.FindTool(['g++'], env) is None: + print gnutoolwarning % 'gcc or g++ compiler' + env.AppendUnique( CFLAGS = Split(ARGUMENTS.get('CFLAGS', "-g")) ) env.AppendUnique( CXXFLAGS = Split(ARGUMENTS.get('CXXFLAGS', "-g")) ) env.AppendUnique( LINKFLAGS = Split(ARGUMENTS.get('LINKFLAGS', "")) ) @@ -358,7 +363,8 @@ '-Wpointer-arith', '-Wcast-align', '-Wstrict-prototypes', - '-Wnested-externs' + '-Wnested-externs', + #'-pipe', ]) env.AppendUnique(CXXFLAGS = [ @@ -370,7 +376,8 @@ '-Wpointer-arith', '-Wcast-align', '-Woverloaded-virtual', - '-ftemplate-depth-25' + '-ftemplate-depth-25', + #'-pipe', ]) # NOTE: For GNU STL only at this time. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bms_fbsd at users.sourceforge.net Thu Nov 26 16:37:09 2009 From: bms_fbsd at users.sourceforge.net (bms_fbsd at users.sourceforge.net) Date: Fri, 27 Nov 2009 00:37:09 +0000 Subject: [Xorp-cvs] SF.net SVN: xorp:[11594] trunk/xorp/SConstruct Message-ID: Revision: 11594 http://xorp.svn.sourceforge.net/xorp/?rev=11594&view=rev Author: bms_fbsd Date: 2009-11-27 00:37:09 +0000 (Fri, 27 Nov 2009) Log Message: ----------- Enable the use of the GCC/G++ -pipe option by default. Linux and BSD will normally use CPU page flipping for UNIX unnamed pipes behind the scenes, which is significantly faster than using temporary files (even if /tmp is directly memory backed). It is surprising SCons does not enable this out of the box. Modified Paths: -------------- trunk/xorp/SConstruct Modified: trunk/xorp/SConstruct =================================================================== --- trunk/xorp/SConstruct 2009-11-27 00:19:41 UTC (rev 11593) +++ trunk/xorp/SConstruct 2009-11-27 00:37:09 UTC (rev 11594) @@ -364,7 +364,7 @@ '-Wcast-align', '-Wstrict-prototypes', '-Wnested-externs', - #'-pipe', + '-pipe', ]) env.AppendUnique(CXXFLAGS = [ @@ -377,7 +377,7 @@ '-Wcast-align', '-Woverloaded-virtual', '-ftemplate-depth-25', - #'-pipe', + '-pipe', ]) # NOTE: For GNU STL only at this time. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bms_fbsd at users.sourceforge.net Thu Nov 26 17:53:26 2009 From: bms_fbsd at users.sourceforge.net (bms_fbsd at users.sourceforge.net) Date: Fri, 27 Nov 2009 01:53:26 +0000 Subject: [Xorp-cvs] SF.net SVN: xorp:[11595] trunk/xorp/SConstruct Message-ID: Revision: 11595 http://xorp.svn.sourceforge.net/xorp/?rev=11595&view=rev Author: bms_fbsd Date: 2009-11-27 01:53:26 +0000 (Fri, 27 Nov 2009) Log Message: ----------- Add an 'optimize' command line variable which can be used to set the optimization level in a portable way, should we e.g. support icc or llvm more fully later on. CFLAGS/CXXFLAGS will be sanitized to enforce this option, unless 'optimize' is set to 'override'. Enable GCC -O1 optimization level by default. This trims most of the template fat from the compiled code, but should not interfere with debugging. The following command reports a 30% reduction in code size: find obj -name '*.so' | xargs size -t Modified Paths: -------------- trunk/xorp/SConstruct Modified: trunk/xorp/SConstruct =================================================================== --- trunk/xorp/SConstruct 2009-11-27 00:37:09 UTC (rev 11594) +++ trunk/xorp/SConstruct 2009-11-27 01:53:26 UTC (rev 11595) @@ -69,6 +69,9 @@ BoolVariable('debug_msg', 'Build with debug messages', False), BoolVariable('debug_fn', 'Build with function names in debug_msg output', False), BoolVariable('debug_cb', 'Build with callback debugging', False), + EnumVariable('optimize', 'Build with optimization', 'yes', + allowed_values=('no', 'yes', 'full', 'size', 'override'), + map={}, ignorecase=2), ) def tgt_guess(): @@ -145,6 +148,10 @@ if gnustrip: env['_STRIP_UNNEEDED'] = "--strip-unneeded" +# User can override this. Defaults to gcc's -O1, as this trims +# most of the template fat. +print 'Optimize code: ', env['optimize'] + # Most of our shared library tweaks are specific to GNU ld. # Check if the GNU linker is available, and print a warning if not. if env['shared']: @@ -346,6 +353,19 @@ env.AppendUnique( CXXFLAGS = Split(ARGUMENTS.get('CXXFLAGS', "-g")) ) env.AppendUnique( LINKFLAGS = Split(ARGUMENTS.get('LINKFLAGS', "")) ) +# If the user didn't override our default optimization, then +# sanitize user's CFLAGS/CXXFLAGS to not contain optimization options, +# and map to an appropriate GCC flag. +if not env['optimize'] == 'override': + env.Replace( CFLAGS = filter(lambda s: not s.startswith('-O'), + Split(env['CFLAGS']))) + env.Replace( CXXFLAGS = filter(lambda s: not s.startswith('-O'), + Split(env['CXXFLAGS']))) + bigodict = { 'no': '-O0', 'yes': '-O1', 'full': '-O2', 'size': '-Os' } + bigoflag = bigodict[env['optimize']] + env.AppendUnique(CFLAGS = [ bigoflag ]) + env.AppendUnique(CXXFLAGS = [ bigoflag ]) + env.AppendUnique(CPPDEFINES = [ ( '_FORTIFY_SOURCE', 0 ), ]) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bms_fbsd at users.sourceforge.net Thu Nov 26 18:28:49 2009 From: bms_fbsd at users.sourceforge.net (bms_fbsd at users.sourceforge.net) Date: Fri, 27 Nov 2009 02:28:49 +0000 Subject: [Xorp-cvs] SF.net SVN: xorp:[11596] trunk/xorp/SConstruct Message-ID: Revision: 11596 http://xorp.svn.sourceforge.net/xorp/?rev=11596&view=rev Author: bms_fbsd Date: 2009-11-27 02:28:48 +0000 (Fri, 27 Nov 2009) Log Message: ----------- Add a 'debug' command line variable which can be used to set the debug symbol level in a portable way. CFLAGS/CXXFLAGS will be sanitized to enforce this option, unless 'debug' is set to 'override'. This switch only affects the build as it is being staged; if 'strip' is enabled, debug information will be stripped on a 'scons install' as before. Set the default to 'full', which passes -g3 to gcc and g++. This seems reasonable, as most folk building from SVN will want full debug information. On ELF platforms, DWARF-2 normally will be used, and -g3 will produce richer C++ debugging information in the DWARF sections. Update comments. Approximate disk usage of $BUILDDIR for an amd64 self-hosted build, with optimize=yes (gcc/g++ -O1):- 705M with debug=yes (the old default) 831M with debug=full (the new default) Modified Paths: -------------- trunk/xorp/SConstruct Modified: trunk/xorp/SConstruct =================================================================== --- trunk/xorp/SConstruct 2009-11-27 01:53:26 UTC (rev 11595) +++ trunk/xorp/SConstruct 2009-11-27 02:28:48 UTC (rev 11596) @@ -69,6 +69,9 @@ BoolVariable('debug_msg', 'Build with debug messages', False), BoolVariable('debug_fn', 'Build with function names in debug_msg output', False), BoolVariable('debug_cb', 'Build with callback debugging', False), + EnumVariable('debug', 'Build with debug symbols', 'full', + allowed_values=('no', 'yes', 'full', 'override'), + map={}, ignorecase=2), EnumVariable('optimize', 'Build with optimization', 'yes', allowed_values=('no', 'yes', 'full', 'size', 'override'), map={}, ignorecase=2), @@ -166,9 +169,12 @@ env['AUTOTEST_SKIP_ERRORS'] = True print 'Ignore check errors: ', env['AUTOTEST_SKIP_ERRORS'] +# NOTE: Enabling debug messages for the whole tree may not be what you want, +# as it can lead to premature timeouts. +# Enabling callback debugging is currently not advised as it does +# inline printfs. +print 'Debug symbols: ', env['debug'] print 'Debug STL: ', env['debug_stl'] -# XXX Enabling debug messages for the whole tree may not be what you want, -# as it can lead to premature timeouts. print 'Debug messages: ', env['debug_msg'] print 'Debug function names: ', env['debug_fn'] print 'Debug callbacks: ', env['debug_cb'] @@ -349,9 +355,9 @@ SCons.Tool.FindTool(['g++'], env) is None: print gnutoolwarning % 'gcc or g++ compiler' -env.AppendUnique( CFLAGS = Split(ARGUMENTS.get('CFLAGS', "-g")) ) -env.AppendUnique( CXXFLAGS = Split(ARGUMENTS.get('CXXFLAGS', "-g")) ) -env.AppendUnique( LINKFLAGS = Split(ARGUMENTS.get('LINKFLAGS', "")) ) +env.AppendUnique( CFLAGS = Split(ARGUMENTS.get('CFLAGS', '')) ) +env.AppendUnique( CXXFLAGS = Split(ARGUMENTS.get('CXXFLAGS', '')) ) +env.AppendUnique( LINKFLAGS = Split(ARGUMENTS.get('LINKFLAGS', '')) ) # If the user didn't override our default optimization, then # sanitize user's CFLAGS/CXXFLAGS to not contain optimization options, @@ -366,6 +372,17 @@ env.AppendUnique(CFLAGS = [ bigoflag ]) env.AppendUnique(CXXFLAGS = [ bigoflag ]) +# Do the same for the flags which control debug symbols. +if not env['debug'] == 'override': + env.Replace( CFLAGS = filter(lambda s: not s.startswith('-g'), + Split(env['CFLAGS']))) + env.Replace( CXXFLAGS = filter(lambda s: not s.startswith('-g'), + Split(env['CXXFLAGS']))) + gdict = { 'no': '', 'yes': '-g', 'full': '-g3' } + gflag = gdict[env['debug']] + env.AppendUnique(CFLAGS = [ gflag ]) + env.AppendUnique(CXXFLAGS = [ gflag ]) + env.AppendUnique(CPPDEFINES = [ ( '_FORTIFY_SOURCE', 0 ), ]) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bms_fbsd at users.sourceforge.net Thu Nov 26 18:56:41 2009 From: bms_fbsd at users.sourceforge.net (bms_fbsd at users.sourceforge.net) Date: Fri, 27 Nov 2009 02:56:41 +0000 Subject: [Xorp-cvs] SF.net SVN: xorp:[11597] trunk/xorp/xrl/scripts/clnt-gen Message-ID: Revision: 11597 http://xorp.svn.sourceforge.net/xorp/?rev=11597&view=rev Author: bms_fbsd Date: 2009-11-27 02:56:41 +0000 (Fri, 27 Nov 2009) Log Message: ----------- Fix memory leak and non-reentrant behaviour in the XRL client stubs. The fix is applied to the code generator. Previously, individual Xrls for each client method were cached using a static pointer to the class Xrl instance. This meant that the allocated memory could not be reclaimed, and the code was non-reentrant. Allocation is now made through an auto_ptr private to the client stub class. If the client stub class is re-instantiated repeatedly, this may cause allocator churn. In practice, most XORP code instantiates a client only when it needs to make a call; this may need to be revisited. 'scons check' runs without error on FreeBSD 7.2-STABLE/amd64. With: find obj/*/xrl/interfaces -name '*.so' | xargs size -t +54K code size on amd64 with optimize=no. +41K code size on amd64 with optimize=yes. Modified Paths: -------------- trunk/xorp/xrl/scripts/clnt-gen Modified: trunk/xorp/xrl/scripts/clnt-gen =================================================================== --- trunk/xorp/xrl/scripts/clnt-gen 2009-11-27 02:28:48 UTC (rev 11596) +++ trunk/xorp/xrl/scripts/clnt-gen 2009-11-27 02:56:41 UTC (rev 11597) @@ -57,6 +57,7 @@ def implement_send_xrl(cls, method_no, method, ifqname): cb_name = "%sCB" % (caps_cpp_classname(method.name())) + xrl_ptr_name = "ap_xrl_%s" % method.name() atypes = ["\n\tconst char*\tdst_xrl_target_name"] for a in method.args(): atypes.append("\n\tconst %s&\t%s" % (a.cpp_type(), a.name())) @@ -64,12 +65,13 @@ s = "\nbool\n%s::send_%s(%s\n)\n{\n" \ % (cls, cpp_name(method.name()), csv(atypes)) - s += " static Xrl* x = NULL;\n" + s += " Xrl* x = %s.get();\n" % xrl_ptr_name s += "\n" s += " if (!x) {\n" s += " x = new Xrl(dst_xrl_target_name, \"%s\");\n" % ifqname for a in method.args(): s += " x->args().add(\"%s\", %s);\n" % (a.name(), a.name()) + s += " %s.reset(x);\n" % xrl_ptr_name s += " }\n" s += "\n" s += " x->set_target(dst_xrl_target_name);\n" @@ -95,6 +97,11 @@ s += "\n%s);\n\n" % xorp_indent(1) return s +def declare_xrl_auto_ptr(method_name): + xrl_ptr_name = "ap_xrl_%s" % method_name + s = xorp_indent(1) + "auto_ptr %s;\n" % xrl_ptr_name + return s + def implement_unmarshall(cls, method_no, method): nargs = [] @@ -163,6 +170,7 @@ #include "libxipc/xrl_error.hh" #include "libxipc/xrl_sender.hh" +#include """ % (protect(hh_file), protect(hh_file), modulename) return s @@ -184,6 +192,12 @@ """ for i in range(0, len(methods)): s += declare_unmarshall(methods[i].name()) + + s += "private:\n" + s += " /* Declare cached Xrl pointers */\n" + for i in range(0, len(methods)): + s += declare_xrl_auto_ptr(methods[i].name()) + s += "};\n" return s This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bms_fbsd at users.sourceforge.net Thu Nov 26 20:42:34 2009 From: bms_fbsd at users.sourceforge.net (bms_fbsd at users.sourceforge.net) Date: Fri, 27 Nov 2009 04:42:34 +0000 Subject: [Xorp-cvs] SF.net SVN: xorp:[11598] trunk/xorp Message-ID: Revision: 11598 http://xorp.svn.sourceforge.net/xorp/?rev=11598&view=rev Author: bms_fbsd Date: 2009-11-27 04:42:34 +0000 (Fri, 27 Nov 2009) Log Message: ----------- Disable XRL syntax verification in the Router Manager. Validating each XRL as it is sent is only useful for XORP developers, and should not be necessary in a production deployment. The XRLdb runtime validation support is now controlled by the SCons command line variable 'debug_xrldb'. If this variable is changed, a full rebuild should be made. The xrl/targets/*.xrls files are no longer installed unless this feature is enabled. The scope of the preprocessor define DEBUG_XRLDB is constrained to the librtrmgr SCons target only; xrldb.cc is now conditionally compiled. In all other cases, the XRLdb is elided to a 0 pointer, as it needs to be passed down the call graph from the surrounding Rtrmgr instance; method signatures have been appropriately refactored. 'scons check' passes with this change. The Router Manager has been tested with both configurations, however, any performance increase has not been measured. Modified Paths: -------------- trunk/xorp/SConstruct trunk/xorp/rtrmgr/SConscript trunk/xorp/rtrmgr/main_rtrmgr.cc trunk/xorp/rtrmgr/master_template_tree.cc trunk/xorp/rtrmgr/master_template_tree.hh trunk/xorp/rtrmgr/master_template_tree_node.cc trunk/xorp/rtrmgr/master_template_tree_node.hh trunk/xorp/rtrmgr/module_command.cc trunk/xorp/rtrmgr/module_command.hh trunk/xorp/rtrmgr/template_commands.cc trunk/xorp/rtrmgr/template_commands.hh trunk/xorp/rtrmgr/template_tree_node.hh trunk/xorp/xrl/targets/SConscript Modified: trunk/xorp/SConstruct =================================================================== --- trunk/xorp/SConstruct 2009-11-27 02:56:41 UTC (rev 11597) +++ trunk/xorp/SConstruct 2009-11-27 04:42:34 UTC (rev 11598) @@ -69,6 +69,7 @@ BoolVariable('debug_msg', 'Build with debug messages', False), BoolVariable('debug_fn', 'Build with function names in debug_msg output', False), BoolVariable('debug_cb', 'Build with callback debugging', False), + BoolVariable('debug_xrldb', 'Build with runtime XRL syntax validation in Router Manager', False), EnumVariable('debug', 'Build with debug symbols', 'full', allowed_values=('no', 'yes', 'full', 'override'), map={}, ignorecase=2), @@ -178,6 +179,7 @@ print 'Debug messages: ', env['debug_msg'] print 'Debug function names: ', env['debug_fn'] print 'Debug callbacks: ', env['debug_cb'] +print 'Debug XRL syntax: ', env['debug_xrldb'] env['CONFIGURELOG'] = str(builddir) + os.sep + 'config.log' env['CONFIGUREDIR'] = str(builddir) + os.sep + '.sconf_temp' Modified: trunk/xorp/rtrmgr/SConscript =================================================================== --- trunk/xorp/rtrmgr/SConscript 2009-11-27 02:56:41 UTC (rev 11597) +++ trunk/xorp/rtrmgr/SConscript 2009-11-27 04:42:34 UTC (rev 11598) @@ -95,12 +95,18 @@ 'unexpanded_xrl.cc', 'userdb.cc', 'xorp_client.cc', - 'xrldb.cc', 'y.boot_tab.cc', 'y.opcmd_tab.cc', 'y.tplt_tab.cc', ] +# Runtime XRL syntax validation for developers. +if env['debug_xrldb']: + librtrmgr_srcs += [ 'xrldb.cc' ] + librtrmgr_env.AppendUnique(CPPDEFINES = [ + ( 'DEBUG_XRLDB', 1 ), + ]) + # Pushdown for static paths in util.cc. xorp_paths = { "XORP_INSTALL_ROOT" : '\\"' + str(env['prefix']) + '\\"', @@ -120,6 +126,13 @@ rtrmgr_env = env.Clone() +# The Router Manager's main() function is responsible for +# creating the XRLdb, if XRL syntax debugging is enabled. +if env['debug_xrldb']: + rtrmgr_env.AppendUnique(CPPDEFINES = [ + ( 'DEBUG_XRLDB', 1 ), + ]) + rtrmgr_env.AppendUnique(LIBS = [ 'rtrmgr', 'rtrmgrbase', Modified: trunk/xorp/rtrmgr/main_rtrmgr.cc =================================================================== --- trunk/xorp/rtrmgr/main_rtrmgr.cc 2009-11-27 02:56:41 UTC (rev 11597) +++ trunk/xorp/rtrmgr/main_rtrmgr.cc 2009-11-27 04:42:34 UTC (rev 11598) @@ -78,7 +78,6 @@ // static volatile bool running = false; static string template_dir; -static string xrl_targets_dir; static string boot_file; static bool do_logfile = false; static bool do_pidfile = false; @@ -93,6 +92,7 @@ static string pidfilename; int32_t quit_time = -1; static bool daemon_mode = false; +static string xrl_targets_dir; // for DEBUG_XRLDB static void cleanup_and_exit(int errcode); @@ -122,7 +122,10 @@ fprintf(stderr, " -p Set port to run Finder on\n"); fprintf(stderr, " -q Set forced quit period\n"); fprintf(stderr, " -t Specify templates directory\n"); - fprintf(stderr, " -x Specify Xrl targets directory\n"); +#ifdef DEBUG_XRLDB + fprintf(stderr, + " -x Specify Xrl targets directory (debug_xrldb)\n"); +#endif } static void @@ -133,8 +136,10 @@ xorp_boot_file().c_str()); fprintf(stderr, " Templates directory := %s\n", xorp_template_dir().c_str()); +#ifdef DEBUG_XRLDB fprintf(stderr, " Xrl targets directory := %s\n", xorp_xrl_targets_dir().c_str()); +#endif fprintf(stderr, " Execute Xrls := %s\n", bool_c_str(default_do_exec)); fprintf(stderr, " Restart failed processes := %s\n", @@ -228,8 +233,6 @@ boot_file.c_str()); XLOG_TRACE(_verbose, "Templates directory := %s\n", template_dir.c_str()); - XLOG_TRACE(_verbose, "Xrl targets directory := %s\n", - xrl_targets_dir.c_str()); XLOG_TRACE(_verbose, "Execute Xrls := %s\n", bool_c_str(do_exec)); XLOG_TRACE(_verbose, "Restart failed processes := %s\n", @@ -237,20 +240,30 @@ XLOG_TRACE(_verbose, "Print verbose information := %s\n", bool_c_str(_verbose)); +#ifdef DEBUG_XRLDB +# define DEBUG_XRLDB_INSTANCE xrldb + XRLdb* xrldb = 0; - XRLdb* xrldb = NULL; + XLOG_TRACE(_verbose, "Xrl targets directory := %s\n", + xrl_targets_dir.c_str()); + XLOG_TRACE(_verbose, "Validate XRL syntax := %s\n", + bool_c_str(true)); try { xrldb = new XRLdb(_xrl_targets_dir, _verbose); } catch (const InitError& e) { XLOG_ERROR("Shutting down due to an init error: %s", e.why().c_str()); return (1); } +#else // ! DEBUG_XRLDB +# define DEBUG_XRLDB_INSTANCE 0 +#endif // DEBUG_XRLDB // // Read the router config template files // MasterTemplateTree* tt = new MasterTemplateTree(xorp_config_root_dir(), - *xrldb, _verbose); + DEBUG_XRLDB_INSTANCE, + _verbose); if (!tt->load_template_tree(_template_dir, errmsg)) { XLOG_ERROR("Shutting down due to an init error: %s", errmsg.c_str()); return (1); @@ -388,13 +401,16 @@ // Delete the template tree delete tt; +#ifdef DEBUG_XRLDB // Delete the XRLdb delete xrldb; +#endif // Shutdown the finder delete fs; return (errcode); +#undef DEBUG_XRLDB_INSTANCE } bool @@ -517,11 +533,19 @@ // xorp_path_init(argv[0]); template_dir = xorp_template_dir(); + boot_file = xorp_boot_file(); xrl_targets_dir = xorp_xrl_targets_dir(); - boot_file = xorp_boot_file(); +#ifdef DEBUG_XRLDB +#define RTRMGR_X_OPT "" +#else +#define RTRMGR_X_OPT "x:" +#endif + + static const char* optstring = + "da:l:L:n:t:b:" RTRMGR_X_OPT "i:P:p:q:Nrvh"; int c; - while ((c = getopt(argc, argv, "da:l:L:n:t:b:x:i:P:p:q:Nrvh")) != EOF) { + while ((c = getopt(argc, argv, optstring)) != EOF) { switch(c) { case 'd': daemon_mode = true; @@ -566,9 +590,11 @@ case 'b': boot_file = optarg; break; +#ifdef DEBUG_XRLDB case 'x': xrl_targets_dir = optarg; break; +#endif case 'q': quit_time = atoi(optarg); break; @@ -653,6 +679,7 @@ errcode = rtrmgr.run(); cleanup_and_exit(errcode); +#undef RTRMGR_X_OPT } void Modified: trunk/xorp/rtrmgr/master_template_tree.cc =================================================================== --- trunk/xorp/rtrmgr/master_template_tree.cc 2009-11-27 02:56:41 UTC (rev 11597) +++ trunk/xorp/rtrmgr/master_template_tree.cc 2009-11-27 04:42:34 UTC (rev 11598) @@ -36,7 +36,7 @@ MasterTemplateTree::MasterTemplateTree(const string& xorp_root_dir, - XRLdb& xrldb, + XRLdb* xrldb, bool verbose) throw (InitError) : TemplateTree(xorp_root_dir, verbose), _xrldb(xrldb) Modified: trunk/xorp/rtrmgr/master_template_tree.hh =================================================================== --- trunk/xorp/rtrmgr/master_template_tree.hh 2009-11-27 02:56:41 UTC (rev 11597) +++ trunk/xorp/rtrmgr/master_template_tree.hh 2009-11-27 04:42:34 UTC (rev 11598) @@ -22,15 +22,19 @@ #ifndef __RTRMGR_MASTER_TEMPLATE_TREE_HH__ #define __RTRMGR_MASTER_TEMPLATE_TREE_HH__ +class XRLdb; +#ifdef DEBUG_XRLDB #include "xrldb.hh" +#endif + #include "template_tree.hh" #include "master_template_tree_node.hh" class MasterTemplateTree : public TemplateTree { public: MasterTemplateTree(const string& xorp_root_dir, - XRLdb& xrldb, + XRLdb* xrldb, bool verbose) throw (InitError); bool load_template_tree(const string& config_template_dir, @@ -39,7 +43,7 @@ void add_cmd(char* cmd) throw (ParseError); void add_cmd_action(const string& cmd, const list& action) throw (ParseError); - const XRLdb& xrldb() const { return _xrldb; } + const XRLdb* xrldb() const { return _xrldb; } const MasterTemplateTreeNode* find_node(const list& path_segments) const @@ -55,7 +59,7 @@ bool expand_master_template_tree(string& error_msg); bool check_master_template_tree(string& error_msg); - XRLdb _xrldb; + XRLdb* _xrldb; }; #endif // __RTRMGR_MASTER_TEMPLATE_TREE_HH__ Modified: trunk/xorp/rtrmgr/master_template_tree_node.cc =================================================================== --- trunk/xorp/rtrmgr/master_template_tree_node.cc 2009-11-27 02:56:41 UTC (rev 11597) +++ trunk/xorp/rtrmgr/master_template_tree_node.cc 2009-11-27 04:42:34 UTC (rev 11598) @@ -76,7 +76,7 @@ void MasterTemplateTreeNode::add_action(const string& cmd, const list& action_list, - const XRLdb& xrldb) throw (ParseError) + const XRLdb* xrldb) throw (ParseError) { BaseCommand* command; map::iterator iter; Modified: trunk/xorp/rtrmgr/master_template_tree_node.hh =================================================================== --- trunk/xorp/rtrmgr/master_template_tree_node.hh 2009-11-27 02:56:41 UTC (rev 11597) +++ trunk/xorp/rtrmgr/master_template_tree_node.hh 2009-11-27 04:42:34 UTC (rev 11598) @@ -41,7 +41,7 @@ void add_cmd(const string& cmd, TemplateTree& tt) throw (ParseError); void add_action(const string& cmd, const list& action_list, - const XRLdb& xrldb) throw (ParseError); + const XRLdb* xrldb) throw (ParseError); bool expand_master_template_tree(string& error_msg); bool check_master_template_tree(string& error_msg) const; Modified: trunk/xorp/rtrmgr/module_command.cc =================================================================== --- trunk/xorp/rtrmgr/module_command.cc 2009-11-27 02:56:41 UTC (rev 11597) +++ trunk/xorp/rtrmgr/module_command.cc 2009-11-27 04:42:34 UTC (rev 11598) @@ -35,9 +35,11 @@ #include "template_tree_node.hh" #include "master_conf_tree_node.hh" #include "util.hh" + +#ifdef DEBUG_XRLDB #include "xrldb.hh" +#endif - static string strip_quotes(const string& command, const string& value) throw (ParseError) { @@ -91,7 +93,7 @@ } void -ModuleCommand::add_action(const list& action, const XRLdb& xrldb) +ModuleCommand::add_action(const list& action, const XRLdb* xrldb) throw (ParseError) { size_t expected_action_size = 2; Modified: trunk/xorp/rtrmgr/module_command.hh =================================================================== --- trunk/xorp/rtrmgr/module_command.hh 2009-11-27 02:56:41 UTC (rev 11597) +++ trunk/xorp/rtrmgr/module_command.hh 2009-11-27 04:42:34 UTC (rev 11598) @@ -39,7 +39,7 @@ ~ModuleCommand(); void add_action(const list& action, - const XRLdb& xrldb) throw (ParseError); + const XRLdb* xrldb) throw (ParseError); virtual bool expand_actions(string& error_msg); virtual bool check_referred_variables(string& error_msg) const; Modified: trunk/xorp/rtrmgr/template_commands.cc =================================================================== --- trunk/xorp/rtrmgr/template_commands.cc 2009-11-27 02:56:41 UTC (rev 11597) +++ trunk/xorp/rtrmgr/template_commands.cc 2009-11-27 04:42:34 UTC (rev 11598) @@ -35,7 +35,10 @@ #include "template_tree.hh" #include "template_tree_node.hh" #include "util.hh" + +#ifdef DEBUG_XRLDB #include "xrldb.hh" +#endif #include "libxipc/xrl_atom_encoding.hh" @@ -161,11 +164,18 @@ /***********************************************************************/ XrlAction::XrlAction(TemplateTreeNode& template_tree_node, - const list& action, const XRLdb& xrldb) + const list& action, const XRLdb* xrldb) throw (ParseError) : Action(template_tree_node, action), - _xrldb(xrldb) + _xrldb(0) { +#ifdef DEBUG_XRLDB + XLOG_ASSERT(0 != dynamic_cast(xrldb)); + _xrldb = xrldb; +#else + UNUSED(xrldb); +#endif + list xrl_parts = _split_cmd; debug_msg("XrlAction constructor\n"); @@ -271,19 +281,24 @@ return false; } +#ifdef DEBUG_XRLDB if (check_xrl_is_valid(_action, _xrldb, error_msg) != true) return false; +#endif return true; } +#ifdef DEBUG_XRLDB bool -XrlAction::check_xrl_is_valid(const list& action, const XRLdb& xrldb, +XrlAction::check_xrl_is_valid(const list& action, + const XRLdb* xrldb, string& error_msg) { const string module_name = template_tree_node().module_name(); XLOG_ASSERT(action.front() == "xrl"); + XLOG_ASSERT(0 != dynamic_cast(xrldb)); list::const_iterator xrl_pos = ++action.begin(); if (xrl_pos == action.end()) { @@ -450,13 +465,13 @@ } debug_msg("XrlAction after cleaning:\n%s\n", cleaned_xrl.c_str()); - if (xrldb.check_xrl_syntax(cleaned_xrl) == false) { + if (xrldb->check_xrl_syntax(cleaned_xrl) == false) { error_msg = c_format("Syntax error in module %s XRL %s: " "invalid XRL syntax", module_name.c_str(), cleaned_xrl.c_str()); return false; } - XRLMatchType match = xrldb.check_xrl_exists(cleaned_xrl); + XRLMatchType match = xrldb->check_xrl_exists(cleaned_xrl); switch (match) { case MATCH_FAIL: case MATCH_RSPEC: { @@ -479,6 +494,7 @@ return true; } +#endif // DEBUG_XRLDB int XrlAction::execute(const MasterConfigTreeNode& ctn, @@ -1263,7 +1279,7 @@ } void -Command::add_action(const list& action, const XRLdb& xrldb) +Command::add_action(const list& action, const XRLdb* xrldb) throw (ParseError) { string action_type; Modified: trunk/xorp/rtrmgr/template_commands.hh =================================================================== --- trunk/xorp/rtrmgr/template_commands.hh 2009-11-27 02:56:41 UTC (rev 11597) +++ trunk/xorp/rtrmgr/template_commands.hh 2009-11-27 04:42:34 UTC (rev 11598) @@ -61,7 +61,7 @@ class XrlAction : public Action { public: XrlAction(TemplateTreeNode& template_tree_node, const list& action, - const XRLdb& xrldb) throw (ParseError); + const XRLdb* xrldb) throw (ParseError); virtual bool expand_action(string& error_msg); int execute(const MasterConfigTreeNode& ctn, TaskManager& task_manager, @@ -79,18 +79,20 @@ string affected_module() const; private: +#ifdef DEBUG_XRLDB bool check_xrl_is_valid(const list& action, - const XRLdb& xrldb, string& error_msg); + const XRLdb* xrldb, string& error_msg); +#endif template bool expand_vars(const TreeNode& tn, const string& s, string& result) const; - const XRLdb& _xrldb; string _module_name; list _split_request; string _request; list _split_response; string _response; + const XRLdb* _xrldb; }; class ProgramAction : public Action { @@ -129,7 +131,7 @@ Command(TemplateTreeNode& template_tree_node, const string& cmd_name); virtual ~Command(); - void add_action(const list& action, const XRLdb& xrldb) + void add_action(const list& action, const XRLdb* xrldb) throw (ParseError); int execute(MasterConfigTreeNode& ctn, TaskManager& task_manager) const; void xrl_action_complete(const XrlError& err, Modified: trunk/xorp/rtrmgr/template_tree_node.hh =================================================================== --- trunk/xorp/rtrmgr/template_tree_node.hh 2009-11-27 02:56:41 UTC (rev 11597) +++ trunk/xorp/rtrmgr/template_tree_node.hh 2009-11-27 04:42:34 UTC (rev 11598) @@ -33,9 +33,11 @@ #include "config_operators.hh" #include "rtrmgr_error.hh" #include "xorp_client.hh" + +#ifdef DEBUG_XRLDB #include "xrldb.hh" +#endif - enum TTNodeType { NODE_VOID = 0, NODE_TEXT = 1, Modified: trunk/xorp/xrl/targets/SConscript =================================================================== --- trunk/xorp/xrl/targets/SConscript 2009-11-27 02:56:41 UTC (rev 11597) +++ trunk/xorp/xrl/targets/SConscript 2009-11-27 04:42:34 UTC (rev 11598) @@ -99,7 +99,8 @@ if base[:4] != "test": if is_shared: env.Alias('install', env.InstallLibrary('$libdir', lib)) - env.Alias('install', env.InstallData(xrlspath, xrls)) + if env['debug_xrldb']: + env.Alias('install', env.InstallData(xrlspath, xrls)) return lib This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bms_fbsd at users.sourceforge.net Thu Nov 26 21:36:24 2009 From: bms_fbsd at users.sourceforge.net (bms_fbsd at users.sourceforge.net) Date: Fri, 27 Nov 2009 05:36:24 +0000 Subject: [Xorp-cvs] SF.net SVN: xorp:[11599] trunk/xorp/fea/SConscript Message-ID: Revision: 11599 http://xorp.svn.sourceforge.net/xorp/?rev=11599&view=rev Author: bms_fbsd Date: 2009-11-27 05:36:24 +0000 (Fri, 27 Nov 2009) Log Message: ----------- Comment what the otherwise obscure '-z defs' linker flag does here. Modified Paths: -------------- trunk/xorp/fea/SConscript Modified: trunk/xorp/fea/SConscript =================================================================== --- trunk/xorp/fea/SConscript 2009-11-27 04:42:34 UTC (rev 11598) +++ trunk/xorp/fea/SConscript 2009-11-27 05:36:24 UTC (rev 11599) @@ -110,6 +110,7 @@ env.PrependUnique(LIBS = libfea_linkorder) +# Report unresolved symbol references when building the FEA. if is_shared: env.AppendUnique(LINKFLAGS = [ '-Wl,-z,defs', ]) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bms_fbsd at users.sourceforge.net Thu Nov 26 21:59:53 2009 From: bms_fbsd at users.sourceforge.net (bms_fbsd at users.sourceforge.net) Date: Fri, 27 Nov 2009 05:59:53 +0000 Subject: [Xorp-cvs] SF.net SVN: xorp:[11600] trunk/xorp/fea Message-ID: Revision: 11600 http://xorp.svn.sourceforge.net/xorp/?rev=11600&view=rev Author: bms_fbsd Date: 2009-11-27 05:59:53 +0000 (Fri, 27 Nov 2009) Log Message: ----------- Incremental .so naming dragnet. XORP may be installed in a shared system location in the near future; start to clean up the tree to make this possible. Rename all FEA libraries to begin with 'libxorp_fea_*', including any intermediate static libraries. Modified Paths: -------------- trunk/xorp/fea/SConscript trunk/xorp/fea/data_plane/control_socket/SConscript trunk/xorp/fea/data_plane/fibconfig/SConscript trunk/xorp/fea/data_plane/firewall/SConscript trunk/xorp/fea/data_plane/ifconfig/SConscript trunk/xorp/fea/data_plane/io/SConscript trunk/xorp/fea/data_plane/managers/SConscript trunk/xorp/fea/tests/SConscript Modified: trunk/xorp/fea/SConscript =================================================================== --- trunk/xorp/fea/SConscript 2009-11-27 05:36:24 UTC (rev 11599) +++ trunk/xorp/fea/SConscript 2009-11-27 05:59:53 UTC (rev 11600) @@ -58,7 +58,7 @@ '$BUILDDIR/libcomm', ]) -libfdp_srcs = [ +libxfdp_srcs = [ 'fea_data_plane_manager.cc', 'fibconfig_forwarding.cc', 'ifconfig_property.cc', @@ -68,19 +68,19 @@ 'io_tcpudp.cc', ] -libfea_linkorder = [ - 'xorp_data_plane_managers', - 'xorp_fibconfig', - 'xorp_firewall', # XXX? - 'xorp_ifconfig', - 'xorp_io', - 'xorp_control_socket', +libxorp_fea_linkorder = [ + 'xorp_fea_data_plane_managers', + 'xorp_fea_fibconfig', + 'xorp_fea_firewall', # XXX? + 'xorp_fea_ifconfig', + 'xorp_fea_io', + 'xorp_fea_control_socket', ] if not is_shared: - libfea_linkorder.append('libfea_data_plane_base') + libxorp_fea_linkorder.append('libxorp_fea_data_plane_base') -libfea_linkorder += [ +libxorp_fea_linkorder += [ 'feafibclientxif', 'fearawlinkclientxif', 'fearawpkt4clientxif', @@ -108,13 +108,13 @@ 'xorp' ] -env.PrependUnique(LIBS = libfea_linkorder) +env.PrependUnique(LIBS = libxorp_fea_linkorder) # Report unresolved symbol references when building the FEA. if is_shared: env.AppendUnique(LINKFLAGS = [ '-Wl,-z,defs', ]) -libfeasrcs = [ +libxorp_fea_srcs = [ 'fea_io.cc', 'fea_node.cc', 'fibconfig.cc', @@ -148,15 +148,18 @@ ] if is_shared: - libfeasrcs += libfdp_srcs - libfea = env.SharedLibrary(target = 'libfea', source = libfeasrcs) + libxorp_fea_srcs += libxfdp_srcs + libxorp_fea = env.SharedLibrary(target = 'libxorp_fea', + source = libxorp_fea_srcs) env.Alias('install', - env.InstallLibrary('$libdir', libfea)) + env.InstallLibrary('$libdir', libxorp_fea)) else: # Use an intermediate static lib to deal with some dependencies. - libfdp = env.StaticLibrary(target = 'libfea_data_plane_base', source = libfdp_srcs) - env.PrependUnique(LIBS = [ libfdp ]) - libfea = env.StaticLibrary(target = 'libfea', source = libfeasrcs) + libxfdp = env.StaticLibrary(target = 'libxorp_fea_data_plane_base', + source = libxfdp_srcs) + env.PrependUnique(LIBS = [ libxfdp ]) + libxorp_fea = env.StaticLibrary(target = 'libxorp_fea', + source = libxorp_fea_srcs) ####################### @@ -172,10 +175,10 @@ if is_shared: env.PrependUnique(LIBS = [ - 'fea', + 'xorp_fea', # -lxorp_fea, not the xorp_fea executable ]) else: - env.PrependUnique(LIBS = [ libfea ]) + env.PrependUnique(LIBS = [ libxorp_fea ]) feasrcs = [ 'xorp_fea.cc', @@ -212,4 +215,4 @@ ####################### -Default(libfea, fea, feadummy) +Default(libxorp_fea, fea, feadummy) Modified: trunk/xorp/fea/data_plane/control_socket/SConscript =================================================================== --- trunk/xorp/fea/data_plane/control_socket/SConscript 2009-11-27 05:36:24 UTC (rev 11599) +++ trunk/xorp/fea/data_plane/control_socket/SConscript 2009-11-27 05:59:53 UTC (rev 11600) @@ -41,10 +41,12 @@ ] if is_shared: - libxcs = env.SharedLibrary(target = 'libxorp_control_socket', source = sources) + libxcs = env.SharedLibrary(target = 'libxorp_fea_control_socket', + source = sources) env.Alias('install', env.InstallLibrary('$libdir', libxcs)) else: - libxcs = env.StaticLibrary(target = 'libxorp_control_socket', source = sources) + libxcs = env.StaticLibrary(target = 'libxorp_fea_control_socket', + source = sources) Default(libxcs) Modified: trunk/xorp/fea/data_plane/fibconfig/SConscript =================================================================== --- trunk/xorp/fea/data_plane/fibconfig/SConscript 2009-11-27 05:36:24 UTC (rev 11599) +++ trunk/xorp/fea/data_plane/fibconfig/SConscript 2009-11-27 05:59:53 UTC (rev 11600) @@ -76,10 +76,12 @@ ] if is_shared: - libxfc = env.SharedLibrary(target = 'libxorp_fibconfig', source = sources) + libxfc = env.SharedLibrary(target = 'libxorp_fea_fibconfig', + source = sources) env.Alias('install', env.InstallLibrary('$libdir', libxfc)) else: - libxfc = env.StaticLibrary(target = 'libxorp_fibconfig', source = sources) + libxfc = env.StaticLibrary(target = 'libxorp_fea_fibconfig', + source = sources) Default(libxfc) Modified: trunk/xorp/fea/data_plane/firewall/SConscript =================================================================== --- trunk/xorp/fea/data_plane/firewall/SConscript 2009-11-27 05:36:24 UTC (rev 11599) +++ trunk/xorp/fea/data_plane/firewall/SConscript 2009-11-27 05:59:53 UTC (rev 11600) @@ -42,10 +42,12 @@ ] if is_shared: - libxfw = env.SharedLibrary(target = 'libxorp_firewall', source = sources) + libxfw = env.SharedLibrary(target = 'libxorp_fea_firewall', + source = sources) env.Alias('install', env.InstallLibrary('$libdir', libxfw)) else: - libxfw = env.StaticLibrary(target = 'libxorp_firewall', source = sources) + libxfw = env.StaticLibrary(target = 'libxorp_fea_firewall', + source = sources) Default(libxfw) Modified: trunk/xorp/fea/data_plane/ifconfig/SConscript =================================================================== --- trunk/xorp/fea/data_plane/ifconfig/SConscript 2009-11-27 05:36:24 UTC (rev 11599) +++ trunk/xorp/fea/data_plane/ifconfig/SConscript 2009-11-27 05:59:53 UTC (rev 11600) @@ -68,9 +68,11 @@ ] if is_shared: - libxifc = env.SharedLibrary(target = 'libxorp_ifconfig', source = sources) + libxifc = env.SharedLibrary(target = 'libxorp_fea_ifconfig', + source = sources) else: - libxifc = env.StaticLibrary(target = 'libxorp_ifconfig', source = sources) + libxifc = env.StaticLibrary(target = 'libxorp_fea_ifconfig', + source = sources) if is_shared: env.Alias('install', Modified: trunk/xorp/fea/data_plane/io/SConscript =================================================================== --- trunk/xorp/fea/data_plane/io/SConscript 2009-11-27 05:36:24 UTC (rev 11599) +++ trunk/xorp/fea/data_plane/io/SConscript 2009-11-27 05:59:53 UTC (rev 11600) @@ -40,10 +40,10 @@ ] if is_shared: - libxio = env.SharedLibrary(target = 'libxorp_io', source = sources) + libxio = env.SharedLibrary(target = 'libxorp_fea_io', source = sources) env.Alias('install', env.InstallLibrary('$libdir', libxio)) else: - libxio = env.StaticLibrary(target = 'libxorp_io', source = sources) + libxio = env.StaticLibrary(target = 'libxorp_fea_io', source = sources) Default(libxio) Modified: trunk/xorp/fea/data_plane/managers/SConscript =================================================================== --- trunk/xorp/fea/data_plane/managers/SConscript 2009-11-27 05:36:24 UTC (rev 11599) +++ trunk/xorp/fea/data_plane/managers/SConscript 2009-11-27 05:59:53 UTC (rev 11600) @@ -39,9 +39,11 @@ ] if is_shared: - libxdpm = env.SharedLibrary(target = 'libxorp_data_plane_managers', source = sources) + libxdpm = env.SharedLibrary(target = 'libxorp_fea_data_plane_managers', + source = sources) else: - libxdpm = env.StaticLibrary(target = 'libxorp_data_plane_managers', source = sources) + libxdpm = env.StaticLibrary(target = 'libxorp_fea_data_plane_managers', + source = sources) if is_shared: env.Alias('install', Modified: trunk/xorp/fea/tests/SConscript =================================================================== --- trunk/xorp/fea/tests/SConscript 2009-11-27 05:36:24 UTC (rev 11599) +++ trunk/xorp/fea/tests/SConscript 2009-11-27 05:59:53 UTC (rev 11600) @@ -54,19 +54,19 @@ '$BUILDDIR/libcomm', ]) -libfea_linkorder = [ - 'xorp_data_plane_managers', - 'xorp_fibconfig', - 'xorp_firewall', # XXX? - 'xorp_ifconfig', - 'xorp_io', - 'xorp_control_socket', +libxorp_fea_linkorder = [ + 'xorp_fea_data_plane_managers', + 'xorp_fea_fibconfig', + 'xorp_fea_firewall', # XXX? + 'xorp_fea_ifconfig', + 'xorp_fea_io', + 'xorp_fea_control_socket', ] if not is_shared: - libfea_linkorder.append('libfea_data_plane_base') + libxorp_fea_linkorder.append('libxorp_fea_data_plane_base') -libfea_linkorder += [ +libxorp_fea_linkorder += [ 'feafibclientxif', 'fearawlinkclientxif', 'fearawpkt4clientxif', @@ -94,7 +94,7 @@ 'xorp' ] -env.PrependUnique(LIBS = libfea_linkorder) +env.PrependUnique(LIBS = libxorp_fea_linkorder) ############### end linking gunk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bms_fbsd at users.sourceforge.net Thu Nov 26 22:04:53 2009 From: bms_fbsd at users.sourceforge.net (bms_fbsd at users.sourceforge.net) Date: Fri, 27 Nov 2009 06:04:53 +0000 Subject: [Xorp-cvs] SF.net SVN: xorp:[11601] trunk/xorp Message-ID: Revision: 11601 http://xorp.svn.sourceforge.net/xorp/?rev=11601&view=rev Author: bms_fbsd Date: 2009-11-27 06:04:53 +0000 (Fri, 27 Nov 2009) Log Message: ----------- Rename libmrt => libxorp_mrt Modified Paths: -------------- trunk/xorp/contrib/mld6igmp_lite/SConscript trunk/xorp/fea/SConscript trunk/xorp/fea/tests/SConscript trunk/xorp/mld6igmp/SConscript trunk/xorp/mrt/SConscript trunk/xorp/mrt/tests/SConscript trunk/xorp/pim/SConscript Modified: trunk/xorp/contrib/mld6igmp_lite/SConscript =================================================================== --- trunk/xorp/contrib/mld6igmp_lite/SConscript 2009-11-27 05:59:53 UTC (rev 11600) +++ trunk/xorp/contrib/mld6igmp_lite/SConscript 2009-11-27 06:04:53 UTC (rev 11601) @@ -55,7 +55,7 @@ 'findereventnotifierxif', 'feaifmgrmirrorbase', 'mld6igmpbase', - 'mrt', + 'xorp_mrt', 'xipc', 'xorp', 'proto', Modified: trunk/xorp/fea/SConscript =================================================================== --- trunk/xorp/fea/SConscript 2009-11-27 05:59:53 UTC (rev 11600) +++ trunk/xorp/fea/SConscript 2009-11-27 06:04:53 UTC (rev 11601) @@ -100,7 +100,7 @@ 'clibase', 'feabase', 'mfeabase', - 'mrt', + 'xorp_mrt', 'tecla_xorp', 'proto', 'xipc', Modified: trunk/xorp/fea/tests/SConscript =================================================================== --- trunk/xorp/fea/tests/SConscript 2009-11-27 05:59:53 UTC (rev 11600) +++ trunk/xorp/fea/tests/SConscript 2009-11-27 06:04:53 UTC (rev 11601) @@ -86,7 +86,7 @@ 'clibase', 'feabase', 'mfeabase', - 'mrt', + 'xorp_mrt', 'tecla_xorp', 'proto', 'xipc', Modified: trunk/xorp/mld6igmp/SConscript =================================================================== --- trunk/xorp/mld6igmp/SConscript 2009-11-27 05:59:53 UTC (rev 11600) +++ trunk/xorp/mld6igmp/SConscript 2009-11-27 06:04:53 UTC (rev 11601) @@ -54,7 +54,7 @@ 'findereventnotifierxif', 'feaifmgrmirrorbase', 'mld6igmpbase', - 'mrt', + 'xorp_mrt', 'proto', 'xipc', 'xorp', Modified: trunk/xorp/mrt/SConscript =================================================================== --- trunk/xorp/mrt/SConscript 2009-11-27 05:59:53 UTC (rev 11600) +++ trunk/xorp/mrt/SConscript 2009-11-27 06:04:53 UTC (rev 11601) @@ -35,12 +35,12 @@ ] if is_shared: - libmrt = env.SharedLibrary(target = 'libmrt', source = sources) + libxorp_mrt = env.SharedLibrary(target = 'libxorp_mrt', source = sources) else: - libmrt = env.StaticLibrary(target = 'libmrt', source = sources) + libxorp_mrt = env.StaticLibrary(target = 'libxorp_mrt', source = sources) if is_shared: env.Alias('install', - env.InstallLibrary('$libdir', libmrt)) + env.InstallLibrary('$libdir', libxorp_mrt)) -Default(libmrt) +Default(libxorp_mrt) Modified: trunk/xorp/mrt/tests/SConscript =================================================================== --- trunk/xorp/mrt/tests/SConscript 2009-11-27 05:59:53 UTC (rev 11600) +++ trunk/xorp/mrt/tests/SConscript 2009-11-27 06:04:53 UTC (rev 11601) @@ -35,7 +35,7 @@ ]) env.AppendUnique(LIBS = [ - 'mrt', + 'xorp_mrt', 'xorp', 'comm', ]) Modified: trunk/xorp/pim/SConscript =================================================================== --- trunk/xorp/pim/SConscript 2009-11-27 05:59:53 UTC (rev 11600) +++ trunk/xorp/pim/SConscript 2009-11-27 06:04:53 UTC (rev 11601) @@ -57,7 +57,7 @@ 'findereventnotifierxif', 'feaifmgrmirrorbase', 'pimbase', - 'mrt', + 'xorp_mrt', 'proto', 'xipc', 'xorp', This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bms_fbsd at users.sourceforge.net Thu Nov 26 22:12:01 2009 From: bms_fbsd at users.sourceforge.net (bms_fbsd at users.sourceforge.net) Date: Fri, 27 Nov 2009 06:12:01 +0000 Subject: [Xorp-cvs] SF.net SVN: xorp:[11602] trunk/xorp Message-ID: Revision: 11602 http://xorp.svn.sourceforge.net/xorp/?rev=11602&view=rev Author: bms_fbsd Date: 2009-11-27 06:12:00 +0000 (Fri, 27 Nov 2009) Log Message: ----------- Rename libproto => libxorp_proto Modified Paths: -------------- trunk/xorp/bgp/tests/SConscript trunk/xorp/cli/SConscript trunk/xorp/cli/tests/SConscript trunk/xorp/contrib/mld6igmp_lite/SConscript trunk/xorp/contrib/olsr/SConscript trunk/xorp/fea/SConscript trunk/xorp/fea/tests/SConscript trunk/xorp/fea/tools/SConscript trunk/xorp/fib2mrib/SConscript trunk/xorp/libproto/SConscript trunk/xorp/libproto/tests/SConscript trunk/xorp/mld6igmp/SConscript trunk/xorp/ospf/SConscript trunk/xorp/ospf/tests/SConscript trunk/xorp/ospf/tools/SConscript trunk/xorp/pim/SConscript trunk/xorp/policy/SConscript trunk/xorp/rib/SConscript trunk/xorp/rib/tests/SConscript trunk/xorp/rib/tools/SConscript trunk/xorp/rip/SConscript trunk/xorp/rip/tools/SConscript trunk/xorp/rtrmgr/SConscript trunk/xorp/static_routes/SConscript trunk/xorp/vrrp/SConscript Modified: trunk/xorp/bgp/tests/SConscript =================================================================== --- trunk/xorp/bgp/tests/SConscript 2009-11-27 06:04:53 UTC (rev 11601) +++ trunk/xorp/bgp/tests/SConscript 2009-11-27 06:12:00 UTC (rev 11602) @@ -57,7 +57,7 @@ 'policybackend', 'policycommon', 'xipc', - 'proto', + 'xorp_proto', 'xorp', 'comm', ]) Modified: trunk/xorp/cli/SConscript =================================================================== --- trunk/xorp/cli/SConscript 2009-11-27 06:04:53 UTC (rev 11601) +++ trunk/xorp/cli/SConscript 2009-11-27 06:12:00 UTC (rev 11602) @@ -50,7 +50,7 @@ 'cliprocessorxif', 'clibase', 'tecla_xorp', - 'proto', + 'xorp_proto', 'xipc', 'comm', 'xorp', Modified: trunk/xorp/cli/tests/SConscript =================================================================== --- trunk/xorp/cli/tests/SConscript 2009-11-27 06:04:53 UTC (rev 11601) +++ trunk/xorp/cli/tests/SConscript 2009-11-27 06:12:00 UTC (rev 11602) @@ -47,7 +47,7 @@ 'finder', 'tecla_xorp', 'xipc', - 'proto', + 'xorp_proto', 'xorp', 'comm', ]) Modified: trunk/xorp/contrib/mld6igmp_lite/SConscript =================================================================== --- trunk/xorp/contrib/mld6igmp_lite/SConscript 2009-11-27 06:04:53 UTC (rev 11601) +++ trunk/xorp/contrib/mld6igmp_lite/SConscript 2009-11-27 06:12:00 UTC (rev 11602) @@ -58,7 +58,7 @@ 'xorp_mrt', 'xipc', 'xorp', - 'proto', + 'xorp_proto', 'comm' ]) Modified: trunk/xorp/contrib/olsr/SConscript =================================================================== --- trunk/xorp/contrib/olsr/SConscript 2009-11-27 06:04:53 UTC (rev 11601) +++ trunk/xorp/contrib/olsr/SConscript 2009-11-27 06:12:00 UTC (rev 11602) @@ -65,7 +65,7 @@ 'feaifmgrmirrorbase', 'xipc', 'xorp', - 'proto', + 'xorp_proto', 'comm', ]) Modified: trunk/xorp/fea/SConscript =================================================================== --- trunk/xorp/fea/SConscript 2009-11-27 06:04:53 UTC (rev 11601) +++ trunk/xorp/fea/SConscript 2009-11-27 06:12:00 UTC (rev 11602) @@ -102,7 +102,7 @@ 'mfeabase', 'xorp_mrt', 'tecla_xorp', - 'proto', + 'xorp_proto', 'xipc', 'comm', 'xorp' Modified: trunk/xorp/fea/tests/SConscript =================================================================== --- trunk/xorp/fea/tests/SConscript 2009-11-27 06:04:53 UTC (rev 11601) +++ trunk/xorp/fea/tests/SConscript 2009-11-27 06:12:00 UTC (rev 11602) @@ -88,7 +88,7 @@ 'mfeabase', 'xorp_mrt', 'tecla_xorp', - 'proto', + 'xorp_proto', 'xipc', 'comm', 'xorp' Modified: trunk/xorp/fea/tools/SConscript =================================================================== --- trunk/xorp/fea/tools/SConscript 2009-11-27 06:04:53 UTC (rev 11601) +++ trunk/xorp/fea/tools/SConscript 2009-11-27 06:12:00 UTC (rev 11602) @@ -45,7 +45,7 @@ 'feaifmgrmirrorbase', 'xipc', 'xorp', - 'proto', + 'xorp_proto', 'comm', ]) Modified: trunk/xorp/fib2mrib/SConscript =================================================================== --- trunk/xorp/fib2mrib/SConscript 2009-11-27 06:04:53 UTC (rev 11601) +++ trunk/xorp/fib2mrib/SConscript 2009-11-27 06:12:00 UTC (rev 11602) @@ -57,7 +57,7 @@ 'feaifmgrmirrorbase', 'xipc', 'xorp', - 'proto', + 'xorp_proto', 'comm' ]) Modified: trunk/xorp/libproto/SConscript =================================================================== --- trunk/xorp/libproto/SConscript 2009-11-27 06:04:53 UTC (rev 11601) +++ trunk/xorp/libproto/SConscript 2009-11-27 06:12:00 UTC (rev 11602) @@ -40,12 +40,14 @@ ] if is_shared: - libproto = env.SharedLibrary(target = 'libproto', source = sources) + libxorp_proto = env.SharedLibrary(target = 'libxorp_proto', + source = sources) else: - libproto = env.StaticLibrary(target = 'libproto', source = sources) + libxorp_proto = env.StaticLibrary(target = 'libxorp_proto', + source = sources) if is_shared: env.Alias("install", - env.InstallLibrary('$libdir', libproto)) + env.InstallLibrary('$libdir', libxorp_proto)) -Default(libproto) +Default(libxorp_proto) Modified: trunk/xorp/libproto/tests/SConscript =================================================================== --- trunk/xorp/libproto/tests/SConscript 2009-11-27 06:04:53 UTC (rev 11601) +++ trunk/xorp/libproto/tests/SConscript 2009-11-27 06:12:00 UTC (rev 11602) @@ -38,7 +38,7 @@ ]) env.AppendUnique(LIBS = [ - 'proto', + 'xorp_proto', 'xorp', 'comm', ]) Modified: trunk/xorp/mld6igmp/SConscript =================================================================== --- trunk/xorp/mld6igmp/SConscript 2009-11-27 06:04:53 UTC (rev 11601) +++ trunk/xorp/mld6igmp/SConscript 2009-11-27 06:12:00 UTC (rev 11602) @@ -55,7 +55,7 @@ 'feaifmgrmirrorbase', 'mld6igmpbase', 'xorp_mrt', - 'proto', + 'xorp_proto', 'xipc', 'xorp', 'comm' Modified: trunk/xorp/ospf/SConscript =================================================================== --- trunk/xorp/ospf/SConscript 2009-11-27 06:04:53 UTC (rev 11601) +++ trunk/xorp/ospf/SConscript 2009-11-27 06:12:00 UTC (rev 11602) @@ -66,7 +66,7 @@ 'feaifmgrmirrorbase', 'xipc', 'xorp', - 'proto', + 'xorp_proto', 'comm', ]) Modified: trunk/xorp/ospf/tests/SConscript =================================================================== --- trunk/xorp/ospf/tests/SConscript 2009-11-27 06:04:53 UTC (rev 11601) +++ trunk/xorp/ospf/tests/SConscript 2009-11-27 06:12:00 UTC (rev 11602) @@ -55,7 +55,7 @@ 'policybackend', 'policycommon', 'xipc', - 'proto', + 'xorp_proto', 'xorp', 'comm', ]) Modified: trunk/xorp/ospf/tools/SConscript =================================================================== --- trunk/xorp/ospf/tools/SConscript 2009-11-27 06:04:53 UTC (rev 11601) +++ trunk/xorp/ospf/tools/SConscript 2009-11-27 06:12:00 UTC (rev 11602) @@ -44,7 +44,7 @@ 'ospfv3xif', 'xipc', 'xorp', - 'proto', + 'xorp_proto', 'comm', ]) Modified: trunk/xorp/pim/SConscript =================================================================== --- trunk/xorp/pim/SConscript 2009-11-27 06:04:53 UTC (rev 11601) +++ trunk/xorp/pim/SConscript 2009-11-27 06:12:00 UTC (rev 11602) @@ -58,7 +58,7 @@ 'feaifmgrmirrorbase', 'pimbase', 'xorp_mrt', - 'proto', + 'xorp_proto', 'xipc', 'xorp', 'comm' Modified: trunk/xorp/policy/SConscript =================================================================== --- trunk/xorp/policy/SConscript 2009-11-27 06:04:53 UTC (rev 11601) +++ trunk/xorp/policy/SConscript 2009-11-27 06:12:00 UTC (rev 11602) @@ -57,7 +57,7 @@ 'ribxif', 'xipc', 'xorp', - 'proto', + 'xorp_proto', 'comm' ]) Modified: trunk/xorp/rib/SConscript =================================================================== --- trunk/xorp/rib/SConscript 2009-11-27 06:04:53 UTC (rev 11601) +++ trunk/xorp/rib/SConscript 2009-11-27 06:12:00 UTC (rev 11602) @@ -71,7 +71,7 @@ 'finder', 'xipc', 'xorp', - 'proto', + 'xorp_proto', 'comm' ]) Modified: trunk/xorp/rib/tests/SConscript =================================================================== --- trunk/xorp/rib/tests/SConscript 2009-11-27 06:04:53 UTC (rev 11601) +++ trunk/xorp/rib/tests/SConscript 2009-11-27 06:12:00 UTC (rev 11602) @@ -63,7 +63,7 @@ 'ribbase', 'policybackend', 'policycommon', - 'proto', + 'xorp_proto', 'finder', 'xipc', 'xorp', Modified: trunk/xorp/rib/tools/SConscript =================================================================== --- trunk/xorp/rib/tools/SConscript 2009-11-27 06:04:53 UTC (rev 11601) +++ trunk/xorp/rib/tools/SConscript 2009-11-27 06:12:00 UTC (rev 11602) @@ -44,7 +44,7 @@ 'showroutesbase', 'xipc', 'xorp', - 'proto', + 'xorp_proto', 'comm', ]) Modified: trunk/xorp/rip/SConscript =================================================================== --- trunk/xorp/rip/SConscript 2009-11-27 06:04:53 UTC (rev 11601) +++ trunk/xorp/rip/SConscript 2009-11-27 06:12:00 UTC (rev 11602) @@ -121,7 +121,7 @@ 'socket4xif', 'policybackend', 'policycommon', - 'proto', + 'xorp_proto', 'xipc', 'comm', 'xorp', @@ -183,7 +183,7 @@ 'socket6xif', 'policybackend', 'policycommon', - 'proto', + 'xorp_proto', 'xipc', 'comm', 'xorp', Modified: trunk/xorp/rip/tools/SConscript =================================================================== --- trunk/xorp/rip/tools/SConscript 2009-11-27 06:04:53 UTC (rev 11601) +++ trunk/xorp/rip/tools/SConscript 2009-11-27 06:12:00 UTC (rev 11602) @@ -42,7 +42,7 @@ 'ripngxif', 'xipc', 'xorp', - 'proto', + 'xorp_proto', 'comm', ]) Modified: trunk/xorp/rtrmgr/SConscript =================================================================== --- trunk/xorp/rtrmgr/SConscript 2009-11-27 06:04:53 UTC (rev 11601) +++ trunk/xorp/rtrmgr/SConscript 2009-11-27 06:12:00 UTC (rev 11602) @@ -163,7 +163,7 @@ 'cli', 'clibase', # XXX Not picked up automagically? 'cliprocessorxif', # XXX ditto? - 'proto', + 'xorp_proto', 'tecla_xorp', 'rtrmgrxif', 'xorpshbase', Modified: trunk/xorp/static_routes/SConscript =================================================================== --- trunk/xorp/static_routes/SConscript 2009-11-27 06:04:53 UTC (rev 11601) +++ trunk/xorp/static_routes/SConscript 2009-11-27 06:12:00 UTC (rev 11602) @@ -56,7 +56,7 @@ 'policycommon', 'xipc', 'xorp', - 'proto', + 'xorp_proto', 'comm', ]) Modified: trunk/xorp/vrrp/SConscript =================================================================== --- trunk/xorp/vrrp/SConscript 2009-11-27 06:04:53 UTC (rev 11601) +++ trunk/xorp/vrrp/SConscript 2009-11-27 06:12:00 UTC (rev 11602) @@ -57,7 +57,7 @@ 'feaifmgrmirrorbase', 'xipc', 'xorp', - 'proto', + 'xorp_proto', 'comm' ]) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bms_fbsd at users.sourceforge.net Thu Nov 26 22:20:04 2009 From: bms_fbsd at users.sourceforge.net (bms_fbsd at users.sourceforge.net) Date: Fri, 27 Nov 2009 06:20:04 +0000 Subject: [Xorp-cvs] SF.net SVN: xorp:[11603] trunk/xorp Message-ID: Revision: 11603 http://xorp.svn.sourceforge.net/xorp/?rev=11603&view=rev Author: bms_fbsd Date: 2009-11-27 06:20:00 +0000 (Fri, 27 Nov 2009) Log Message: ----------- libcomm => libxorp_comm Modified Paths: -------------- trunk/xorp/bgp/SConscript trunk/xorp/bgp/harness/SConscript trunk/xorp/bgp/tests/SConscript trunk/xorp/bgp/tools/SConscript trunk/xorp/cli/SConscript trunk/xorp/cli/tests/SConscript trunk/xorp/cli/tools/SConscript trunk/xorp/contrib/mld6igmp_lite/SConscript trunk/xorp/contrib/olsr/SConscript trunk/xorp/fea/SConscript trunk/xorp/fea/tests/SConscript trunk/xorp/fea/tools/SConscript trunk/xorp/fib2mrib/SConscript trunk/xorp/libcomm/SConscript trunk/xorp/libcomm/tests/SConscript trunk/xorp/libfeaclient/tests/SConscript trunk/xorp/libproto/tests/SConscript trunk/xorp/libxipc/SConscript trunk/xorp/libxipc/tests/SConscript trunk/xorp/libxorp/tests/SConscript trunk/xorp/mld6igmp/SConscript trunk/xorp/mrt/tests/SConscript trunk/xorp/ospf/SConscript trunk/xorp/ospf/tests/SConscript trunk/xorp/ospf/tools/SConscript trunk/xorp/pim/SConscript trunk/xorp/policy/SConscript trunk/xorp/rib/SConscript trunk/xorp/rib/tests/SConscript trunk/xorp/rib/tools/SConscript trunk/xorp/rip/SConscript trunk/xorp/rip/tests/SConscript trunk/xorp/rip/tools/SConscript trunk/xorp/rtrmgr/SConscript trunk/xorp/rtrmgr/tests/SConscript trunk/xorp/static_routes/SConscript trunk/xorp/vrrp/SConscript Modified: trunk/xorp/bgp/SConscript =================================================================== --- trunk/xorp/bgp/SConscript 2009-11-27 06:12:00 UTC (rev 11602) +++ trunk/xorp/bgp/SConscript 2009-11-27 06:20:00 UTC (rev 11603) @@ -64,7 +64,7 @@ 'feaifmgrreplicatorxif', 'xipc', 'xorp', - 'comm', + 'xorp_comm', ]) ### libbgp Modified: trunk/xorp/bgp/harness/SConscript =================================================================== --- trunk/xorp/bgp/harness/SConscript 2009-11-27 06:12:00 UTC (rev 11602) +++ trunk/xorp/bgp/harness/SConscript 2009-11-27 06:20:00 UTC (rev 11603) @@ -40,7 +40,7 @@ 'bgpxif', 'xipc', 'xorp', - 'comm', + 'xorp_comm', ]) # XXX FIXME Modified: trunk/xorp/bgp/tests/SConscript =================================================================== --- trunk/xorp/bgp/tests/SConscript 2009-11-27 06:12:00 UTC (rev 11602) +++ trunk/xorp/bgp/tests/SConscript 2009-11-27 06:20:00 UTC (rev 11603) @@ -59,7 +59,7 @@ 'xipc', 'xorp_proto', 'xorp', - 'comm', + 'xorp_comm', ]) # XXX BGP regression tests are currently stubbed out in Modified: trunk/xorp/bgp/tools/SConscript =================================================================== --- trunk/xorp/bgp/tools/SConscript 2009-11-27 06:12:00 UTC (rev 11602) +++ trunk/xorp/bgp/tools/SConscript 2009-11-27 06:20:00 UTC (rev 11603) @@ -42,7 +42,7 @@ 'bgpxif', 'xipc', 'xorp', - 'comm', + 'xorp_comm', ]) Modified: trunk/xorp/cli/SConscript =================================================================== --- trunk/xorp/cli/SConscript 2009-11-27 06:12:00 UTC (rev 11602) +++ trunk/xorp/cli/SConscript 2009-11-27 06:20:00 UTC (rev 11603) @@ -52,7 +52,7 @@ 'tecla_xorp', 'xorp_proto', 'xipc', - 'comm', + 'xorp_comm', 'xorp', ]) Modified: trunk/xorp/cli/tests/SConscript =================================================================== --- trunk/xorp/cli/tests/SConscript 2009-11-27 06:12:00 UTC (rev 11602) +++ trunk/xorp/cli/tests/SConscript 2009-11-27 06:20:00 UTC (rev 11603) @@ -49,7 +49,7 @@ 'xipc', 'xorp_proto', 'xorp', - 'comm', + 'xorp_comm', ]) simple_cpp_tests = [ Modified: trunk/xorp/cli/tools/SConscript =================================================================== --- trunk/xorp/cli/tools/SConscript 2009-11-27 06:12:00 UTC (rev 11602) +++ trunk/xorp/cli/tools/SConscript 2009-11-27 06:20:00 UTC (rev 11603) @@ -42,7 +42,7 @@ 'xipc', 'xorp', 'proto', - 'comm', + 'xorp_comm', ]) cligensrcs = [ Modified: trunk/xorp/contrib/mld6igmp_lite/SConscript =================================================================== --- trunk/xorp/contrib/mld6igmp_lite/SConscript 2009-11-27 06:12:00 UTC (rev 11602) +++ trunk/xorp/contrib/mld6igmp_lite/SConscript 2009-11-27 06:20:00 UTC (rev 11603) @@ -59,7 +59,7 @@ 'xipc', 'xorp', 'xorp_proto', - 'comm' + 'xorp_comm' ]) libmld6igmplitesrcs = [ Modified: trunk/xorp/contrib/olsr/SConscript =================================================================== --- trunk/xorp/contrib/olsr/SConscript 2009-11-27 06:12:00 UTC (rev 11602) +++ trunk/xorp/contrib/olsr/SConscript 2009-11-27 06:20:00 UTC (rev 11603) @@ -36,16 +36,16 @@ ]) env.AppendUnique(LIBPATH = [ - '../libxorp', - '../libcomm', - '../libxipc', - '../libproto', - '../libfeaclient', - '../policy/backend', - '../policy/common', - '../xrl/interfaces', - '../xrl/targets', - '../mrt', + '$BUILDDIR/libxorp', + '$BUILDDIR/libcomm', + '$BUILDDIR/libxipc', + '$BUILDDIR/libproto', + '$BUILDDIR/libfeaclient', + '$BUILDDIR/policy/backend', + '$BUILDDIR/policy/common', + '$BUILDDIR/xrl/interfaces', + '$BUILDDIR/xrl/targets', + '$BUILDDIR/mrt', '.' ]) @@ -66,7 +66,7 @@ 'xipc', 'xorp', 'xorp_proto', - 'comm', + 'xorp_comm', ]) ### libolsr Modified: trunk/xorp/fea/SConscript =================================================================== --- trunk/xorp/fea/SConscript 2009-11-27 06:12:00 UTC (rev 11602) +++ trunk/xorp/fea/SConscript 2009-11-27 06:20:00 UTC (rev 11603) @@ -104,7 +104,7 @@ 'tecla_xorp', 'xorp_proto', 'xipc', - 'comm', + 'xorp_comm', 'xorp' ] Modified: trunk/xorp/fea/tests/SConscript =================================================================== --- trunk/xorp/fea/tests/SConscript 2009-11-27 06:12:00 UTC (rev 11602) +++ trunk/xorp/fea/tests/SConscript 2009-11-27 06:20:00 UTC (rev 11603) @@ -90,7 +90,7 @@ 'tecla_xorp', 'xorp_proto', 'xipc', - 'comm', + 'xorp_comm', 'xorp' ] Modified: trunk/xorp/fea/tools/SConscript =================================================================== --- trunk/xorp/fea/tools/SConscript 2009-11-27 06:12:00 UTC (rev 11602) +++ trunk/xorp/fea/tools/SConscript 2009-11-27 06:20:00 UTC (rev 11603) @@ -46,7 +46,7 @@ 'xipc', 'xorp', 'xorp_proto', - 'comm', + 'xorp_comm', ]) showifsrcs = [ Modified: trunk/xorp/fib2mrib/SConscript =================================================================== --- trunk/xorp/fib2mrib/SConscript 2009-11-27 06:12:00 UTC (rev 11602) +++ trunk/xorp/fib2mrib/SConscript 2009-11-27 06:20:00 UTC (rev 11603) @@ -58,7 +58,7 @@ 'xipc', 'xorp', 'xorp_proto', - 'comm' + 'xorp_comm' ]) libfib2mribsrcs = [ Modified: trunk/xorp/libcomm/SConscript =================================================================== --- trunk/xorp/libcomm/SConscript 2009-11-27 06:12:00 UTC (rev 11602) +++ trunk/xorp/libcomm/SConscript 2009-11-27 06:20:00 UTC (rev 11603) @@ -37,12 +37,12 @@ ] if is_shared: - libcomm = env.SharedLibrary(target = 'libcomm', source = sources) + libxorp_comm = env.SharedLibrary(target = 'libxorp_comm', source = sources) else: - libcomm = env.StaticLibrary(target = 'libcomm', source = sources) + libxorp_comm = env.StaticLibrary(target = 'libxorp_comm', source = sources) if is_shared: env.Alias("install", - env.InstallLibrary('$libdir', libcomm)) + env.InstallLibrary('$libdir', libxorp_comm)) -Default(libcomm) +Default(libxorp_comm) Modified: trunk/xorp/libcomm/tests/SConscript =================================================================== --- trunk/xorp/libcomm/tests/SConscript 2009-11-27 06:12:00 UTC (rev 11602) +++ trunk/xorp/libcomm/tests/SConscript 2009-11-27 06:20:00 UTC (rev 11603) @@ -24,7 +24,7 @@ env.PrependUnique(CPPPATH = [ '#', '$BUILDDIR', '$BUILDDIR/libcomm', ]) env.PrependUnique(LIBPATH = [ '$BUILDDIR/libxorp', '$BUILDDIR/libcomm', ]) -env.PrependUnique(LIBS = [ 'xorp', 'comm' ]) +env.PrependUnique(LIBS = [ 'xorp', 'xorp_comm' ]) # XXX Not for cross-compilation. test_comm = env.AutoTest(target = 'test_comm', source = 'test_comm.c') Modified: trunk/xorp/libfeaclient/tests/SConscript =================================================================== --- trunk/xorp/libfeaclient/tests/SConscript 2009-11-27 06:12:00 UTC (rev 11602) +++ trunk/xorp/libfeaclient/tests/SConscript 2009-11-27 06:20:00 UTC (rev 11603) @@ -47,7 +47,7 @@ 'feaifmgrmirrorbase', 'xipc', 'xorp', - 'comm', + 'xorp_comm', ]) test_redist = env.AutoTest(target = 'test_local_copy', Modified: trunk/xorp/libproto/tests/SConscript =================================================================== --- trunk/xorp/libproto/tests/SConscript 2009-11-27 06:12:00 UTC (rev 11602) +++ trunk/xorp/libproto/tests/SConscript 2009-11-27 06:20:00 UTC (rev 11603) @@ -40,7 +40,7 @@ env.AppendUnique(LIBS = [ 'xorp_proto', 'xorp', - 'comm', + 'xorp_comm', ]) tests = [ Modified: trunk/xorp/libxipc/SConscript =================================================================== --- trunk/xorp/libxipc/SConscript 2009-11-27 06:12:00 UTC (rev 11602) +++ trunk/xorp/libxipc/SConscript 2009-11-27 06:20:00 UTC (rev 11603) @@ -42,7 +42,7 @@ ]) libxipc_env.AppendUnique(LIBS = [ - 'comm', + 'xorp_comm', 'xorp' ]) @@ -183,7 +183,7 @@ env.AppendUnique(LIBS = [ 'finder', 'xipc', - 'comm', + 'xorp_comm', 'xorp' ]) Modified: trunk/xorp/libxipc/tests/SConscript =================================================================== --- trunk/xorp/libxipc/tests/SConscript 2009-11-27 06:12:00 UTC (rev 11602) +++ trunk/xorp/libxipc/tests/SConscript 2009-11-27 06:20:00 UTC (rev 11603) @@ -38,7 +38,7 @@ 'xipc', 'finder', 'xorp', - 'comm', + 'xorp_comm', ]) # Missing: Modified: trunk/xorp/libxorp/tests/SConscript =================================================================== --- trunk/xorp/libxorp/tests/SConscript 2009-11-27 06:12:00 UTC (rev 11602) +++ trunk/xorp/libxorp/tests/SConscript 2009-11-27 06:20:00 UTC (rev 11603) @@ -23,7 +23,7 @@ env = env.Clone() env.AppendUnique(CPPPATH = [ '#', '$BUILDDIR', '$BUILDDIR/libxorp', ]) env.AppendUnique(LIBPATH = [ '$BUILDDIR/libxorp', '$BUILDDIR/libcomm', ]) -env.AppendUnique(LIBS = [ 'xorp', 'comm' ]) +env.AppendUnique(LIBS = [ 'xorp', 'xorp_comm' ]) tests = [ 'asyncio', Modified: trunk/xorp/mld6igmp/SConscript =================================================================== --- trunk/xorp/mld6igmp/SConscript 2009-11-27 06:12:00 UTC (rev 11602) +++ trunk/xorp/mld6igmp/SConscript 2009-11-27 06:20:00 UTC (rev 11603) @@ -58,7 +58,7 @@ 'xorp_proto', 'xipc', 'xorp', - 'comm' + 'xorp_comm' ]) libmld6igmpsrcs = [ Modified: trunk/xorp/mrt/tests/SConscript =================================================================== --- trunk/xorp/mrt/tests/SConscript 2009-11-27 06:12:00 UTC (rev 11602) +++ trunk/xorp/mrt/tests/SConscript 2009-11-27 06:20:00 UTC (rev 11603) @@ -37,7 +37,7 @@ env.AppendUnique(LIBS = [ 'xorp_mrt', 'xorp', - 'comm', + 'xorp_comm', ]) test_mrib = env.AutoTest(target = 'test_mrib', source = 'test_mrib.cc') Modified: trunk/xorp/ospf/SConscript =================================================================== --- trunk/xorp/ospf/SConscript 2009-11-27 06:12:00 UTC (rev 11602) +++ trunk/xorp/ospf/SConscript 2009-11-27 06:20:00 UTC (rev 11603) @@ -67,7 +67,7 @@ 'xipc', 'xorp', 'xorp_proto', - 'comm', + 'xorp_comm', ]) libospfsrcs = [ Modified: trunk/xorp/ospf/tests/SConscript =================================================================== --- trunk/xorp/ospf/tests/SConscript 2009-11-27 06:12:00 UTC (rev 11602) +++ trunk/xorp/ospf/tests/SConscript 2009-11-27 06:20:00 UTC (rev 11603) @@ -57,7 +57,7 @@ 'xipc', 'xorp_proto', 'xorp', - 'comm', + 'xorp_comm', ]) # XXX Do we need to link against this now? Modified: trunk/xorp/ospf/tools/SConscript =================================================================== --- trunk/xorp/ospf/tools/SConscript 2009-11-27 06:12:00 UTC (rev 11602) +++ trunk/xorp/ospf/tools/SConscript 2009-11-27 06:20:00 UTC (rev 11603) @@ -45,7 +45,7 @@ 'xipc', 'xorp', 'xorp_proto', - 'comm', + 'xorp_comm', ]) cleardbsrcs = [ Modified: trunk/xorp/pim/SConscript =================================================================== --- trunk/xorp/pim/SConscript 2009-11-27 06:12:00 UTC (rev 11602) +++ trunk/xorp/pim/SConscript 2009-11-27 06:20:00 UTC (rev 11603) @@ -61,7 +61,7 @@ 'xorp_proto', 'xipc', 'xorp', - 'comm' + 'xorp_comm' ]) libpimsrcs = [ Modified: trunk/xorp/policy/SConscript =================================================================== --- trunk/xorp/policy/SConscript 2009-11-27 06:12:00 UTC (rev 11602) +++ trunk/xorp/policy/SConscript 2009-11-27 06:20:00 UTC (rev 11603) @@ -58,7 +58,7 @@ 'xipc', 'xorp', 'xorp_proto', - 'comm' + 'xorp_comm' ]) libpolicysrcs = [ Modified: trunk/xorp/rib/SConscript =================================================================== --- trunk/xorp/rib/SConscript 2009-11-27 06:12:00 UTC (rev 11602) +++ trunk/xorp/rib/SConscript 2009-11-27 06:20:00 UTC (rev 11603) @@ -72,7 +72,7 @@ 'xipc', 'xorp', 'xorp_proto', - 'comm' + 'xorp_comm' ]) libribsrcs = [ Modified: trunk/xorp/rib/tests/SConscript =================================================================== --- trunk/xorp/rib/tests/SConscript 2009-11-27 06:12:00 UTC (rev 11602) +++ trunk/xorp/rib/tests/SConscript 2009-11-27 06:20:00 UTC (rev 11603) @@ -67,7 +67,7 @@ 'finder', 'xipc', 'xorp', - 'comm', + 'xorp_comm', ]) # XXX: Shell script wrappers here. Modified: trunk/xorp/rib/tools/SConscript =================================================================== --- trunk/xorp/rib/tools/SConscript 2009-11-27 06:12:00 UTC (rev 11602) +++ trunk/xorp/rib/tools/SConscript 2009-11-27 06:20:00 UTC (rev 11603) @@ -45,7 +45,7 @@ 'xipc', 'xorp', 'xorp_proto', - 'comm', + 'xorp_comm', ]) shdistsrcs = [ Modified: trunk/xorp/rip/SConscript =================================================================== --- trunk/xorp/rip/SConscript 2009-11-27 06:12:00 UTC (rev 11602) +++ trunk/xorp/rip/SConscript 2009-11-27 06:20:00 UTC (rev 11603) @@ -123,7 +123,7 @@ 'policycommon', 'xorp_proto', 'xipc', - 'comm', + 'xorp_comm', 'xorp', ]) @@ -185,7 +185,7 @@ 'policycommon', 'xorp_proto', 'xipc', - 'comm', + 'xorp_comm', 'xorp', ]) Modified: trunk/xorp/rip/tests/SConscript =================================================================== --- trunk/xorp/rip/tests/SConscript 2009-11-27 06:12:00 UTC (rev 11602) +++ trunk/xorp/rip/tests/SConscript 2009-11-27 06:20:00 UTC (rev 11603) @@ -57,7 +57,7 @@ 'policycommon', 'xipc', 'xorp', - 'comm', + 'xorp_comm', ]) simple_cpp_tests = [ Modified: trunk/xorp/rip/tools/SConscript =================================================================== --- trunk/xorp/rip/tools/SConscript 2009-11-27 06:12:00 UTC (rev 11602) +++ trunk/xorp/rip/tools/SConscript 2009-11-27 06:20:00 UTC (rev 11603) @@ -43,7 +43,7 @@ 'xipc', 'xorp', 'xorp_proto', - 'comm', + 'xorp_comm', ]) shpeersrcs = [ Modified: trunk/xorp/rtrmgr/SConscript =================================================================== --- trunk/xorp/rtrmgr/SConscript 2009-11-27 06:12:00 UTC (rev 11602) +++ trunk/xorp/rtrmgr/SConscript 2009-11-27 06:20:00 UTC (rev 11603) @@ -140,7 +140,7 @@ 'findereventnotifierxif', 'finder', 'xipc', - 'comm', + 'xorp_comm', 'xorp' ]) @@ -169,7 +169,7 @@ 'xorpshbase', 'findereventnotifierxif', 'xipc', - 'comm', + 'xorp_comm', 'xorp', 'curses' # XXX only for non-windows ]) @@ -194,7 +194,7 @@ 'profilerbase', 'finder', 'xipc', - 'comm', + 'xorp_comm', 'xorp' ]) Modified: trunk/xorp/rtrmgr/tests/SConscript =================================================================== --- trunk/xorp/rtrmgr/tests/SConscript 2009-11-27 06:12:00 UTC (rev 11602) +++ trunk/xorp/rtrmgr/tests/SConscript 2009-11-27 06:20:00 UTC (rev 11603) @@ -44,7 +44,7 @@ 'finder', 'xipc', 'xorp', - 'comm', + 'xorp_comm', ]) # XXX Must propagate srcdir in UNIX environment to UnitTest. Modified: trunk/xorp/static_routes/SConscript =================================================================== --- trunk/xorp/static_routes/SConscript 2009-11-27 06:12:00 UTC (rev 11602) +++ trunk/xorp/static_routes/SConscript 2009-11-27 06:20:00 UTC (rev 11603) @@ -57,7 +57,7 @@ 'xipc', 'xorp', 'xorp_proto', - 'comm', + 'xorp_comm', ]) Modified: trunk/xorp/vrrp/SConscript =================================================================== --- trunk/xorp/vrrp/SConscript 2009-11-27 06:12:00 UTC (rev 11602) +++ trunk/xorp/vrrp/SConscript 2009-11-27 06:20:00 UTC (rev 11603) @@ -58,7 +58,7 @@ 'xipc', 'xorp', 'xorp_proto', - 'comm' + 'xorp_comm' ]) libvrrpsources = ['arpd.cc', This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bms_fbsd at users.sourceforge.net Thu Nov 26 22:21:25 2009 From: bms_fbsd at users.sourceforge.net (bms_fbsd at users.sourceforge.net) Date: Fri, 27 Nov 2009 06:21:25 +0000 Subject: [Xorp-cvs] SF.net SVN: xorp:[11604] trunk/xorp/contrib/mld6igmp_lite/SConscript Message-ID: Revision: 11604 http://xorp.svn.sourceforge.net/xorp/?rev=11604&view=rev Author: bms_fbsd Date: 2009-11-27 06:21:13 +0000 (Fri, 27 Nov 2009) Log Message: ----------- Catch up with build system changes: In LIBPATH, '..' => '$BUILDDIR'. Modified Paths: -------------- trunk/xorp/contrib/mld6igmp_lite/SConscript Modified: trunk/xorp/contrib/mld6igmp_lite/SConscript =================================================================== --- trunk/xorp/contrib/mld6igmp_lite/SConscript 2009-11-27 06:20:00 UTC (rev 11603) +++ trunk/xorp/contrib/mld6igmp_lite/SConscript 2009-11-27 06:21:13 UTC (rev 11604) @@ -30,16 +30,16 @@ ]) env.AppendUnique(LIBPATH = [ - '../libxorp', - '../libcomm', - '../libxipc', - '../libproto', - '../libfeaclient', - '../policy/backend', - '../policy/common', - '../xrl/interfaces', - '../xrl/targets', - '../mrt', + '$BUILDDIR/libxorp', + '$BUILDDIR/libcomm', + '$BUILDDIR/libxipc', + '$BUILDDIR/libproto', + '$BUILDDIR/libfeaclient', + '$BUILDDIR/policy/backend', + '$BUILDDIR/policy/common', + '$BUILDDIR/xrl/interfaces', + '$BUILDDIR/xrl/targets', + '$BUILDDIR/mrt', '.' ]) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bms_fbsd at users.sourceforge.net Thu Nov 26 22:24:22 2009 From: bms_fbsd at users.sourceforge.net (bms_fbsd at users.sourceforge.net) Date: Fri, 27 Nov 2009 06:24:22 +0000 Subject: [Xorp-cvs] SF.net SVN: xorp:[11605] trunk/xorp/pim/SConscript Message-ID: Revision: 11605 http://xorp.svn.sourceforge.net/xorp/?rev=11605&view=rev Author: bms_fbsd Date: 2009-11-27 06:24:22 +0000 (Fri, 27 Nov 2009) Log Message: ----------- libpim => libxorp_pim Modified Paths: -------------- trunk/xorp/pim/SConscript Modified: trunk/xorp/pim/SConscript =================================================================== --- trunk/xorp/pim/SConscript 2009-11-27 06:21:13 UTC (rev 11604) +++ trunk/xorp/pim/SConscript 2009-11-27 06:24:22 UTC (rev 11605) @@ -44,7 +44,7 @@ ]) env.AppendUnique(LIBS = [ - 'pim', + 'xorp_pim', # The library, not the executable. 'feaclient', 'ribxif', 'mld6igmpxif', @@ -64,7 +64,7 @@ 'xorp_comm' ]) -libpimsrcs = [ +libxorp_pim_srcs = [ 'pim_bsr.cc', 'pim_config.cc', 'pim_mfc.cc', @@ -100,11 +100,13 @@ ] if is_shared: - libpim = env.SharedLibrary(target = 'libpim', source = libpimsrcs, LIBS = '') + libxorp_pim = env.SharedLibrary(target = 'libxorp_pim', + source = libxorp_pim_srcs, LIBS = '') env.Alias('install', - env.InstallLibrary('$libdir', libpim)) + env.InstallLibrary('$libdir', libxorp_pim)) else: - libpim = env.StaticLibrary(target = 'libpim', source = libpimsrcs, LIBS = '') + libxorp_pim = env.StaticLibrary(target = 'libxorp_pim', + source = libxorp_pim_srcs, LIBS = '') pim4srcs = [ 'xorp_pimsm4.cc', This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bms_fbsd at users.sourceforge.net Thu Nov 26 22:26:52 2009 From: bms_fbsd at users.sourceforge.net (bms_fbsd at users.sourceforge.net) Date: Fri, 27 Nov 2009 06:26:52 +0000 Subject: [Xorp-cvs] SF.net SVN: xorp:[11606] trunk/xorp/ospf/SConscript Message-ID: Revision: 11606 http://xorp.svn.sourceforge.net/xorp/?rev=11606&view=rev Author: bms_fbsd Date: 2009-11-27 06:26:37 +0000 (Fri, 27 Nov 2009) Log Message: ----------- libospf => libxorp_ospf Modified Paths: -------------- trunk/xorp/ospf/SConscript Modified: trunk/xorp/ospf/SConscript =================================================================== --- trunk/xorp/ospf/SConscript 2009-11-27 06:24:22 UTC (rev 11605) +++ trunk/xorp/ospf/SConscript 2009-11-27 06:26:37 UTC (rev 11606) @@ -50,7 +50,7 @@ ]) env.AppendUnique(LIBS = [ - 'ospf', + 'xorp_ospf', # Refers to the library, not the executable. 'ospfv2base', 'ospfv3base', 'policybackend', @@ -70,7 +70,7 @@ 'xorp_comm', ]) -libospfsrcs = [ +libxorp_ospf_srcs = [ 'auth.cc', 'area_router.cc', 'external.cc', @@ -88,9 +88,13 @@ ] if is_shared: - libospf = env.SharedLibrary(target = 'libospf', source = libospfsrcs, LIBS = '') + libxorp_ospf = env.SharedLibrary(target = 'libxorp_ospf', + source = libxorp_ospf_srcs, + LIBS = '') else: - libospf = env.StaticLibrary(target = 'libospf', source = libospfsrcs, LIBS = '') + libxorp_ospf = env.StaticLibrary(target = 'libxorp_ospf', + source = libxorp_ospf_srcs, + LIBS = '') ospfv2srcs = [ 'xorp_ospfv2.cc', @@ -115,6 +119,6 @@ if is_shared: env.Alias('install', - env.InstallLibrary('$libdir', libospf)) + env.InstallLibrary('$libdir', libxorp_ospf)) Default(ospfv2, ospfv3) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bms_fbsd at users.sourceforge.net Thu Nov 26 22:33:26 2009 From: bms_fbsd at users.sourceforge.net (bms_fbsd at users.sourceforge.net) Date: Fri, 27 Nov 2009 06:33:26 +0000 Subject: [Xorp-cvs] SF.net SVN: xorp:[11607] trunk/xorp/rip/SConscript Message-ID: Revision: 11607 http://xorp.svn.sourceforge.net/xorp/?rev=11607&view=rev Author: bms_fbsd Date: 2009-11-27 06:33:26 +0000 (Fri, 27 Nov 2009) Log Message: ----------- librip* => libxorp_rip* Modified Paths: -------------- trunk/xorp/rip/SConscript Modified: trunk/xorp/rip/SConscript =================================================================== --- trunk/xorp/rip/SConscript 2009-11-27 06:26:37 UTC (rev 11606) +++ trunk/xorp/rip/SConscript 2009-11-27 06:33:26 UTC (rev 11607) @@ -41,7 +41,7 @@ # # RIP/RIPng Library Sources. -libripsrcs = [ +libxorp_rip_srcs = [ 'auth.cc', 'output_table.cc', 'output_updates.cc', @@ -57,7 +57,7 @@ ] # RIP/RIPng XRL Library Sources. -libripxrlsrc = [ +libxorp_rip_xrl_srcs = [ 'xrl_config.cc', 'xrl_port_manager.cc', 'xrl_port_io.cc', @@ -109,8 +109,8 @@ ]) e.PrependUnique(LIBS = [ - 'ripxrl', - 'rip', + 'xorp_rip_xrl', + 'xorp_rip', # Refers to library, not the executable. 'ripbase', 'ribxif', 'findereventnotifierxif', @@ -128,14 +128,22 @@ ]) if is_shared: - librip = e.SharedLibrary(target = 'librip', source = libripsrcs, LIBS = '') - libripxrl = e.SharedLibrary(target = 'libripxrl', source = libripxrlsrc, LIBS = '') + libxorp_rip = e.SharedLibrary(target = 'libxorp_rip', + source = libxorp_rip_srcs, + LIBS = '') + libxorp_rip_xrl = e.SharedLibrary(target = 'libxorp_rip_xrl', + source = libxorp_rip_xrl_srcs, + LIBS = '') e.Alias('install', - [ e.InstallLibrary('$libdir', librip), - e.InstallLibrary('$libdir', libripxrl) ]) + [ e.InstallLibrary('$libdir', libxorp_rip), + e.InstallLibrary('$libdir', libxorp_rip_xrl) ]) else: - librip = e.StaticLibrary(target = 'librip', source = libripsrcs, LIBS = '') - libripxrl = e.StaticLibrary(target = 'libripxrl', source = libripxrlsrc, LIBS = '') + libxorp_rip = e.StaticLibrary(target = 'libxorp_rip', + source = libxorp_rip_srcs, + LIBS = '') + libxorp_rip_xrl = e.StaticLibrary(target = 'libxorp_rip_xrl', + source = libxorp_rip_xrl_srcs, + LIBS = '') rip = e.Program(target = 'xorp_rip', source = ripsrcs) e.Alias('install', e.InstallProgram(rippath, rip)) @@ -158,12 +166,12 @@ ]) e.PrependUnique(LIBPATH = [ - '.', '$BUILDDIR/libfeaclient', '$BUILDDIR/policy/backend', '$BUILDDIR/policy/common', '$BUILDDIR/xrl/interfaces', '$BUILDDIR/xrl/targets', + '.', '$BUILDDIR/libproto', '$BUILDDIR/libxipc', '$BUILDDIR/libcomm', @@ -171,8 +179,8 @@ ]) e.PrependUnique(LIBS = [ - 'ripngxrl', - 'ripng', + 'xorp_ripng_xrl', + 'xorp_ripng', 'ripngbase', 'ribxif', 'findereventnotifierxif', @@ -190,14 +198,22 @@ ]) if is_shared: - libripng = e.SharedLibrary(target = 'libripng', source = libripsrcs, LIBS = '') - libripngxrl = e.SharedLibrary(target = 'libripngxrl', source = libripxrlsrc, LIBS = '') + libxorp_ripng = e.SharedLibrary(target = 'libxorp_ripng', + source = libxorp_rip_srcs, + LIBS = '') + libxorp_ripngxrl = e.SharedLibrary(target = 'libxorp_ripng_xrl', + source = libxorp_rip_xrl_srcs, + LIBS = '') e.Alias('install', - [ e.InstallLibrary('$libdir', libripng), - e.InstallLibrary('$libdir', libripngxrl) ]) + [ e.InstallLibrary('$libdir', libxorp_ripng), + e.InstallLibrary('$libdir', libxorp_ripngxrl) ]) else: - libripng = e.StaticLibrary(target = 'libripng', source = libripsrcs, LIBS = '') - libripngxrl = e.StaticLibrary(target = 'libripngxrl', source = libripxrlsrc, LIBS = '') + libxorp_ripng = e.StaticLibrary(target = 'libxorp_ripng', + source = libxorp_rip_srcs, + LIBS = '') + libxorp_ripngxrl = e.StaticLibrary(target = 'libxorp_ripngxrl', + source = libxorp_rip_xrl_srcs, + LIBS = '') ripng = e.Program(target = 'xorp_ripng', source = ripngsrcs) e.Alias('install', e.InstallProgram(rippath, ripng)) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bms_fbsd at users.sourceforge.net Thu Nov 26 22:38:43 2009 From: bms_fbsd at users.sourceforge.net (bms_fbsd at users.sourceforge.net) Date: Fri, 27 Nov 2009 06:38:43 +0000 Subject: [Xorp-cvs] SF.net SVN: xorp:[11608] trunk/xorp Message-ID: Revision: 11608 http://xorp.svn.sourceforge.net/xorp/?rev=11608&view=rev Author: bms_fbsd Date: 2009-11-27 06:38:43 +0000 (Fri, 27 Nov 2009) Log Message: ----------- libfeaclient => libxorp_fea_client Modified Paths: -------------- trunk/xorp/bgp/SConscript trunk/xorp/bgp/tests/SConscript trunk/xorp/contrib/mld6igmp_lite/SConscript trunk/xorp/contrib/olsr/SConscript trunk/xorp/fea/SConscript trunk/xorp/fea/tests/SConscript trunk/xorp/fea/tools/SConscript trunk/xorp/fib2mrib/SConscript trunk/xorp/libfeaclient/SConscript trunk/xorp/libfeaclient/tests/SConscript trunk/xorp/mld6igmp/SConscript trunk/xorp/ospf/SConscript trunk/xorp/ospf/tests/SConscript trunk/xorp/pim/SConscript trunk/xorp/rib/SConscript trunk/xorp/rib/tests/SConscript trunk/xorp/rip/SConscript trunk/xorp/rip/tests/SConscript trunk/xorp/static_routes/SConscript trunk/xorp/vrrp/SConscript Modified: trunk/xorp/bgp/SConscript =================================================================== --- trunk/xorp/bgp/SConscript 2009-11-27 06:33:26 UTC (rev 11607) +++ trunk/xorp/bgp/SConscript 2009-11-27 06:38:43 UTC (rev 11608) @@ -54,7 +54,7 @@ env.AppendUnique(LIBS = [ 'policybackend', 'policycommon', - 'feaclient', + 'xorp_fea_client', 'bgpbase', 'feaifmgrmirrorbase', 'ribxif', Modified: trunk/xorp/bgp/tests/SConscript =================================================================== --- trunk/xorp/bgp/tests/SConscript 2009-11-27 06:33:26 UTC (rev 11607) +++ trunk/xorp/bgp/tests/SConscript 2009-11-27 06:38:43 UTC (rev 11608) @@ -48,7 +48,7 @@ #'ospfv3base', 'ripxif', 'findereventnotifierxif', - 'feaclient', + 'xorp_fea_client', 'feaifmgrmirrorxif', 'feaifmgrreplicatorxif', 'feaifmgrmirrorbase', Modified: trunk/xorp/contrib/mld6igmp_lite/SConscript =================================================================== --- trunk/xorp/contrib/mld6igmp_lite/SConscript 2009-11-27 06:33:26 UTC (rev 11607) +++ trunk/xorp/contrib/mld6igmp_lite/SConscript 2009-11-27 06:38:43 UTC (rev 11608) @@ -45,7 +45,7 @@ env.AppendUnique(LIBS = [ 'mld6igmp', - 'feaclient', + 'xorp_fea_client', 'mld6igmpclientxif', 'fearawpkt4xif', 'fearawpkt6xif', Modified: trunk/xorp/contrib/olsr/SConscript =================================================================== --- trunk/xorp/contrib/olsr/SConscript 2009-11-27 06:33:26 UTC (rev 11607) +++ trunk/xorp/contrib/olsr/SConscript 2009-11-27 06:38:43 UTC (rev 11608) @@ -54,7 +54,7 @@ 'olsr4base', 'policybackend', 'policycommon', - 'feaclient', + 'xorp_fea_client', 'ribxif', 'findereventnotifierxif', 'feaifmgrmirrorxif', Modified: trunk/xorp/fea/SConscript =================================================================== --- trunk/xorp/fea/SConscript 2009-11-27 06:33:26 UTC (rev 11607) +++ trunk/xorp/fea/SConscript 2009-11-27 06:38:43 UTC (rev 11608) @@ -90,7 +90,7 @@ 'findereventnotifierxif', 'cli', 'cliprocessorxif', - 'feaclient', + 'xorp_fea_client', 'feaifmgrmirrorxif', # XXX? 'feaifmgrreplicatorxif', # XXX? 'feaifmgrmirrorbase', # XXX? Modified: trunk/xorp/fea/tests/SConscript =================================================================== --- trunk/xorp/fea/tests/SConscript 2009-11-27 06:33:26 UTC (rev 11607) +++ trunk/xorp/fea/tests/SConscript 2009-11-27 06:38:43 UTC (rev 11608) @@ -76,7 +76,7 @@ 'findereventnotifierxif', 'cli', 'cliprocessorxif', - 'feaclient', + 'xorp_fea_client', 'feaifmgrmirrorxif', # XXX? 'feaifmgrreplicatorxif', # XXX? 'feaifmgrmirrorbase', # XXX? Modified: trunk/xorp/fea/tools/SConscript =================================================================== --- trunk/xorp/fea/tools/SConscript 2009-11-27 06:33:26 UTC (rev 11607) +++ trunk/xorp/fea/tools/SConscript 2009-11-27 06:38:43 UTC (rev 11608) @@ -39,7 +39,7 @@ ]) env.AppendUnique(LIBS = [ - 'feaclient', + 'xorp_fea_client', 'feaifmgrmirrorxif', 'feaifmgrreplicatorxif', 'feaifmgrmirrorbase', Modified: trunk/xorp/fib2mrib/SConscript =================================================================== --- trunk/xorp/fib2mrib/SConscript 2009-11-27 06:33:26 UTC (rev 11607) +++ trunk/xorp/fib2mrib/SConscript 2009-11-27 06:38:43 UTC (rev 11608) @@ -47,7 +47,7 @@ 'fib2mribbase', 'policybackend', 'policycommon', - 'feaclient', + 'xorp_fea_client', 'findereventnotifierxif', 'feaifmgrmirrorxif', 'feaifmgrreplicatorxif', Modified: trunk/xorp/libfeaclient/SConscript =================================================================== --- trunk/xorp/libfeaclient/SConscript 2009-11-27 06:33:26 UTC (rev 11607) +++ trunk/xorp/libfeaclient/SConscript 2009-11-27 06:38:43 UTC (rev 11608) @@ -32,7 +32,7 @@ '$BUILDDIR', ]) -sources = [ +libxorp_fea_client_srcs = [ # C++ files 'ifmgr_atoms.cc', 'ifmgr_cmds.cc', @@ -42,12 +42,14 @@ ] if is_shared: - libfeaclient = env.SharedLibrary(target = 'libfeaclient', source = sources) + libxorp_fea_client = env.SharedLibrary(target = 'libxorp_fea_client', + source = libxorp_fea_client_srcs) else: - libfeaclient = env.StaticLibrary(target = 'libfeaclient', source = sources) + libxorp_fea_client = env.StaticLibrary(target = 'libxorp_fea_client', + source = libxorp_fea_client_srcs) if is_shared: env.Alias('install', - env.InstallLibrary('$libdir', libfeaclient)) + env.InstallLibrary('$libdir', libxorp_fea_client)) -Default(libfeaclient) +Default(libxorp_fea_client) Modified: trunk/xorp/libfeaclient/tests/SConscript =================================================================== --- trunk/xorp/libfeaclient/tests/SConscript 2009-11-27 06:33:26 UTC (rev 11607) +++ trunk/xorp/libfeaclient/tests/SConscript 2009-11-27 06:38:43 UTC (rev 11608) @@ -41,7 +41,7 @@ # XXX Why does this look for the .so before the .a in linkage, and break? # XXX Can we inherit these from libfeaclient deps? env.AppendUnique(LIBS = [ - 'feaclient', + 'xorp_fea_client', 'feaifmgrmirrorxif', 'feaifmgrreplicatorxif', 'feaifmgrmirrorbase', Modified: trunk/xorp/mld6igmp/SConscript =================================================================== --- trunk/xorp/mld6igmp/SConscript 2009-11-27 06:33:26 UTC (rev 11607) +++ trunk/xorp/mld6igmp/SConscript 2009-11-27 06:38:43 UTC (rev 11608) @@ -44,7 +44,7 @@ env.AppendUnique(LIBS = [ 'mld6igmp', - 'feaclient', + 'xorp_fea_client', 'mld6igmpclientxif', 'fearawpkt4xif', 'fearawpkt6xif', Modified: trunk/xorp/ospf/SConscript =================================================================== --- trunk/xorp/ospf/SConscript 2009-11-27 06:33:26 UTC (rev 11607) +++ trunk/xorp/ospf/SConscript 2009-11-27 06:38:43 UTC (rev 11608) @@ -55,7 +55,7 @@ 'ospfv3base', 'policybackend', 'policycommon', - 'feaclient', + 'xorp_fea_client', 'ribxif', 'findereventnotifierxif', 'feaifmgrmirrorxif', Modified: trunk/xorp/ospf/tests/SConscript =================================================================== --- trunk/xorp/ospf/tests/SConscript 2009-11-27 06:33:26 UTC (rev 11607) +++ trunk/xorp/ospf/tests/SConscript 2009-11-27 06:38:43 UTC (rev 11608) @@ -46,7 +46,7 @@ env.AppendUnique(LIBS = [ 'ribxif', 'findereventnotifierxif', - 'feaclient', + 'xorp_fea_client', 'feaifmgrmirrorxif', 'feaifmgrreplicatorxif', 'feaifmgrmirrorbase', Modified: trunk/xorp/pim/SConscript =================================================================== --- trunk/xorp/pim/SConscript 2009-11-27 06:33:26 UTC (rev 11607) +++ trunk/xorp/pim/SConscript 2009-11-27 06:38:43 UTC (rev 11608) @@ -45,7 +45,7 @@ env.AppendUnique(LIBS = [ 'xorp_pim', # The library, not the executable. - 'feaclient', + 'xorp_fea_client', 'ribxif', 'mld6igmpxif', 'mfeaxif', Modified: trunk/xorp/rib/SConscript =================================================================== --- trunk/xorp/rib/SConscript 2009-11-27 06:33:26 UTC (rev 11607) +++ trunk/xorp/rib/SConscript 2009-11-27 06:38:43 UTC (rev 11608) @@ -51,7 +51,7 @@ env.AppendUnique(LIBS = [ 'rib', - 'feaclient', + 'xorp_fea_client', 'feaifmgrmirrorxif', 'feaifmgrreplicatorxif', 'ftixif', Modified: trunk/xorp/rib/tests/SConscript =================================================================== --- trunk/xorp/rib/tests/SConscript 2009-11-27 06:33:26 UTC (rev 11607) +++ trunk/xorp/rib/tests/SConscript 2009-11-27 06:38:43 UTC (rev 11608) @@ -46,7 +46,7 @@ env.AppendUnique(LIBS = [ 'rib', #'ribxrl', #notyet - 'feaclient', + 'xorp_fea_client', 'feaifmgrmirrorxif', 'feaifmgrreplicatorxif', 'ftixif', Modified: trunk/xorp/rip/SConscript =================================================================== --- trunk/xorp/rip/SConscript 2009-11-27 06:33:26 UTC (rev 11607) +++ trunk/xorp/rip/SConscript 2009-11-27 06:38:43 UTC (rev 11608) @@ -114,7 +114,7 @@ 'ripbase', 'ribxif', 'findereventnotifierxif', - 'feaclient', + 'xorp_fea_client', 'feaifmgrmirrorxif', 'feaifmgrreplicatorxif', 'feaifmgrmirrorbase', @@ -184,7 +184,7 @@ 'ripngbase', 'ribxif', 'findereventnotifierxif', - 'feaclient', + 'xorp_fea_client', 'feaifmgrmirrorxif', 'feaifmgrreplicatorxif', 'feaifmgrmirrorbase', Modified: trunk/xorp/rip/tests/SConscript =================================================================== --- trunk/xorp/rip/tests/SConscript 2009-11-27 06:33:26 UTC (rev 11607) +++ trunk/xorp/rip/tests/SConscript 2009-11-27 06:38:43 UTC (rev 11608) @@ -48,7 +48,7 @@ 'ripng', 'ripxif', 'findereventnotifierxif', - 'feaclient', + 'xorp_fea_client', 'feaifmgrmirrorxif', 'feaifmgrreplicatorxif', 'feaifmgrmirrorbase', Modified: trunk/xorp/static_routes/SConscript =================================================================== --- trunk/xorp/static_routes/SConscript 2009-11-27 06:33:26 UTC (rev 11607) +++ trunk/xorp/static_routes/SConscript 2009-11-27 06:38:43 UTC (rev 11608) @@ -44,7 +44,7 @@ env.AppendUnique(LIBS = [ 'staticroutes', - 'feaclient', + 'xorp_fea_client', 'feaifmgrmirrorxif', 'feaifmgrreplicatorxif', 'findereventnotifierxif', Modified: trunk/xorp/vrrp/SConscript =================================================================== --- trunk/xorp/vrrp/SConscript 2009-11-27 06:33:26 UTC (rev 11607) +++ trunk/xorp/vrrp/SConscript 2009-11-27 06:38:43 UTC (rev 11608) @@ -48,7 +48,7 @@ env.AppendUnique(LIBS = [ 'vrrp', 'vrrpbase', - 'feaclient', + 'xorp_fea_client', 'feaifmgrxif', 'feaifmgrmirrorxif', 'feaifmgrreplicatorxif', This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bms_fbsd at users.sourceforge.net Thu Nov 26 22:53:36 2009 From: bms_fbsd at users.sourceforge.net (bms_fbsd at users.sourceforge.net) Date: Fri, 27 Nov 2009 06:53:36 +0000 Subject: [Xorp-cvs] SF.net SVN: xorp:[11609] trunk/xorp Message-ID: Revision: 11609 http://xorp.svn.sourceforge.net/xorp/?rev=11609&view=rev Author: bms_fbsd Date: 2009-11-27 06:53:35 +0000 (Fri, 27 Nov 2009) Log Message: ----------- libxipc => libxorp_ipc Modified Paths: -------------- trunk/xorp/bgp/SConscript trunk/xorp/bgp/harness/SConscript trunk/xorp/bgp/tests/SConscript trunk/xorp/bgp/tools/SConscript trunk/xorp/cli/SConscript trunk/xorp/cli/tests/SConscript trunk/xorp/cli/tools/SConscript trunk/xorp/contrib/mld6igmp_lite/SConscript trunk/xorp/contrib/olsr/SConscript trunk/xorp/fea/SConscript trunk/xorp/fea/tests/SConscript trunk/xorp/fea/tools/SConscript trunk/xorp/fib2mrib/SConscript trunk/xorp/libfeaclient/tests/SConscript trunk/xorp/libxipc/SConscript trunk/xorp/libxipc/tests/SConscript trunk/xorp/mld6igmp/SConscript trunk/xorp/ospf/SConscript trunk/xorp/ospf/tests/SConscript trunk/xorp/ospf/tools/SConscript trunk/xorp/pim/SConscript trunk/xorp/policy/SConscript trunk/xorp/rib/SConscript trunk/xorp/rib/tests/SConscript trunk/xorp/rib/tools/SConscript trunk/xorp/rip/SConscript trunk/xorp/rip/tests/SConscript trunk/xorp/rip/tools/SConscript trunk/xorp/rtrmgr/SConscript trunk/xorp/rtrmgr/tests/SConscript trunk/xorp/static_routes/SConscript trunk/xorp/vrrp/SConscript Modified: trunk/xorp/bgp/SConscript =================================================================== --- trunk/xorp/bgp/SConscript 2009-11-27 06:38:43 UTC (rev 11608) +++ trunk/xorp/bgp/SConscript 2009-11-27 06:53:35 UTC (rev 11609) @@ -62,7 +62,7 @@ 'profileclientxif', 'feaifmgrmirrorxif', 'feaifmgrreplicatorxif', - 'xipc', + 'xorp_ipc', 'xorp', 'xorp_comm', ]) Modified: trunk/xorp/bgp/harness/SConscript =================================================================== --- trunk/xorp/bgp/harness/SConscript 2009-11-27 06:38:43 UTC (rev 11608) +++ trunk/xorp/bgp/harness/SConscript 2009-11-27 06:53:35 UTC (rev 11609) @@ -38,7 +38,7 @@ env.AppendUnique(LIBS = [ 'bgpxif', - 'xipc', + 'xorp_ipc', 'xorp', 'xorp_comm', ]) Modified: trunk/xorp/bgp/tests/SConscript =================================================================== --- trunk/xorp/bgp/tests/SConscript 2009-11-27 06:38:43 UTC (rev 11608) +++ trunk/xorp/bgp/tests/SConscript 2009-11-27 06:53:35 UTC (rev 11609) @@ -56,7 +56,7 @@ 'fearawpkt6xif', 'policybackend', 'policycommon', - 'xipc', + 'xorp_ipc', 'xorp_proto', 'xorp', 'xorp_comm', Modified: trunk/xorp/bgp/tools/SConscript =================================================================== --- trunk/xorp/bgp/tools/SConscript 2009-11-27 06:38:43 UTC (rev 11608) +++ trunk/xorp/bgp/tools/SConscript 2009-11-27 06:53:35 UTC (rev 11609) @@ -40,7 +40,7 @@ env.AppendUnique(LIBS = [ 'bgp', # for ASPath 'bgpxif', - 'xipc', + 'xorp_ipc', 'xorp', 'xorp_comm', ]) Modified: trunk/xorp/cli/SConscript =================================================================== --- trunk/xorp/cli/SConscript 2009-11-27 06:38:43 UTC (rev 11608) +++ trunk/xorp/cli/SConscript 2009-11-27 06:53:35 UTC (rev 11609) @@ -51,7 +51,7 @@ 'clibase', 'tecla_xorp', 'xorp_proto', - 'xipc', + 'xorp_ipc', 'xorp_comm', 'xorp', ]) Modified: trunk/xorp/cli/tests/SConscript =================================================================== --- trunk/xorp/cli/tests/SConscript 2009-11-27 06:38:43 UTC (rev 11608) +++ trunk/xorp/cli/tests/SConscript 2009-11-27 06:53:35 UTC (rev 11609) @@ -46,7 +46,7 @@ 'clibase', 'finder', 'tecla_xorp', - 'xipc', + 'xorp_ipc', 'xorp_proto', 'xorp', 'xorp_comm', Modified: trunk/xorp/cli/tools/SConscript =================================================================== --- trunk/xorp/cli/tools/SConscript 2009-11-27 06:38:43 UTC (rev 11608) +++ trunk/xorp/cli/tools/SConscript 2009-11-27 06:53:35 UTC (rev 11609) @@ -39,7 +39,7 @@ env.AppendUnique(LIBS = [ 'libcliprocessorxif', - 'xipc', + 'xorp_ipc', 'xorp', 'proto', 'xorp_comm', Modified: trunk/xorp/contrib/mld6igmp_lite/SConscript =================================================================== --- trunk/xorp/contrib/mld6igmp_lite/SConscript 2009-11-27 06:38:43 UTC (rev 11608) +++ trunk/xorp/contrib/mld6igmp_lite/SConscript 2009-11-27 06:53:35 UTC (rev 11609) @@ -56,7 +56,7 @@ 'feaifmgrmirrorbase', 'mld6igmpbase', 'xorp_mrt', - 'xipc', + 'xorp_ipc', 'xorp', 'xorp_proto', 'xorp_comm' Modified: trunk/xorp/contrib/olsr/SConscript =================================================================== --- trunk/xorp/contrib/olsr/SConscript 2009-11-27 06:38:43 UTC (rev 11608) +++ trunk/xorp/contrib/olsr/SConscript 2009-11-27 06:53:35 UTC (rev 11609) @@ -63,7 +63,7 @@ 'fearawpkt4xif', 'fearawpkt6xif', 'feaifmgrmirrorbase', - 'xipc', + 'xorp_ipc', 'xorp', 'xorp_proto', 'xorp_comm', Modified: trunk/xorp/fea/SConscript =================================================================== --- trunk/xorp/fea/SConscript 2009-11-27 06:38:43 UTC (rev 11608) +++ trunk/xorp/fea/SConscript 2009-11-27 06:53:35 UTC (rev 11609) @@ -103,7 +103,7 @@ 'xorp_mrt', 'tecla_xorp', 'xorp_proto', - 'xipc', + 'xorp_ipc', 'xorp_comm', 'xorp' ] Modified: trunk/xorp/fea/tests/SConscript =================================================================== --- trunk/xorp/fea/tests/SConscript 2009-11-27 06:38:43 UTC (rev 11608) +++ trunk/xorp/fea/tests/SConscript 2009-11-27 06:53:35 UTC (rev 11609) @@ -89,7 +89,7 @@ 'xorp_mrt', 'tecla_xorp', 'xorp_proto', - 'xipc', + 'xorp_ipc', 'xorp_comm', 'xorp' ] Modified: trunk/xorp/fea/tools/SConscript =================================================================== --- trunk/xorp/fea/tools/SConscript 2009-11-27 06:38:43 UTC (rev 11608) +++ trunk/xorp/fea/tools/SConscript 2009-11-27 06:53:35 UTC (rev 11609) @@ -43,7 +43,7 @@ 'feaifmgrmirrorxif', 'feaifmgrreplicatorxif', 'feaifmgrmirrorbase', - 'xipc', + 'xorp_ipc', 'xorp', 'xorp_proto', 'xorp_comm', Modified: trunk/xorp/fib2mrib/SConscript =================================================================== --- trunk/xorp/fib2mrib/SConscript 2009-11-27 06:38:43 UTC (rev 11608) +++ trunk/xorp/fib2mrib/SConscript 2009-11-27 06:53:35 UTC (rev 11609) @@ -55,7 +55,7 @@ 'feafibxif', 'ribxif', 'feaifmgrmirrorbase', - 'xipc', + 'xorp_ipc', 'xorp', 'xorp_proto', 'xorp_comm' Modified: trunk/xorp/libfeaclient/tests/SConscript =================================================================== --- trunk/xorp/libfeaclient/tests/SConscript 2009-11-27 06:38:43 UTC (rev 11608) +++ trunk/xorp/libfeaclient/tests/SConscript 2009-11-27 06:53:35 UTC (rev 11609) @@ -45,7 +45,7 @@ 'feaifmgrmirrorxif', 'feaifmgrreplicatorxif', 'feaifmgrmirrorbase', - 'xipc', + 'xorp_ipc', 'xorp', 'xorp_comm', ]) Modified: trunk/xorp/libxipc/SConscript =================================================================== --- trunk/xorp/libxipc/SConscript 2009-11-27 06:38:43 UTC (rev 11608) +++ trunk/xorp/libxipc/SConscript 2009-11-27 06:53:35 UTC (rev 11609) @@ -91,22 +91,25 @@ '$BUILDDIR/xrl/interfaces/common_xif$SHOBJSUFFIX', ] else: - obj_fcb = libxipc_env.StaticObject(target = 'libxipc_finder_client_base', - source = '$BUILDDIR/xrl/targets/finder_client_base.cc') - obj_fxif = libxipc_env.StaticObject(target = 'libxipc_finder_xif', - source = '$BUILDDIR/xrl/interfaces/finder_xif.cc') - obj_cxif = libxipc_env.StaticObject(target = 'libxipc_common_xif', - source = '$BUILDDIR/xrl/interfaces/common_xif.cc') + obj_fcb = libxipc_env.StaticObject( + target = 'libxipc_finder_client_base', + source = '$BUILDDIR/xrl/targets/finder_client_base.cc') + obj_fxif = libxipc_env.StaticObject( + target = 'libxipc_finder_xif', + source = '$BUILDDIR/xrl/interfaces/finder_xif.cc') + obj_cxif = libxipc_env.StaticObject( + target = 'libxipc_common_xif', + source = '$BUILDDIR/xrl/interfaces/common_xif.cc') libxipc_sources += [ obj_fcb, obj_fxif, obj_cxif ] # actual library target if is_shared: - libxipc = libxipc_env.SharedLibrary(target = 'libxipc', + libxipc = libxipc_env.SharedLibrary(target = 'libxorp_ipc', source = libxipc_sources) env.Alias('install', env.InstallLibrary('$libdir', libxipc)) else: - libxipc = libxipc_env.StaticLibrary(target = 'libxipc', + libxipc = libxipc_env.StaticLibrary(target = 'libxorp_ipc', source = libxipc_sources) # @@ -126,9 +129,9 @@ ]) libfinder_env.AppendUnique(LIBS = [ - 'libxipc', - 'libcomm', - 'libxorp' + 'xorp_ipc', + 'xorp_comm', + 'xorp' ]) libfinder_sources = [ @@ -146,22 +149,25 @@ '$BUILDDIR/xrl/interfaces/finder_event_observer_xif$SHOBJSUFFIX', ] else: - obj_f_base = libfinder_env.StaticObject(target = 'libfinder_finder_client_base', - source = '$BUILDDIR/xrl/targets/finder_base.cc') - obj_f_cxif = libfinder_env.StaticObject(target = 'libfinder_finder_client_xif', - source = '$BUILDDIR/xrl/interfaces/finder_client_xif.cc') - obj_f_eoxif = libfinder_env.StaticObject(target = 'libfinder_finder_event_observer_xif', - source = '$BUILDDIR/xrl/interfaces/finder_event_observer_xif.cc') + obj_f_base = libfinder_env.StaticObject( + target = 'libfinder_finder_client_base', + source = '$BUILDDIR/xrl/targets/finder_base.cc') + obj_f_cxif = libfinder_env.StaticObject( + target = 'libfinder_finder_client_xif', + source = '$BUILDDIR/xrl/interfaces/finder_client_xif.cc') + obj_f_eoxif = libfinder_env.StaticObject( + target = 'libfinder_finder_event_observer_xif', + source = '$BUILDDIR/xrl/interfaces/finder_event_observer_xif.cc') libfinder_sources += [ obj_f_base, obj_f_cxif, obj_f_eoxif ] # library target if is_shared: - libfinder = libfinder_env.SharedLibrary(target = 'libfinder', + libfinder = libfinder_env.SharedLibrary(target = 'libxorp_finder', source = libfinder_sources) env.Alias('install', env.InstallLibrary('$libdir', libfinder)) else: - libfinder = libfinder_env.StaticLibrary(target = 'libfinder', + libfinder = libfinder_env.StaticLibrary(target = 'libxorp_finder', source = libfinder_sources) # @@ -181,8 +187,8 @@ ]) env.AppendUnique(LIBS = [ - 'finder', - 'xipc', + 'xorp_finder', + 'xorp_ipc', 'xorp_comm', 'xorp' ]) Modified: trunk/xorp/libxipc/tests/SConscript =================================================================== --- trunk/xorp/libxipc/tests/SConscript 2009-11-27 06:38:43 UTC (rev 11608) +++ trunk/xorp/libxipc/tests/SConscript 2009-11-27 06:53:35 UTC (rev 11609) @@ -35,8 +35,8 @@ ]) env.AppendUnique(LIBS = [ - 'xipc', - 'finder', + 'xorp_ipc', + 'xorp_finder', 'xorp', 'xorp_comm', ]) Modified: trunk/xorp/mld6igmp/SConscript =================================================================== --- trunk/xorp/mld6igmp/SConscript 2009-11-27 06:38:43 UTC (rev 11608) +++ trunk/xorp/mld6igmp/SConscript 2009-11-27 06:53:35 UTC (rev 11609) @@ -56,7 +56,7 @@ 'mld6igmpbase', 'xorp_mrt', 'xorp_proto', - 'xipc', + 'xorp_ipc', 'xorp', 'xorp_comm' ]) Modified: trunk/xorp/ospf/SConscript =================================================================== --- trunk/xorp/ospf/SConscript 2009-11-27 06:38:43 UTC (rev 11608) +++ trunk/xorp/ospf/SConscript 2009-11-27 06:53:35 UTC (rev 11609) @@ -64,7 +64,7 @@ 'fearawpkt4xif', 'fearawpkt6xif', 'feaifmgrmirrorbase', - 'xipc', + 'xorp_ipc', 'xorp', 'xorp_proto', 'xorp_comm', Modified: trunk/xorp/ospf/tests/SConscript =================================================================== --- trunk/xorp/ospf/tests/SConscript 2009-11-27 06:38:43 UTC (rev 11608) +++ trunk/xorp/ospf/tests/SConscript 2009-11-27 06:53:35 UTC (rev 11609) @@ -54,7 +54,7 @@ 'fearawpkt6xif', 'policybackend', 'policycommon', - 'xipc', + 'xorp_ipc', 'xorp_proto', 'xorp', 'xorp_comm', Modified: trunk/xorp/ospf/tools/SConscript =================================================================== --- trunk/xorp/ospf/tools/SConscript 2009-11-27 06:38:43 UTC (rev 11608) +++ trunk/xorp/ospf/tools/SConscript 2009-11-27 06:53:35 UTC (rev 11609) @@ -42,7 +42,7 @@ env.AppendUnique(LIBS = [ 'ospfv2xif', 'ospfv3xif', - 'xipc', + 'xorp_ipc', 'xorp', 'xorp_proto', 'xorp_comm', Modified: trunk/xorp/pim/SConscript =================================================================== --- trunk/xorp/pim/SConscript 2009-11-27 06:38:43 UTC (rev 11608) +++ trunk/xorp/pim/SConscript 2009-11-27 06:53:35 UTC (rev 11609) @@ -59,7 +59,7 @@ 'pimbase', 'xorp_mrt', 'xorp_proto', - 'xipc', + 'xorp_ipc', 'xorp', 'xorp_comm' ]) Modified: trunk/xorp/policy/SConscript =================================================================== --- trunk/xorp/policy/SConscript 2009-11-27 06:38:43 UTC (rev 11608) +++ trunk/xorp/policy/SConscript 2009-11-27 06:53:35 UTC (rev 11609) @@ -55,7 +55,7 @@ 'policybackendxif', 'findereventnotifierxif', 'ribxif', - 'xipc', + 'xorp_ipc', 'xorp', 'xorp_proto', 'xorp_comm' Modified: trunk/xorp/rib/SConscript =================================================================== --- trunk/xorp/rib/SConscript 2009-11-27 06:38:43 UTC (rev 11608) +++ trunk/xorp/rib/SConscript 2009-11-27 06:53:35 UTC (rev 11609) @@ -69,7 +69,7 @@ 'policybackend', 'policycommon', 'finder', - 'xipc', + 'xorp_ipc', 'xorp', 'xorp_proto', 'xorp_comm' Modified: trunk/xorp/rib/tests/SConscript =================================================================== --- trunk/xorp/rib/tests/SConscript 2009-11-27 06:38:43 UTC (rev 11608) +++ trunk/xorp/rib/tests/SConscript 2009-11-27 06:53:35 UTC (rev 11609) @@ -65,7 +65,7 @@ 'policycommon', 'xorp_proto', 'finder', - 'xipc', + 'xorp_ipc', 'xorp', 'xorp_comm', ]) Modified: trunk/xorp/rib/tools/SConscript =================================================================== --- trunk/xorp/rib/tools/SConscript 2009-11-27 06:38:43 UTC (rev 11608) +++ trunk/xorp/rib/tools/SConscript 2009-11-27 06:53:35 UTC (rev 11609) @@ -42,7 +42,7 @@ 'ribxif', 'showdistancesbase', 'showroutesbase', - 'xipc', + 'xorp_ipc', 'xorp', 'xorp_proto', 'xorp_comm', Modified: trunk/xorp/rip/SConscript =================================================================== --- trunk/xorp/rip/SConscript 2009-11-27 06:38:43 UTC (rev 11608) +++ trunk/xorp/rip/SConscript 2009-11-27 06:53:35 UTC (rev 11609) @@ -122,7 +122,7 @@ 'policybackend', 'policycommon', 'xorp_proto', - 'xipc', + 'xorp_ipc', 'xorp_comm', 'xorp', ]) @@ -192,7 +192,7 @@ 'policybackend', 'policycommon', 'xorp_proto', - 'xipc', + 'xorp_ipc', 'xorp_comm', 'xorp', ]) Modified: trunk/xorp/rip/tests/SConscript =================================================================== --- trunk/xorp/rip/tests/SConscript 2009-11-27 06:38:43 UTC (rev 11608) +++ trunk/xorp/rip/tests/SConscript 2009-11-27 06:53:35 UTC (rev 11609) @@ -55,7 +55,7 @@ 'socket4xif', 'policybackend', 'policycommon', - 'xipc', + 'xorp_ipc', 'xorp', 'xorp_comm', ]) Modified: trunk/xorp/rip/tools/SConscript =================================================================== --- trunk/xorp/rip/tools/SConscript 2009-11-27 06:38:43 UTC (rev 11608) +++ trunk/xorp/rip/tools/SConscript 2009-11-27 06:53:35 UTC (rev 11609) @@ -40,7 +40,7 @@ env.AppendUnique(LIBS = [ 'ripxif', 'ripngxif', - 'xipc', + 'xorp_ipc', 'xorp', 'xorp_proto', 'xorp_comm', Modified: trunk/xorp/rtrmgr/SConscript =================================================================== --- trunk/xorp/rtrmgr/SConscript 2009-11-27 06:38:43 UTC (rev 11608) +++ trunk/xorp/rtrmgr/SConscript 2009-11-27 06:53:35 UTC (rev 11609) @@ -139,7 +139,7 @@ 'rtrmgrclientxif', 'findereventnotifierxif', 'finder', - 'xipc', + 'xorp_ipc', 'xorp_comm', 'xorp' ]) @@ -168,7 +168,7 @@ 'rtrmgrxif', 'xorpshbase', 'findereventnotifierxif', - 'xipc', + 'xorp_ipc', 'xorp_comm', 'xorp', 'curses' # XXX only for non-windows @@ -193,7 +193,7 @@ 'profilexif', 'profilerbase', 'finder', - 'xipc', + 'xorp_ipc', 'xorp_comm', 'xorp' ]) Modified: trunk/xorp/rtrmgr/tests/SConscript =================================================================== --- trunk/xorp/rtrmgr/tests/SConscript 2009-11-27 06:38:43 UTC (rev 11608) +++ trunk/xorp/rtrmgr/tests/SConscript 2009-11-27 06:53:35 UTC (rev 11609) @@ -42,7 +42,7 @@ env.AppendUnique(LIBS = [ 'rtrmgr', 'finder', - 'xipc', + 'xorp_ipc', 'xorp', 'xorp_comm', ]) Modified: trunk/xorp/static_routes/SConscript =================================================================== --- trunk/xorp/static_routes/SConscript 2009-11-27 06:38:43 UTC (rev 11608) +++ trunk/xorp/static_routes/SConscript 2009-11-27 06:53:35 UTC (rev 11609) @@ -54,7 +54,7 @@ 'findereventnotifierxif', 'policybackend', 'policycommon', - 'xipc', + 'xorp_ipc', 'xorp', 'xorp_proto', 'xorp_comm', Modified: trunk/xorp/vrrp/SConscript =================================================================== --- trunk/xorp/vrrp/SConscript 2009-11-27 06:38:43 UTC (rev 11608) +++ trunk/xorp/vrrp/SConscript 2009-11-27 06:53:35 UTC (rev 11609) @@ -55,7 +55,7 @@ 'fearawlinkxif', 'fearawpkt4xif', 'feaifmgrmirrorbase', - 'xipc', + 'xorp_ipc', 'xorp', 'xorp_proto', 'xorp_comm' This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bms_fbsd at users.sourceforge.net Thu Nov 26 23:00:05 2009 From: bms_fbsd at users.sourceforge.net (bms_fbsd at users.sourceforge.net) Date: Fri, 27 Nov 2009 07:00:05 +0000 Subject: [Xorp-cvs] SF.net SVN: xorp:[11610] trunk/xorp Message-ID: Revision: 11610 http://xorp.svn.sourceforge.net/xorp/?rev=11610&view=rev Author: bms_fbsd Date: 2009-11-27 07:00:04 +0000 (Fri, 27 Nov 2009) Log Message: ----------- libxorp => libxorp_core Modified Paths: -------------- trunk/xorp/bgp/SConscript trunk/xorp/bgp/harness/SConscript trunk/xorp/bgp/tests/SConscript trunk/xorp/bgp/tools/SConscript trunk/xorp/cli/SConscript trunk/xorp/cli/tests/SConscript trunk/xorp/cli/tools/SConscript trunk/xorp/contrib/mld6igmp_lite/SConscript trunk/xorp/contrib/olsr/SConscript trunk/xorp/fea/SConscript trunk/xorp/fea/tests/SConscript trunk/xorp/fea/tools/SConscript trunk/xorp/fib2mrib/SConscript trunk/xorp/libcomm/tests/SConscript trunk/xorp/libfeaclient/tests/SConscript trunk/xorp/libproto/tests/SConscript trunk/xorp/libxipc/SConscript trunk/xorp/libxipc/tests/SConscript trunk/xorp/libxorp/SConscript trunk/xorp/libxorp/tests/SConscript trunk/xorp/mld6igmp/SConscript trunk/xorp/mrt/tests/SConscript trunk/xorp/ospf/SConscript trunk/xorp/ospf/tests/SConscript trunk/xorp/ospf/tools/SConscript trunk/xorp/pim/SConscript trunk/xorp/policy/SConscript trunk/xorp/rib/SConscript trunk/xorp/rib/tests/SConscript trunk/xorp/rib/tools/SConscript trunk/xorp/rip/SConscript trunk/xorp/rip/tests/SConscript trunk/xorp/rip/tools/SConscript trunk/xorp/rtrmgr/SConscript trunk/xorp/rtrmgr/tests/SConscript trunk/xorp/static_routes/SConscript trunk/xorp/vrrp/SConscript Modified: trunk/xorp/bgp/SConscript =================================================================== --- trunk/xorp/bgp/SConscript 2009-11-27 06:53:35 UTC (rev 11609) +++ trunk/xorp/bgp/SConscript 2009-11-27 07:00:04 UTC (rev 11610) @@ -63,7 +63,7 @@ 'feaifmgrmirrorxif', 'feaifmgrreplicatorxif', 'xorp_ipc', - 'xorp', + 'xorp_core', 'xorp_comm', ]) Modified: trunk/xorp/bgp/harness/SConscript =================================================================== --- trunk/xorp/bgp/harness/SConscript 2009-11-27 06:53:35 UTC (rev 11609) +++ trunk/xorp/bgp/harness/SConscript 2009-11-27 07:00:04 UTC (rev 11610) @@ -39,7 +39,7 @@ env.AppendUnique(LIBS = [ 'bgpxif', 'xorp_ipc', - 'xorp', + 'xorp_core', 'xorp_comm', ]) Modified: trunk/xorp/bgp/tests/SConscript =================================================================== --- trunk/xorp/bgp/tests/SConscript 2009-11-27 06:53:35 UTC (rev 11609) +++ trunk/xorp/bgp/tests/SConscript 2009-11-27 07:00:04 UTC (rev 11610) @@ -58,7 +58,7 @@ 'policycommon', 'xorp_ipc', 'xorp_proto', - 'xorp', + 'xorp_core', 'xorp_comm', ]) Modified: trunk/xorp/bgp/tools/SConscript =================================================================== --- trunk/xorp/bgp/tools/SConscript 2009-11-27 06:53:35 UTC (rev 11609) +++ trunk/xorp/bgp/tools/SConscript 2009-11-27 07:00:04 UTC (rev 11610) @@ -41,7 +41,7 @@ 'bgp', # for ASPath 'bgpxif', 'xorp_ipc', - 'xorp', + 'xorp_core', 'xorp_comm', ]) Modified: trunk/xorp/cli/SConscript =================================================================== --- trunk/xorp/cli/SConscript 2009-11-27 06:53:35 UTC (rev 11609) +++ trunk/xorp/cli/SConscript 2009-11-27 07:00:04 UTC (rev 11610) @@ -53,7 +53,7 @@ 'xorp_proto', 'xorp_ipc', 'xorp_comm', - 'xorp', + 'xorp_core', ]) libclisrcs = [ Modified: trunk/xorp/cli/tests/SConscript =================================================================== --- trunk/xorp/cli/tests/SConscript 2009-11-27 06:53:35 UTC (rev 11609) +++ trunk/xorp/cli/tests/SConscript 2009-11-27 07:00:04 UTC (rev 11610) @@ -48,7 +48,7 @@ 'tecla_xorp', 'xorp_ipc', 'xorp_proto', - 'xorp', + 'xorp_core', 'xorp_comm', ]) Modified: trunk/xorp/cli/tools/SConscript =================================================================== --- trunk/xorp/cli/tools/SConscript 2009-11-27 06:53:35 UTC (rev 11609) +++ trunk/xorp/cli/tools/SConscript 2009-11-27 07:00:04 UTC (rev 11610) @@ -40,7 +40,7 @@ env.AppendUnique(LIBS = [ 'libcliprocessorxif', 'xorp_ipc', - 'xorp', + 'xorp_core', 'proto', 'xorp_comm', ]) Modified: trunk/xorp/contrib/mld6igmp_lite/SConscript =================================================================== --- trunk/xorp/contrib/mld6igmp_lite/SConscript 2009-11-27 06:53:35 UTC (rev 11609) +++ trunk/xorp/contrib/mld6igmp_lite/SConscript 2009-11-27 07:00:04 UTC (rev 11610) @@ -57,7 +57,7 @@ 'mld6igmpbase', 'xorp_mrt', 'xorp_ipc', - 'xorp', + 'xorp_core', 'xorp_proto', 'xorp_comm' ]) Modified: trunk/xorp/contrib/olsr/SConscript =================================================================== --- trunk/xorp/contrib/olsr/SConscript 2009-11-27 06:53:35 UTC (rev 11609) +++ trunk/xorp/contrib/olsr/SConscript 2009-11-27 07:00:04 UTC (rev 11610) @@ -64,7 +64,7 @@ 'fearawpkt6xif', 'feaifmgrmirrorbase', 'xorp_ipc', - 'xorp', + 'xorp_core', 'xorp_proto', 'xorp_comm', ]) Modified: trunk/xorp/fea/SConscript =================================================================== --- trunk/xorp/fea/SConscript 2009-11-27 06:53:35 UTC (rev 11609) +++ trunk/xorp/fea/SConscript 2009-11-27 07:00:04 UTC (rev 11610) @@ -105,7 +105,7 @@ 'xorp_proto', 'xorp_ipc', 'xorp_comm', - 'xorp' + 'xorp_core' ] env.PrependUnique(LIBS = libxorp_fea_linkorder) Modified: trunk/xorp/fea/tests/SConscript =================================================================== --- trunk/xorp/fea/tests/SConscript 2009-11-27 06:53:35 UTC (rev 11609) +++ trunk/xorp/fea/tests/SConscript 2009-11-27 07:00:04 UTC (rev 11610) @@ -91,7 +91,7 @@ 'xorp_proto', 'xorp_ipc', 'xorp_comm', - 'xorp' + 'xorp_core' ] env.PrependUnique(LIBS = libxorp_fea_linkorder) Modified: trunk/xorp/fea/tools/SConscript =================================================================== --- trunk/xorp/fea/tools/SConscript 2009-11-27 06:53:35 UTC (rev 11609) +++ trunk/xorp/fea/tools/SConscript 2009-11-27 07:00:04 UTC (rev 11610) @@ -44,7 +44,7 @@ 'feaifmgrreplicatorxif', 'feaifmgrmirrorbase', 'xorp_ipc', - 'xorp', + 'xorp_core', 'xorp_proto', 'xorp_comm', ]) Modified: trunk/xorp/fib2mrib/SConscript =================================================================== --- trunk/xorp/fib2mrib/SConscript 2009-11-27 06:53:35 UTC (rev 11609) +++ trunk/xorp/fib2mrib/SConscript 2009-11-27 07:00:04 UTC (rev 11610) @@ -56,7 +56,7 @@ 'ribxif', 'feaifmgrmirrorbase', 'xorp_ipc', - 'xorp', + 'xorp_core', 'xorp_proto', 'xorp_comm' ]) Modified: trunk/xorp/libcomm/tests/SConscript =================================================================== --- trunk/xorp/libcomm/tests/SConscript 2009-11-27 06:53:35 UTC (rev 11609) +++ trunk/xorp/libcomm/tests/SConscript 2009-11-27 07:00:04 UTC (rev 11610) @@ -24,7 +24,7 @@ env.PrependUnique(CPPPATH = [ '#', '$BUILDDIR', '$BUILDDIR/libcomm', ]) env.PrependUnique(LIBPATH = [ '$BUILDDIR/libxorp', '$BUILDDIR/libcomm', ]) -env.PrependUnique(LIBS = [ 'xorp', 'xorp_comm' ]) +env.PrependUnique(LIBS = [ 'xorp_core', 'xorp_comm' ]) # XXX Not for cross-compilation. test_comm = env.AutoTest(target = 'test_comm', source = 'test_comm.c') Modified: trunk/xorp/libfeaclient/tests/SConscript =================================================================== --- trunk/xorp/libfeaclient/tests/SConscript 2009-11-27 06:53:35 UTC (rev 11609) +++ trunk/xorp/libfeaclient/tests/SConscript 2009-11-27 07:00:04 UTC (rev 11610) @@ -46,7 +46,7 @@ 'feaifmgrreplicatorxif', 'feaifmgrmirrorbase', 'xorp_ipc', - 'xorp', + 'xorp_core', 'xorp_comm', ]) Modified: trunk/xorp/libproto/tests/SConscript =================================================================== --- trunk/xorp/libproto/tests/SConscript 2009-11-27 06:53:35 UTC (rev 11609) +++ trunk/xorp/libproto/tests/SConscript 2009-11-27 07:00:04 UTC (rev 11610) @@ -39,7 +39,7 @@ env.AppendUnique(LIBS = [ 'xorp_proto', - 'xorp', + 'xorp_core', 'xorp_comm', ]) Modified: trunk/xorp/libxipc/SConscript =================================================================== --- trunk/xorp/libxipc/SConscript 2009-11-27 06:53:35 UTC (rev 11609) +++ trunk/xorp/libxipc/SConscript 2009-11-27 07:00:04 UTC (rev 11610) @@ -43,7 +43,7 @@ libxipc_env.AppendUnique(LIBS = [ 'xorp_comm', - 'xorp' + 'xorp_core' ]) libxipc_sources = [ @@ -131,7 +131,7 @@ libfinder_env.AppendUnique(LIBS = [ 'xorp_ipc', 'xorp_comm', - 'xorp' + 'xorp_core' ]) libfinder_sources = [ @@ -190,7 +190,7 @@ 'xorp_finder', 'xorp_ipc', 'xorp_comm', - 'xorp' + 'xorp_core' ]) xorp_finder = env.Program(target = 'xorp_finder', Modified: trunk/xorp/libxipc/tests/SConscript =================================================================== --- trunk/xorp/libxipc/tests/SConscript 2009-11-27 06:53:35 UTC (rev 11609) +++ trunk/xorp/libxipc/tests/SConscript 2009-11-27 07:00:04 UTC (rev 11610) @@ -37,7 +37,7 @@ env.AppendUnique(LIBS = [ 'xorp_ipc', 'xorp_finder', - 'xorp', + 'xorp_core', 'xorp_comm', ]) Modified: trunk/xorp/libxorp/SConscript =================================================================== --- trunk/xorp/libxorp/SConscript 2009-11-27 06:53:35 UTC (rev 11609) +++ trunk/xorp/libxorp/SConscript 2009-11-27 07:00:04 UTC (rev 11610) @@ -28,7 +28,7 @@ env.AppendUnique(CPPPATH = [ '#' ]) -sources = [ +libxorp_core_srcs = [ # C files 'daemon.c', 'debug.c', @@ -79,12 +79,14 @@ ] if is_shared: - libxorp = env.SharedLibrary(target = 'libxorp', source = sources) + libxorp_core = env.SharedLibrary(target = 'libxorp_core', + source = libxorp_core_srcs) else: - libxorp = env.StaticLibrary(target = 'libxorp', source = sources) + libxorp_core = env.StaticLibrary(target = 'libxorp_core', + source = libxorp_core_srcs) if is_shared: env.Alias('install', - env.InstallLibrary('$libdir', libxorp)) + env.InstallLibrary('$libdir', libxorp_core)) -Default(libxorp) +Default(libxorp_core) Modified: trunk/xorp/libxorp/tests/SConscript =================================================================== --- trunk/xorp/libxorp/tests/SConscript 2009-11-27 06:53:35 UTC (rev 11609) +++ trunk/xorp/libxorp/tests/SConscript 2009-11-27 07:00:04 UTC (rev 11610) @@ -23,7 +23,7 @@ env = env.Clone() env.AppendUnique(CPPPATH = [ '#', '$BUILDDIR', '$BUILDDIR/libxorp', ]) env.AppendUnique(LIBPATH = [ '$BUILDDIR/libxorp', '$BUILDDIR/libcomm', ]) -env.AppendUnique(LIBS = [ 'xorp', 'xorp_comm' ]) +env.AppendUnique(LIBS = [ 'xorp_core', 'xorp_comm' ]) tests = [ 'asyncio', Modified: trunk/xorp/mld6igmp/SConscript =================================================================== --- trunk/xorp/mld6igmp/SConscript 2009-11-27 06:53:35 UTC (rev 11609) +++ trunk/xorp/mld6igmp/SConscript 2009-11-27 07:00:04 UTC (rev 11610) @@ -57,7 +57,7 @@ 'xorp_mrt', 'xorp_proto', 'xorp_ipc', - 'xorp', + 'xorp_core', 'xorp_comm' ]) Modified: trunk/xorp/mrt/tests/SConscript =================================================================== --- trunk/xorp/mrt/tests/SConscript 2009-11-27 06:53:35 UTC (rev 11609) +++ trunk/xorp/mrt/tests/SConscript 2009-11-27 07:00:04 UTC (rev 11610) @@ -36,7 +36,7 @@ env.AppendUnique(LIBS = [ 'xorp_mrt', - 'xorp', + 'xorp_core', 'xorp_comm', ]) Modified: trunk/xorp/ospf/SConscript =================================================================== --- trunk/xorp/ospf/SConscript 2009-11-27 06:53:35 UTC (rev 11609) +++ trunk/xorp/ospf/SConscript 2009-11-27 07:00:04 UTC (rev 11610) @@ -65,7 +65,7 @@ 'fearawpkt6xif', 'feaifmgrmirrorbase', 'xorp_ipc', - 'xorp', + 'xorp_core', 'xorp_proto', 'xorp_comm', ]) Modified: trunk/xorp/ospf/tests/SConscript =================================================================== --- trunk/xorp/ospf/tests/SConscript 2009-11-27 06:53:35 UTC (rev 11609) +++ trunk/xorp/ospf/tests/SConscript 2009-11-27 07:00:04 UTC (rev 11610) @@ -56,7 +56,7 @@ 'policycommon', 'xorp_ipc', 'xorp_proto', - 'xorp', + 'xorp_core', 'xorp_comm', ]) Modified: trunk/xorp/ospf/tools/SConscript =================================================================== --- trunk/xorp/ospf/tools/SConscript 2009-11-27 06:53:35 UTC (rev 11609) +++ trunk/xorp/ospf/tools/SConscript 2009-11-27 07:00:04 UTC (rev 11610) @@ -43,7 +43,7 @@ 'ospfv2xif', 'ospfv3xif', 'xorp_ipc', - 'xorp', + 'xorp_core', 'xorp_proto', 'xorp_comm', ]) Modified: trunk/xorp/pim/SConscript =================================================================== --- trunk/xorp/pim/SConscript 2009-11-27 06:53:35 UTC (rev 11609) +++ trunk/xorp/pim/SConscript 2009-11-27 07:00:04 UTC (rev 11610) @@ -60,7 +60,7 @@ 'xorp_mrt', 'xorp_proto', 'xorp_ipc', - 'xorp', + 'xorp_core', 'xorp_comm' ]) Modified: trunk/xorp/policy/SConscript =================================================================== --- trunk/xorp/policy/SConscript 2009-11-27 06:53:35 UTC (rev 11609) +++ trunk/xorp/policy/SConscript 2009-11-27 07:00:04 UTC (rev 11610) @@ -56,7 +56,7 @@ 'findereventnotifierxif', 'ribxif', 'xorp_ipc', - 'xorp', + 'xorp_core', 'xorp_proto', 'xorp_comm' ]) Modified: trunk/xorp/rib/SConscript =================================================================== --- trunk/xorp/rib/SConscript 2009-11-27 06:53:35 UTC (rev 11609) +++ trunk/xorp/rib/SConscript 2009-11-27 07:00:04 UTC (rev 11610) @@ -70,7 +70,7 @@ 'policycommon', 'finder', 'xorp_ipc', - 'xorp', + 'xorp_core', 'xorp_proto', 'xorp_comm' ]) Modified: trunk/xorp/rib/tests/SConscript =================================================================== --- trunk/xorp/rib/tests/SConscript 2009-11-27 06:53:35 UTC (rev 11609) +++ trunk/xorp/rib/tests/SConscript 2009-11-27 07:00:04 UTC (rev 11610) @@ -66,7 +66,7 @@ 'xorp_proto', 'finder', 'xorp_ipc', - 'xorp', + 'xorp_core', 'xorp_comm', ]) Modified: trunk/xorp/rib/tools/SConscript =================================================================== --- trunk/xorp/rib/tools/SConscript 2009-11-27 06:53:35 UTC (rev 11609) +++ trunk/xorp/rib/tools/SConscript 2009-11-27 07:00:04 UTC (rev 11610) @@ -43,7 +43,7 @@ 'showdistancesbase', 'showroutesbase', 'xorp_ipc', - 'xorp', + 'xorp_core', 'xorp_proto', 'xorp_comm', ]) Modified: trunk/xorp/rip/SConscript =================================================================== --- trunk/xorp/rip/SConscript 2009-11-27 06:53:35 UTC (rev 11609) +++ trunk/xorp/rip/SConscript 2009-11-27 07:00:04 UTC (rev 11610) @@ -124,7 +124,7 @@ 'xorp_proto', 'xorp_ipc', 'xorp_comm', - 'xorp', + 'xorp_core', ]) if is_shared: @@ -194,7 +194,7 @@ 'xorp_proto', 'xorp_ipc', 'xorp_comm', - 'xorp', + 'xorp_core', ]) if is_shared: Modified: trunk/xorp/rip/tests/SConscript =================================================================== --- trunk/xorp/rip/tests/SConscript 2009-11-27 06:53:35 UTC (rev 11609) +++ trunk/xorp/rip/tests/SConscript 2009-11-27 07:00:04 UTC (rev 11610) @@ -56,7 +56,7 @@ 'policybackend', 'policycommon', 'xorp_ipc', - 'xorp', + 'xorp_core', 'xorp_comm', ]) Modified: trunk/xorp/rip/tools/SConscript =================================================================== --- trunk/xorp/rip/tools/SConscript 2009-11-27 06:53:35 UTC (rev 11609) +++ trunk/xorp/rip/tools/SConscript 2009-11-27 07:00:04 UTC (rev 11610) @@ -41,7 +41,7 @@ 'ripxif', 'ripngxif', 'xorp_ipc', - 'xorp', + 'xorp_core', 'xorp_proto', 'xorp_comm', ]) Modified: trunk/xorp/rtrmgr/SConscript =================================================================== --- trunk/xorp/rtrmgr/SConscript 2009-11-27 06:53:35 UTC (rev 11609) +++ trunk/xorp/rtrmgr/SConscript 2009-11-27 07:00:04 UTC (rev 11610) @@ -141,7 +141,7 @@ 'finder', 'xorp_ipc', 'xorp_comm', - 'xorp' + 'xorp_core' ]) rtrmgr_srcs = [ @@ -170,7 +170,7 @@ 'findereventnotifierxif', 'xorp_ipc', 'xorp_comm', - 'xorp', + 'xorp_core', 'curses' # XXX only for non-windows ]) @@ -195,7 +195,7 @@ 'finder', 'xorp_ipc', 'xorp_comm', - 'xorp' + 'xorp_core' ]) profiler_srcs = [ Modified: trunk/xorp/rtrmgr/tests/SConscript =================================================================== --- trunk/xorp/rtrmgr/tests/SConscript 2009-11-27 06:53:35 UTC (rev 11609) +++ trunk/xorp/rtrmgr/tests/SConscript 2009-11-27 07:00:04 UTC (rev 11610) @@ -43,7 +43,7 @@ 'rtrmgr', 'finder', 'xorp_ipc', - 'xorp', + 'xorp_core', 'xorp_comm', ]) Modified: trunk/xorp/static_routes/SConscript =================================================================== --- trunk/xorp/static_routes/SConscript 2009-11-27 06:53:35 UTC (rev 11609) +++ trunk/xorp/static_routes/SConscript 2009-11-27 07:00:04 UTC (rev 11610) @@ -55,7 +55,7 @@ 'policybackend', 'policycommon', 'xorp_ipc', - 'xorp', + 'xorp_core', 'xorp_proto', 'xorp_comm', ]) Modified: trunk/xorp/vrrp/SConscript =================================================================== --- trunk/xorp/vrrp/SConscript 2009-11-27 06:53:35 UTC (rev 11609) +++ trunk/xorp/vrrp/SConscript 2009-11-27 07:00:04 UTC (rev 11610) @@ -56,7 +56,7 @@ 'fearawpkt4xif', 'feaifmgrmirrorbase', 'xorp_ipc', - 'xorp', + 'xorp_core', 'xorp_proto', 'xorp_comm' ]) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bms_fbsd at users.sourceforge.net Thu Nov 26 23:10:38 2009 From: bms_fbsd at users.sourceforge.net (bms_fbsd at users.sourceforge.net) Date: Fri, 27 Nov 2009 07:10:38 +0000 Subject: [Xorp-cvs] SF.net SVN: xorp:[11611] trunk/xorp/libcomm/SConscript Message-ID: Revision: 11611 http://xorp.svn.sourceforge.net/xorp/?rev=11611&view=rev Author: bms_fbsd Date: 2009-11-27 07:10:37 +0000 (Fri, 27 Nov 2009) Log Message: ----------- libxorp => xorp_core Modified Paths: -------------- trunk/xorp/libcomm/SConscript Modified: trunk/xorp/libcomm/SConscript =================================================================== --- trunk/xorp/libcomm/SConscript 2009-11-27 07:00:04 UTC (rev 11610) +++ trunk/xorp/libcomm/SConscript 2009-11-27 07:10:37 UTC (rev 11611) @@ -29,7 +29,7 @@ env.AppendUnique(CPPPATH = [ "#" ]) env.PrependUnique(LIBPATH = [ '$BUILDDIR/libxorp' ] ) -env.AppendUnique(LIBS = ['libxorp']) +env.AppendUnique(LIBS = ['xorp_core']) sources = [ 'comm_sock.c', This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bms_fbsd at users.sourceforge.net Thu Nov 26 23:11:37 2009 From: bms_fbsd at users.sourceforge.net (bms_fbsd at users.sourceforge.net) Date: Fri, 27 Nov 2009 07:11:37 +0000 Subject: [Xorp-cvs] SF.net SVN: xorp:[11612] trunk/xorp Message-ID: Revision: 11612 http://xorp.svn.sourceforge.net/xorp/?rev=11612&view=rev Author: bms_fbsd Date: 2009-11-27 07:11:37 +0000 (Fri, 27 Nov 2009) Log Message: ----------- libpolicy => libxorp_policy libpolicybackend => libxorp_policy_backend libpolicycommon => libxorp_policy_common Modified Paths: -------------- trunk/xorp/bgp/SConscript trunk/xorp/bgp/tests/SConscript trunk/xorp/contrib/olsr/SConscript trunk/xorp/fib2mrib/SConscript trunk/xorp/ospf/SConscript trunk/xorp/ospf/tests/SConscript trunk/xorp/policy/SConscript trunk/xorp/policy/backend/SConscript trunk/xorp/policy/common/SConscript trunk/xorp/rib/SConscript trunk/xorp/rib/tests/SConscript trunk/xorp/rip/SConscript trunk/xorp/rip/tests/SConscript trunk/xorp/static_routes/SConscript Modified: trunk/xorp/bgp/SConscript =================================================================== --- trunk/xorp/bgp/SConscript 2009-11-27 07:10:37 UTC (rev 11611) +++ trunk/xorp/bgp/SConscript 2009-11-27 07:11:37 UTC (rev 11612) @@ -52,8 +52,8 @@ ]) env.AppendUnique(LIBS = [ - 'policybackend', - 'policycommon', + 'xorp_policy_backend', + 'xorp_policy_common', 'xorp_fea_client', 'bgpbase', 'feaifmgrmirrorbase', Modified: trunk/xorp/bgp/tests/SConscript =================================================================== --- trunk/xorp/bgp/tests/SConscript 2009-11-27 07:10:37 UTC (rev 11611) +++ trunk/xorp/bgp/tests/SConscript 2009-11-27 07:11:37 UTC (rev 11612) @@ -54,8 +54,8 @@ 'feaifmgrmirrorbase', 'fearawpkt4xif', 'fearawpkt6xif', - 'policybackend', - 'policycommon', + 'xorp_policy_backend', + 'xorp_policy_common', 'xorp_ipc', 'xorp_proto', 'xorp_core', Modified: trunk/xorp/contrib/olsr/SConscript =================================================================== --- trunk/xorp/contrib/olsr/SConscript 2009-11-27 07:10:37 UTC (rev 11611) +++ trunk/xorp/contrib/olsr/SConscript 2009-11-27 07:11:37 UTC (rev 11612) @@ -52,8 +52,8 @@ env.AppendUnique(LIBS = [ 'olsr', 'olsr4base', - 'policybackend', - 'policycommon', + 'xorp_policy_backend', + 'xorp_policy_common', 'xorp_fea_client', 'ribxif', 'findereventnotifierxif', Modified: trunk/xorp/fib2mrib/SConscript =================================================================== --- trunk/xorp/fib2mrib/SConscript 2009-11-27 07:10:37 UTC (rev 11611) +++ trunk/xorp/fib2mrib/SConscript 2009-11-27 07:11:37 UTC (rev 11612) @@ -45,8 +45,8 @@ env.AppendUnique(LIBS = [ 'fib2mrib', 'fib2mribbase', - 'policybackend', - 'policycommon', + 'xorp_policy_backend', + 'xorp_policy_common', 'xorp_fea_client', 'findereventnotifierxif', 'feaifmgrmirrorxif', Modified: trunk/xorp/ospf/SConscript =================================================================== --- trunk/xorp/ospf/SConscript 2009-11-27 07:10:37 UTC (rev 11611) +++ trunk/xorp/ospf/SConscript 2009-11-27 07:11:37 UTC (rev 11612) @@ -53,8 +53,8 @@ 'xorp_ospf', # Refers to the library, not the executable. 'ospfv2base', 'ospfv3base', - 'policybackend', - 'policycommon', + 'xorp_policy_backend', + 'xorp_policy_common', 'xorp_fea_client', 'ribxif', 'findereventnotifierxif', Modified: trunk/xorp/ospf/tests/SConscript =================================================================== --- trunk/xorp/ospf/tests/SConscript 2009-11-27 07:10:37 UTC (rev 11611) +++ trunk/xorp/ospf/tests/SConscript 2009-11-27 07:11:37 UTC (rev 11612) @@ -52,8 +52,8 @@ 'feaifmgrmirrorbase', 'fearawpkt4xif', 'fearawpkt6xif', - 'policybackend', - 'policycommon', + 'xorp_policy_backend', + 'xorp_policy_common', 'xorp_ipc', 'xorp_proto', 'xorp_core', Modified: trunk/xorp/policy/SConscript =================================================================== --- trunk/xorp/policy/SConscript 2009-11-27 07:10:37 UTC (rev 11611) +++ trunk/xorp/policy/SConscript 2009-11-27 07:11:37 UTC (rev 11612) @@ -48,9 +48,9 @@ ]) env.AppendUnique(LIBS = [ - 'policy', - 'policybackend', - 'policycommon', + 'xorp_policy', + 'xorp_policy_backend', + 'xorp_policy_common', 'policybase', 'policybackendxif', 'findereventnotifierxif', @@ -61,7 +61,7 @@ 'xorp_comm' ]) -libpolicysrcs = [ +libxorp_policy_srcs = [ 'code.cc', 'code_generator.cc', 'code_list.cc', @@ -94,10 +94,14 @@ ###### if is_shared: - libpolicy = env.SharedLibrary(target = 'libpolicy', source = libpolicysrcs, LIBS = '') - env.Alias('install', env.InstallLibrary('$libdir', libpolicy)) + libxorp_policy = env.SharedLibrary(target = 'libxorp_policy', + source = libxorp_policy_srcs, + LIBS = '') + env.Alias('install', env.InstallLibrary('$libdir', libxorp_policy)) else: - libpolicy = env.StaticLibrary(target = 'libpolicy', source = libpolicysrcs, LIBS = '') + libxorp_policy = env.StaticLibrary(target = 'libxorp_policy', + source = libxorp_policy_srcs, + LIBS = '') ###### @@ -108,4 +112,4 @@ env.Alias('install', env.InstallProgram(pcpath, policy)) -Default(libpolicy, policy) +Default(libxorp_policy, policy) Modified: trunk/xorp/policy/backend/SConscript =================================================================== --- trunk/xorp/policy/backend/SConscript 2009-11-27 07:10:37 UTC (rev 11611) +++ trunk/xorp/policy/backend/SConscript 2009-11-27 07:11:37 UTC (rev 11612) @@ -42,10 +42,12 @@ ] if is_shared: - libpbe = env.SharedLibrary(target = 'libpolicybackend', source = libpbesrcs) + libpbe = env.SharedLibrary(target = 'libxorp_policy_backend', + source = libpbesrcs) env.Alias('install', env.InstallLibrary('$libdir', libpbe)) else: - libpbe = env.StaticLibrary(target = 'libpolicybackend', source = libpbesrcs) + libpbe = env.StaticLibrary(target = 'libxorp_policy_backend', + source = libpbesrcs) Default(libpbe) Modified: trunk/xorp/policy/common/SConscript =================================================================== --- trunk/xorp/policy/common/SConscript 2009-11-27 07:10:37 UTC (rev 11611) +++ trunk/xorp/policy/common/SConscript 2009-11-27 07:11:37 UTC (rev 11612) @@ -43,12 +43,14 @@ # deal with bgp aspath shared code if is_shared: libpcmsrcs += [ '../../bgp/aspath.cc' ] - libpcm = env.SharedLibrary(target = 'libpolicycommon', source = libpcmsrcs) + libpcm = env.SharedLibrary(target = 'libxorp_policy_common', + source = libpcmsrcs) env.Alias('install', env.InstallLibrary('$libdir', libpcm)) else: obj_aspath = env.StaticObject(target = 'aspath', source = '../../bgp/aspath.cc') libpcmsrcs += [ obj_aspath ] - libpcm = env.StaticLibrary(target = 'libpolicycommon', source = libpcmsrcs) + libpcm = env.StaticLibrary(target = 'libxorp_policy_common', + source = libpcmsrcs) Default(libpcm) Modified: trunk/xorp/rib/SConscript =================================================================== --- trunk/xorp/rib/SConscript 2009-11-27 07:10:37 UTC (rev 11611) +++ trunk/xorp/rib/SConscript 2009-11-27 07:11:37 UTC (rev 11612) @@ -66,8 +66,8 @@ 'profileclientxif', 'feaifmgrmirrorbase', 'ribbase', - 'policybackend', - 'policycommon', + 'xorp_policy_backend', + 'xorp_policy_common', 'finder', 'xorp_ipc', 'xorp_core', Modified: trunk/xorp/rib/tests/SConscript =================================================================== --- trunk/xorp/rib/tests/SConscript 2009-11-27 07:10:37 UTC (rev 11611) +++ trunk/xorp/rib/tests/SConscript 2009-11-27 07:11:37 UTC (rev 11612) @@ -61,8 +61,8 @@ 'profileclientxif', 'feaifmgrmirrorbase', 'ribbase', - 'policybackend', - 'policycommon', + 'xorp_policy_backend', + 'xorp_policy_common', 'xorp_proto', 'finder', 'xorp_ipc', Modified: trunk/xorp/rip/SConscript =================================================================== --- trunk/xorp/rip/SConscript 2009-11-27 07:10:37 UTC (rev 11611) +++ trunk/xorp/rip/SConscript 2009-11-27 07:11:37 UTC (rev 11612) @@ -119,8 +119,8 @@ 'feaifmgrreplicatorxif', 'feaifmgrmirrorbase', 'socket4xif', - 'policybackend', - 'policycommon', + 'xorp_policy_backend', + 'xorp_policy_common', 'xorp_proto', 'xorp_ipc', 'xorp_comm', @@ -189,8 +189,8 @@ 'feaifmgrreplicatorxif', 'feaifmgrmirrorbase', 'socket6xif', - 'policybackend', - 'policycommon', + 'xorp_policy_backend', + 'xorp_policy_common', 'xorp_proto', 'xorp_ipc', 'xorp_comm', Modified: trunk/xorp/rip/tests/SConscript =================================================================== --- trunk/xorp/rip/tests/SConscript 2009-11-27 07:10:37 UTC (rev 11611) +++ trunk/xorp/rip/tests/SConscript 2009-11-27 07:11:37 UTC (rev 11612) @@ -53,8 +53,8 @@ 'feaifmgrreplicatorxif', 'feaifmgrmirrorbase', 'socket4xif', - 'policybackend', - 'policycommon', + 'xorp_policy_backend', + 'xorp_policy_common', 'xorp_ipc', 'xorp_core', 'xorp_comm', Modified: trunk/xorp/static_routes/SConscript =================================================================== --- trunk/xorp/static_routes/SConscript 2009-11-27 07:10:37 UTC (rev 11611) +++ trunk/xorp/static_routes/SConscript 2009-11-27 07:11:37 UTC (rev 11612) @@ -52,8 +52,8 @@ 'staticroutesbase', 'ribxif', 'findereventnotifierxif', - 'policybackend', - 'policycommon', + 'xorp_policy_backend', + 'xorp_policy_common', 'xorp_ipc', 'xorp_core', 'xorp_proto', This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bms_fbsd at users.sourceforge.net Thu Nov 26 23:13:03 2009 From: bms_fbsd at users.sourceforge.net (bms_fbsd at users.sourceforge.net) Date: Fri, 27 Nov 2009 07:13:03 +0000 Subject: [Xorp-cvs] SF.net SVN: xorp:[11613] trunk/xorp Message-ID: Revision: 11613 http://xorp.svn.sourceforge.net/xorp/?rev=11613&view=rev Author: bms_fbsd Date: 2009-11-27 07:12:59 +0000 (Fri, 27 Nov 2009) Log Message: ----------- Catch stragglers in LIBS. Modified Paths: -------------- trunk/xorp/libproto/SConscript trunk/xorp/xrl/interfaces/SConscript trunk/xorp/xrl/targets/SConscript Modified: trunk/xorp/libproto/SConscript =================================================================== --- trunk/xorp/libproto/SConscript 2009-11-27 07:11:37 UTC (rev 11612) +++ trunk/xorp/libproto/SConscript 2009-11-27 07:12:59 UTC (rev 11613) @@ -28,7 +28,8 @@ env.AppendUnique(CPPPATH = [ "#" ]) env.PrependUnique(LIBPATH = [ '$BUILDDIR/libxorp'] ) -env.AppendUnique(LIBS = ['libxorp', 'crypto']) +# XXX 'crypto' is a base system prerequisite; use LINKFLAGS? +env.AppendUnique(LIBS = ['xorp_core', 'crypto']) sources = [ 'checksum.c', Modified: trunk/xorp/xrl/interfaces/SConscript =================================================================== --- trunk/xorp/xrl/interfaces/SConscript 2009-11-27 07:11:37 UTC (rev 11612) +++ trunk/xorp/xrl/interfaces/SConscript 2009-11-27 07:12:59 UTC (rev 11613) @@ -30,9 +30,9 @@ env.AppendUnique(LIBPATH = [ '$BUILDDIR/libxipc', '$BUILDDIR/libcomm', '$BUILDDIR/libxorp' ] ) -env.AppendUnique(LIBS = [ 'libxipc', - 'libcomm', - 'libxorp' ]) +env.AppendUnique(LIBS = [ 'xorp_ipc', + 'xorp_comm', + 'xorp_core' ]) xifs = [ 'bgp.xif', Modified: trunk/xorp/xrl/targets/SConscript =================================================================== --- trunk/xorp/xrl/targets/SConscript 2009-11-27 07:11:37 UTC (rev 11612) +++ trunk/xorp/xrl/targets/SConscript 2009-11-27 07:12:59 UTC (rev 11613) @@ -32,9 +32,9 @@ ]) env.AppendUnique(LIBS = [ - 'libxipc', - 'libcomm', - 'libxorp', + 'xorp_ipc', + 'xorp_comm', + 'xorp_core', ]) env['TGTGEN_CPPPATH'] = [ '#/xrl/interfaces' ] This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bms_fbsd at users.sourceforge.net Thu Nov 26 23:23:17 2009 From: bms_fbsd at users.sourceforge.net (bms_fbsd at users.sourceforge.net) Date: Fri, 27 Nov 2009 07:23:17 +0000 Subject: [Xorp-cvs] SF.net SVN: xorp:[11614] trunk/xorp/cli/tools/SConscript Message-ID: Revision: 11614 http://xorp.svn.sourceforge.net/xorp/?rev=11614&view=rev Author: bms_fbsd Date: 2009-11-27 07:23:17 +0000 (Fri, 27 Nov 2009) Log Message: ----------- catchup libnames Modified Paths: -------------- trunk/xorp/cli/tools/SConscript Modified: trunk/xorp/cli/tools/SConscript =================================================================== --- trunk/xorp/cli/tools/SConscript 2009-11-27 07:12:59 UTC (rev 11613) +++ trunk/xorp/cli/tools/SConscript 2009-11-27 07:23:17 UTC (rev 11614) @@ -38,10 +38,10 @@ ]) env.AppendUnique(LIBS = [ - 'libcliprocessorxif', + 'cliprocessorxif', 'xorp_ipc', 'xorp_core', - 'proto', + 'xorp_proto', 'xorp_comm', ]) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bms_fbsd at users.sourceforge.net Thu Nov 26 23:26:20 2009 From: bms_fbsd at users.sourceforge.net (bms_fbsd at users.sourceforge.net) Date: Fri, 27 Nov 2009 07:26:20 +0000 Subject: [Xorp-cvs] SF.net SVN: xorp:[11615] trunk/xorp Message-ID: Revision: 11615 http://xorp.svn.sourceforge.net/xorp/?rev=11615&view=rev Author: bms_fbsd Date: 2009-11-27 07:26:17 +0000 (Fri, 27 Nov 2009) Log Message: ----------- libfinder => libxorp_finder Modified Paths: -------------- trunk/xorp/rib/SConscript trunk/xorp/rtrmgr/SConscript Modified: trunk/xorp/rib/SConscript =================================================================== --- trunk/xorp/rib/SConscript 2009-11-27 07:23:17 UTC (rev 11614) +++ trunk/xorp/rib/SConscript 2009-11-27 07:26:17 UTC (rev 11615) @@ -68,7 +68,7 @@ 'ribbase', 'xorp_policy_backend', 'xorp_policy_common', - 'finder', + 'xorp_finder', 'xorp_ipc', 'xorp_core', 'xorp_proto', Modified: trunk/xorp/rtrmgr/SConscript =================================================================== --- trunk/xorp/rtrmgr/SConscript 2009-11-27 07:23:17 UTC (rev 11614) +++ trunk/xorp/rtrmgr/SConscript 2009-11-27 07:26:17 UTC (rev 11615) @@ -138,7 +138,7 @@ 'rtrmgrbase', 'rtrmgrclientxif', 'findereventnotifierxif', - 'finder', + 'xorp_finder', 'xorp_ipc', 'xorp_comm', 'xorp_core' @@ -192,7 +192,7 @@ profiler_env.AppendUnique(LIBS = [ 'profilexif', 'profilerbase', - 'finder', + 'xorp_finder', 'xorp_ipc', 'xorp_comm', 'xorp_core' This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bms_fbsd at users.sourceforge.net Thu Nov 26 23:32:31 2009 From: bms_fbsd at users.sourceforge.net (bms_fbsd at users.sourceforge.net) Date: Fri, 27 Nov 2009 07:32:31 +0000 Subject: [Xorp-cvs] SF.net SVN: xorp:[11616] trunk/xorp Message-ID: Revision: 11616 http://xorp.svn.sourceforge.net/xorp/?rev=11616&view=rev Author: bms_fbsd Date: 2009-11-27 07:32:31 +0000 (Fri, 27 Nov 2009) Log Message: ----------- libfinder => libxorp_finder libcli => libxorp_cli libtecla_xorp => libxorp_tecla Modified Paths: -------------- trunk/xorp/cli/SConscript trunk/xorp/cli/libtecla/SConscript trunk/xorp/cli/tests/SConscript trunk/xorp/fea/SConscript trunk/xorp/fea/tests/SConscript trunk/xorp/rtrmgr/SConscript Modified: trunk/xorp/cli/SConscript =================================================================== --- trunk/xorp/cli/SConscript 2009-11-27 07:26:17 UTC (rev 11615) +++ trunk/xorp/cli/SConscript 2009-11-27 07:32:31 UTC (rev 11616) @@ -49,14 +49,14 @@ env.AppendUnique(LIBS = [ 'cliprocessorxif', 'clibase', - 'tecla_xorp', + 'xorp_tecla', 'xorp_proto', 'xorp_ipc', 'xorp_comm', 'xorp_core', ]) -libclisrcs = [ +libxorp_cli_srcs = [ 'cli_client.cc', 'cli_command.cc', 'cli_command_pipe.cc', @@ -66,12 +66,13 @@ 'xrl_cli_node.cc' ] - if is_shared: - libcli = env.SharedLibrary(target = 'libcli', source = libclisrcs) + libxorp_cli = env.SharedLibrary(target = 'libxorp_cli', + source = libxorp_cli_srcs) env.Alias('install', - env.InstallLibrary('$libdir', libcli)) + env.InstallLibrary('$libdir', libxorp_cli)) else: - libcli = env.StaticLibrary(target = 'libcli', source = libclisrcs) + libxorp_cli = env.StaticLibrary(target = 'libxorp_cli', + source = libxorp_cli_srcs) -Default(libcli) +Default(libxorp_cli) Modified: trunk/xorp/cli/libtecla/SConscript =================================================================== --- trunk/xorp/cli/libtecla/SConscript 2009-11-27 07:26:17 UTC (rev 11615) +++ trunk/xorp/cli/libtecla/SConscript 2009-11-27 07:32:31 UTC (rev 11616) @@ -68,10 +68,10 @@ if is_shared: - libtecla_xorp = env.SharedLibrary('libtecla_xorp', libtecla_srcs) + libxorp_tecla = env.SharedLibrary('libxorp_tecla', libtecla_srcs) env.Alias('install', - env.InstallLibrary('$libdir', libtecla_xorp)) + env.InstallLibrary('$libdir', libxorp_tecla)) else: - libtecla_xorp = env.StaticLibrary('libtecla_xorp', libtecla_srcs) + libxorp_tecla = env.StaticLibrary('libxorp_tecla', libtecla_srcs) -Default(libtecla_xorp) +Default(libxorp_tecla) Modified: trunk/xorp/cli/tests/SConscript =================================================================== --- trunk/xorp/cli/tests/SConscript 2009-11-27 07:26:17 UTC (rev 11615) +++ trunk/xorp/cli/tests/SConscript 2009-11-27 07:32:31 UTC (rev 11616) @@ -41,11 +41,11 @@ ]) env.AppendUnique(LIBS = [ - 'cli', + 'xorp_cli', 'cliprocessorxif', 'clibase', - 'finder', - 'tecla_xorp', + 'xorp_finder', + 'xorp_tecla', 'xorp_ipc', 'xorp_proto', 'xorp_core', Modified: trunk/xorp/fea/SConscript =================================================================== --- trunk/xorp/fea/SConscript 2009-11-27 07:26:17 UTC (rev 11615) +++ trunk/xorp/fea/SConscript 2009-11-27 07:32:31 UTC (rev 11616) @@ -88,7 +88,7 @@ 'socket4userxif', 'socket6userxif', 'findereventnotifierxif', - 'cli', + 'xorp_cli', 'cliprocessorxif', 'xorp_fea_client', 'feaifmgrmirrorxif', # XXX? @@ -101,7 +101,7 @@ 'feabase', 'mfeabase', 'xorp_mrt', - 'tecla_xorp', + 'xorp_tecla', 'xorp_proto', 'xorp_ipc', 'xorp_comm', Modified: trunk/xorp/fea/tests/SConscript =================================================================== --- trunk/xorp/fea/tests/SConscript 2009-11-27 07:26:17 UTC (rev 11615) +++ trunk/xorp/fea/tests/SConscript 2009-11-27 07:32:31 UTC (rev 11616) @@ -74,7 +74,7 @@ 'socket4userxif', 'socket6userxif', 'findereventnotifierxif', - 'cli', + 'xorp_cli', 'cliprocessorxif', 'xorp_fea_client', 'feaifmgrmirrorxif', # XXX? @@ -87,7 +87,7 @@ 'feabase', 'mfeabase', 'xorp_mrt', - 'tecla_xorp', + 'xorp_tecla', 'xorp_proto', 'xorp_ipc', 'xorp_comm', Modified: trunk/xorp/rtrmgr/SConscript =================================================================== --- trunk/xorp/rtrmgr/SConscript 2009-11-27 07:26:17 UTC (rev 11615) +++ trunk/xorp/rtrmgr/SConscript 2009-11-27 07:32:31 UTC (rev 11616) @@ -160,11 +160,11 @@ xorpsh_env.AppendUnique(LIBS = [ 'rtrmgr', - 'cli', + 'xorp_cli', 'clibase', # XXX Not picked up automagically? 'cliprocessorxif', # XXX ditto? 'xorp_proto', - 'tecla_xorp', + 'xorp_tecla', 'rtrmgrxif', 'xorpshbase', 'findereventnotifierxif', This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bms_fbsd at users.sourceforge.net Thu Nov 26 23:42:37 2009 From: bms_fbsd at users.sourceforge.net (bms_fbsd at users.sourceforge.net) Date: Fri, 27 Nov 2009 07:42:37 +0000 Subject: [Xorp-cvs] SF.net SVN: xorp:[11617] trunk/xorp Message-ID: Revision: 11617 http://xorp.svn.sourceforge.net/xorp/?rev=11617&view=rev Author: bms_fbsd Date: 2009-11-27 07:42:31 +0000 (Fri, 27 Nov 2009) Log Message: ----------- libfinder => libxorp_finder libospf => libxorp_ospf librip => libxorp_rip libripng => libxorp_ripng Modified Paths: -------------- trunk/xorp/libfeaclient/tests/SConscript trunk/xorp/ospf/tests/SConscript trunk/xorp/rib/tests/SConscript trunk/xorp/rip/tests/SConscript trunk/xorp/rtrmgr/tests/SConscript Modified: trunk/xorp/libfeaclient/tests/SConscript =================================================================== --- trunk/xorp/libfeaclient/tests/SConscript 2009-11-27 07:32:31 UTC (rev 11616) +++ trunk/xorp/libfeaclient/tests/SConscript 2009-11-27 07:42:31 UTC (rev 11617) @@ -57,7 +57,7 @@ env.PrependUnique(LIBS = [ 'testfeaifmgrmirrorbase', 'feaifmgrreplicatorxif', - 'finder', + 'xorp_finder', 'ribxif', 'ribclientbase', ]) Modified: trunk/xorp/ospf/tests/SConscript =================================================================== --- trunk/xorp/ospf/tests/SConscript 2009-11-27 07:32:31 UTC (rev 11616) +++ trunk/xorp/ospf/tests/SConscript 2009-11-27 07:42:31 UTC (rev 11617) @@ -68,7 +68,7 @@ ]) env.PrependUnique(LIBS = [ - 'ospf', + 'xorp_ospf', ]) # XXX NOTYET: compound test; two modules, one test scaffold, run from Modified: trunk/xorp/rib/tests/SConscript =================================================================== --- trunk/xorp/rib/tests/SConscript 2009-11-27 07:32:31 UTC (rev 11616) +++ trunk/xorp/rib/tests/SConscript 2009-11-27 07:42:31 UTC (rev 11617) @@ -64,7 +64,7 @@ 'xorp_policy_backend', 'xorp_policy_common', 'xorp_proto', - 'finder', + 'xorp_finder', 'xorp_ipc', 'xorp_core', 'xorp_comm', Modified: trunk/xorp/rip/tests/SConscript =================================================================== --- trunk/xorp/rip/tests/SConscript 2009-11-27 07:32:31 UTC (rev 11616) +++ trunk/xorp/rip/tests/SConscript 2009-11-27 07:42:31 UTC (rev 11617) @@ -44,8 +44,8 @@ env.AppendUnique(LIBS = [ 'ripbase', - 'rip', - 'ripng', + 'xorp_rip', + 'xorp_ripng', 'ripxif', 'findereventnotifierxif', 'xorp_fea_client', Modified: trunk/xorp/rtrmgr/tests/SConscript =================================================================== --- trunk/xorp/rtrmgr/tests/SConscript 2009-11-27 07:32:31 UTC (rev 11616) +++ trunk/xorp/rtrmgr/tests/SConscript 2009-11-27 07:42:31 UTC (rev 11617) @@ -41,7 +41,7 @@ env.AppendUnique(LIBS = [ 'rtrmgr', - 'finder', + 'xorp_finder', 'xorp_ipc', 'xorp_core', 'xorp_comm', This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bms_fbsd at users.sourceforge.net Thu Nov 26 23:45:38 2009 From: bms_fbsd at users.sourceforge.net (bms_fbsd at users.sourceforge.net) Date: Fri, 27 Nov 2009 07:45:38 +0000 Subject: [Xorp-cvs] SF.net SVN: xorp:[11618] trunk/xorp Message-ID: Revision: 11618 http://xorp.svn.sourceforge.net/xorp/?rev=11618&view=rev Author: bms_fbsd Date: 2009-11-27 07:45:38 +0000 (Fri, 27 Nov 2009) Log Message: ----------- librib => libxorp_rib librtrmgr => libxorp_rtrmgr Modified Paths: -------------- trunk/xorp/rib/SConscript trunk/xorp/rib/tests/SConscript trunk/xorp/rtrmgr/SConscript Modified: trunk/xorp/rib/SConscript =================================================================== --- trunk/xorp/rib/SConscript 2009-11-27 07:42:31 UTC (rev 11617) +++ trunk/xorp/rib/SConscript 2009-11-27 07:45:38 UTC (rev 11618) @@ -50,7 +50,7 @@ ]) env.AppendUnique(LIBS = [ - 'rib', + 'xorp_rib', # The library, not the executable. 'xorp_fea_client', 'feaifmgrmirrorxif', 'feaifmgrreplicatorxif', @@ -75,7 +75,7 @@ 'xorp_comm' ]) -libribsrcs = [ +libxorp_rib_srcs = [ 'profile_vars.cc', 'protocol.cc', 'redist_xrl.cc', @@ -99,9 +99,13 @@ ] if is_shared: - librib = env.SharedLibrary(target = 'librib', source = libribsrcs, LIBS = '') + libxorp_rib = env.SharedLibrary(target = 'libxorp_rib', + source = libxorp_rib_srcs, + LIBS = '') else: - librib = env.StaticLibrary(target = 'librib', source = libribsrcs, LIBS = '') + libxorp_rib = env.StaticLibrary(target = 'libxorp_rib', + source = libxorp_rib_srcs, + LIBS = '') ribsrcs = [ 'main_rib.cc', @@ -117,6 +121,6 @@ if is_shared: env.Alias('install', - env.InstallLibrary('$libdir', librib)) + env.InstallLibrary('$libdir', libxorp_rib)) Default(rib) Modified: trunk/xorp/rib/tests/SConscript =================================================================== --- trunk/xorp/rib/tests/SConscript 2009-11-27 07:42:31 UTC (rev 11617) +++ trunk/xorp/rib/tests/SConscript 2009-11-27 07:45:38 UTC (rev 11618) @@ -44,8 +44,8 @@ ]) env.AppendUnique(LIBS = [ - 'rib', - #'ribxrl', #notyet + 'xorp_rib', + #'xorp_rib_xrl', #notyet 'xorp_fea_client', 'feaifmgrmirrorxif', 'feaifmgrreplicatorxif', Modified: trunk/xorp/rtrmgr/SConscript =================================================================== --- trunk/xorp/rtrmgr/SConscript 2009-11-27 07:42:31 UTC (rev 11617) +++ trunk/xorp/rtrmgr/SConscript 2009-11-27 07:45:38 UTC (rev 11618) @@ -46,9 +46,9 @@ '.', ]) -### librtrmgr +### libxorp_rtrmgr -librtrmgr_env = env.Clone() +libxorp_rtrmgr_env = env.Clone() # FIXME generate lex/yacc from source # shorthand this plz @@ -65,7 +65,7 @@ #opcmd_env.AppendUnique(LEXFLAGS='-Popcmd') #opcmd_env.CXXFile(source='op_commands.ll', target='lex.opcmd.cc') -librtrmgr_srcs = [ +libxorp_rtrmgr_srcs = [ 'command_tree.cc', 'conf_tree.cc', 'conf_tree_node.cc', @@ -102,8 +102,8 @@ # Runtime XRL syntax validation for developers. if env['debug_xrldb']: - librtrmgr_srcs += [ 'xrldb.cc' ] - librtrmgr_env.AppendUnique(CPPDEFINES = [ + libxorp_rtrmgr_srcs += [ 'xrldb.cc' ] + libxorp_rtrmgr_env.AppendUnique(CPPDEFINES = [ ( 'DEBUG_XRLDB', 1 ), ]) @@ -117,10 +117,10 @@ util_cc_env = env.Clone() util_cc_env.AppendUnique(CPPDEFINES=xorp_paths.items()) obj_util = util_cc_env.StaticObject(source='util.cc') -librtrmgr_srcs += [ obj_util ] +libxorp_rtrmgr_srcs += [ obj_util ] -librtrmgr = librtrmgr_env.StaticLibrary(target = 'librtrmgr', - source = librtrmgr_srcs) +libxorp_rtrmgr = libxorp_rtrmgr_env.StaticLibrary(target = 'libxorp_rtrmgr', + source = libxorp_rtrmgr_srcs) ### rtrmgr This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bms_fbsd at users.sourceforge.net Thu Nov 26 23:47:27 2009 From: bms_fbsd at users.sourceforge.net (bms_fbsd at users.sourceforge.net) Date: Fri, 27 Nov 2009 07:47:27 +0000 Subject: [Xorp-cvs] SF.net SVN: xorp:[11619] trunk/xorp/bgp Message-ID: Revision: 11619 http://xorp.svn.sourceforge.net/xorp/?rev=11619&view=rev Author: bms_fbsd Date: 2009-11-27 07:47:20 +0000 (Fri, 27 Nov 2009) Log Message: ----------- naming catchup Modified Paths: -------------- trunk/xorp/bgp/SConscript trunk/xorp/bgp/tests/SConscript Modified: trunk/xorp/bgp/SConscript =================================================================== --- trunk/xorp/bgp/SConscript 2009-11-27 07:45:38 UTC (rev 11618) +++ trunk/xorp/bgp/SConscript 2009-11-27 07:47:20 UTC (rev 11619) @@ -67,16 +67,16 @@ 'xorp_comm', ]) -### libbgp +### libxorp_bgp -libbgp_env = env.Clone() +libxorp_bgp_env = env.Clone() #if is_shared: -# libbgp_env.AppendUnique(LINKFLAGS = [ +# libxorp_bgp_env.AppendUnique(LINKFLAGS = [ # '-Wl,-z,defs', # ]) -libbgpsrcs = [ +libxorp_bgp_srcs = [ 'aspath.cc', 'attribute_manager.cc', 'bgp_trie.cc', @@ -127,13 +127,14 @@ 'xrl_target.cc', ] -#libbgp = libbgp_env.SharedLibrary(target = 'libbgp', source = libbgpsrcs) +#libxorp_bgp = libxorp_bgp_env.SharedLibrary(target = 'libxorp_bgp', source = libxorp_bgp_srcs) # XXX Static until ASPath and other objects are dealt with. -libbgp = libbgp_env.StaticLibrary(target = 'libbgp', source = libbgpsrcs) +libxorp_bgp = libxorp_bgp_env.StaticLibrary(target = 'libxorp_bgp', + source = libxorp_bgp_srcs) #env.Alias('install', -# env.InstallLibrary('$libdir', libbgp)) +# env.InstallLibrary('$libdir', libxorp_bgp)) ### xorp_bgp @@ -156,4 +157,4 @@ env.Alias('install', env.InstallProgram(bgppath, bgp)) -Default(libbgp, bgp) +Default(libxorp_bgp, bgp) Modified: trunk/xorp/bgp/tests/SConscript =================================================================== --- trunk/xorp/bgp/tests/SConscript 2009-11-27 07:45:38 UTC (rev 11618) +++ trunk/xorp/bgp/tests/SConscript 2009-11-27 07:47:20 UTC (rev 11619) @@ -43,7 +43,7 @@ ]) env.AppendUnique(LIBS = [ - 'ospf', + 'xorp_ospf', #'ospfv2base', #'ospfv3base', 'ripxif', This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bms_fbsd at users.sourceforge.net Thu Nov 26 23:52:02 2009 From: bms_fbsd at users.sourceforge.net (bms_fbsd at users.sourceforge.net) Date: Fri, 27 Nov 2009 07:52:02 +0000 Subject: [Xorp-cvs] SF.net SVN: xorp:[11620] trunk/xorp/vrrp/SConscript Message-ID: Revision: 11620 http://xorp.svn.sourceforge.net/xorp/?rev=11620&view=rev Author: bms_fbsd Date: 2009-11-27 07:52:02 +0000 (Fri, 27 Nov 2009) Log Message: ----------- libvrrp => libxorp_vrrp Modified Paths: -------------- trunk/xorp/vrrp/SConscript Modified: trunk/xorp/vrrp/SConscript =================================================================== --- trunk/xorp/vrrp/SConscript 2009-11-27 07:47:20 UTC (rev 11619) +++ trunk/xorp/vrrp/SConscript 2009-11-27 07:52:02 UTC (rev 11620) @@ -46,7 +46,7 @@ ]) env.AppendUnique(LIBS = [ - 'vrrp', + 'xorp_vrrp', 'vrrpbase', 'xorp_fea_client', 'feaifmgrxif', @@ -61,7 +61,7 @@ 'xorp_comm' ]) -libvrrpsources = ['arpd.cc', +libxorp_vrrp_srcs = ['arpd.cc', 'vrrp.cc', 'vrrp_packet.cc', 'vrrp_target.cc', @@ -69,9 +69,13 @@ ] if is_shared: - libvrrp = env.SharedLibrary(LIBS = '', target = 'libvrrp', source = libvrrpsources) + libxorp_vrrp = env.SharedLibrary(target = 'libxorp_vrrp', + source = libxorp_vrrp_srcs, + LIBS = '') else: - libvrrp = env.StaticLibrary(LIBS = '', target = 'libvrrp', source = libvrrpsources) + libxorp_vrrp = env.StaticLibrary(target = 'libxorp_vrrp', + source = libxorp_vrrp_srcs, + LIBS = '') vrrpsources = [ 'xorp_vrrp.cc' ] @@ -86,6 +90,6 @@ if is_shared: env.Alias('install', - env.InstallLibrary('$libdir', libvrrp)) + env.InstallLibrary('$libdir', libxorp_vrrp)) Default(xorp_vrrp) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bms_fbsd at users.sourceforge.net Thu Nov 26 23:59:03 2009 From: bms_fbsd at users.sourceforge.net (bms_fbsd at users.sourceforge.net) Date: Fri, 27 Nov 2009 07:59:03 +0000 Subject: [Xorp-cvs] SF.net SVN: xorp:[11621] trunk/xorp/rtrmgr Message-ID: Revision: 11621 http://xorp.svn.sourceforge.net/xorp/?rev=11621&view=rev Author: bms_fbsd Date: 2009-11-27 07:59:03 +0000 (Fri, 27 Nov 2009) Log Message: ----------- librtrmgr => libxorp_rtrmgr Modified Paths: -------------- trunk/xorp/rtrmgr/SConscript trunk/xorp/rtrmgr/tests/SConscript Modified: trunk/xorp/rtrmgr/SConscript =================================================================== --- trunk/xorp/rtrmgr/SConscript 2009-11-27 07:52:02 UTC (rev 11620) +++ trunk/xorp/rtrmgr/SConscript 2009-11-27 07:59:03 UTC (rev 11621) @@ -134,7 +134,7 @@ ]) rtrmgr_env.AppendUnique(LIBS = [ - 'rtrmgr', + 'xorp_rtrmgr', 'rtrmgrbase', 'rtrmgrclientxif', 'findereventnotifierxif', @@ -159,7 +159,7 @@ xorpsh_env = env.Clone() xorpsh_env.AppendUnique(LIBS = [ - 'rtrmgr', + 'xorp_rtrmgr', 'xorp_cli', 'clibase', # XXX Not picked up automagically? 'cliprocessorxif', # XXX ditto? Modified: trunk/xorp/rtrmgr/tests/SConscript =================================================================== --- trunk/xorp/rtrmgr/tests/SConscript 2009-11-27 07:52:02 UTC (rev 11620) +++ trunk/xorp/rtrmgr/tests/SConscript 2009-11-27 07:59:03 UTC (rev 11621) @@ -40,7 +40,7 @@ ]) env.AppendUnique(LIBS = [ - 'rtrmgr', + 'xorp_rtrmgr', 'xorp_finder', 'xorp_ipc', 'xorp_core', This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bms_fbsd at users.sourceforge.net Fri Nov 27 00:05:11 2009 From: bms_fbsd at users.sourceforge.net (bms_fbsd at users.sourceforge.net) Date: Fri, 27 Nov 2009 08:05:11 +0000 Subject: [Xorp-cvs] SF.net SVN: xorp:[11622] trunk/xorp/bgp Message-ID: Revision: 11622 http://xorp.svn.sourceforge.net/xorp/?rev=11622&view=rev Author: bms_fbsd Date: 2009-11-27 08:05:11 +0000 (Fri, 27 Nov 2009) Log Message: ----------- libbgp => libxorp_bgp Modified Paths: -------------- trunk/xorp/bgp/SConscript trunk/xorp/bgp/tools/SConscript Modified: trunk/xorp/bgp/SConscript =================================================================== --- trunk/xorp/bgp/SConscript 2009-11-27 07:59:03 UTC (rev 11621) +++ trunk/xorp/bgp/SConscript 2009-11-27 08:05:11 UTC (rev 11622) @@ -141,7 +141,7 @@ bgp_env = env.Clone() bgp_env.PrependUnique(LIBS = [ - 'bgp', + 'xorp_bgp', ]) bgpsrcs = [ Modified: trunk/xorp/bgp/tools/SConscript =================================================================== --- trunk/xorp/bgp/tools/SConscript 2009-11-27 07:59:03 UTC (rev 11621) +++ trunk/xorp/bgp/tools/SConscript 2009-11-27 08:05:11 UTC (rev 11622) @@ -38,7 +38,7 @@ ]) env.AppendUnique(LIBS = [ - 'bgp', # for ASPath + 'xorp_bgp', # for ASPath 'bgpxif', 'xorp_ipc', 'xorp_core', This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bms_fbsd at users.sourceforge.net Fri Nov 27 01:04:37 2009 From: bms_fbsd at users.sourceforge.net (bms_fbsd at users.sourceforge.net) Date: Fri, 27 Nov 2009 09:04:37 +0000 Subject: [Xorp-cvs] SF.net SVN: xorp:[11623] trunk/xorp Message-ID: Revision: 11623 http://xorp.svn.sourceforge.net/xorp/?rev=11623&view=rev Author: bms_fbsd Date: 2009-11-27 09:04:36 +0000 (Fri, 27 Nov 2009) Log Message: ----------- New naming convention for XRL proxy/stub class libraries: libxif_.so -- XRL client proxy class libxst_.so -- XRL target stub class Modified Paths: -------------- trunk/xorp/bgp/SConscript trunk/xorp/bgp/harness/SConscript trunk/xorp/bgp/tests/SConscript trunk/xorp/bgp/tools/SConscript trunk/xorp/cli/SConscript trunk/xorp/cli/tests/SConscript trunk/xorp/cli/tools/SConscript trunk/xorp/contrib/mld6igmp_lite/SConscript trunk/xorp/contrib/olsr/SConscript trunk/xorp/fea/SConscript trunk/xorp/fea/tests/SConscript trunk/xorp/fea/tools/SConscript trunk/xorp/fib2mrib/SConscript trunk/xorp/libfeaclient/tests/SConscript trunk/xorp/mld6igmp/SConscript trunk/xorp/ospf/SConscript trunk/xorp/ospf/tests/SConscript trunk/xorp/ospf/tools/SConscript trunk/xorp/pim/SConscript trunk/xorp/policy/SConscript trunk/xorp/rib/SConscript trunk/xorp/rib/tests/SConscript trunk/xorp/rib/tools/SConscript trunk/xorp/rip/SConscript trunk/xorp/rip/tests/SConscript trunk/xorp/rip/tools/SConscript trunk/xorp/rtrmgr/SConscript trunk/xorp/static_routes/SConscript trunk/xorp/vrrp/SConscript trunk/xorp/xrl/interfaces/SConscript trunk/xorp/xrl/targets/SConscript Modified: trunk/xorp/bgp/SConscript =================================================================== --- trunk/xorp/bgp/SConscript 2009-11-27 08:05:11 UTC (rev 11622) +++ trunk/xorp/bgp/SConscript 2009-11-27 09:04:36 UTC (rev 11623) @@ -55,13 +55,13 @@ 'xorp_policy_backend', 'xorp_policy_common', 'xorp_fea_client', - 'bgpbase', - 'feaifmgrmirrorbase', - 'ribxif', - 'findereventnotifierxif', - 'profileclientxif', - 'feaifmgrmirrorxif', - 'feaifmgrreplicatorxif', + 'xst_bgp', + 'xst_fea_ifmgr_mirror', + 'xif_rib', + 'xif_finder_event_notifier', + 'xif_profile_client', + 'xif_fea_ifmgr_mirror', + 'xif_fea_ifmgr_replicator', 'xorp_ipc', 'xorp_core', 'xorp_comm', Modified: trunk/xorp/bgp/harness/SConscript =================================================================== --- trunk/xorp/bgp/harness/SConscript 2009-11-27 08:05:11 UTC (rev 11622) +++ trunk/xorp/bgp/harness/SConscript 2009-11-27 09:04:36 UTC (rev 11623) @@ -37,7 +37,7 @@ ]) env.AppendUnique(LIBS = [ - 'bgpxif', + 'xif_bgp', 'xorp_ipc', 'xorp_core', 'xorp_comm', Modified: trunk/xorp/bgp/tests/SConscript =================================================================== --- trunk/xorp/bgp/tests/SConscript 2009-11-27 08:05:11 UTC (rev 11622) +++ trunk/xorp/bgp/tests/SConscript 2009-11-27 09:04:36 UTC (rev 11623) @@ -44,16 +44,16 @@ env.AppendUnique(LIBS = [ 'xorp_ospf', - #'ospfv2base', - #'ospfv3base', - 'ripxif', - 'findereventnotifierxif', + #'xst_ospfv2', + #'xst_ospfv3', + 'xif_rip', + 'xif_finder_event_notifier', 'xorp_fea_client', - 'feaifmgrmirrorxif', - 'feaifmgrreplicatorxif', - 'feaifmgrmirrorbase', - 'fearawpkt4xif', - 'fearawpkt6xif', + 'xif_fea_ifmgr_mirror', + 'xif_fea_ifmgr_replicator', + 'xst_fea_ifmgr_mirror', + 'xif_fea_rawpkt4', + 'xif_fea_rawpkt6', 'xorp_policy_backend', 'xorp_policy_common', 'xorp_ipc', Modified: trunk/xorp/bgp/tools/SConscript =================================================================== --- trunk/xorp/bgp/tools/SConscript 2009-11-27 08:05:11 UTC (rev 11622) +++ trunk/xorp/bgp/tools/SConscript 2009-11-27 09:04:36 UTC (rev 11623) @@ -39,7 +39,7 @@ env.AppendUnique(LIBS = [ 'xorp_bgp', # for ASPath - 'bgpxif', + 'xif_bgp', 'xorp_ipc', 'xorp_core', 'xorp_comm', Modified: trunk/xorp/cli/SConscript =================================================================== --- trunk/xorp/cli/SConscript 2009-11-27 08:05:11 UTC (rev 11622) +++ trunk/xorp/cli/SConscript 2009-11-27 09:04:36 UTC (rev 11623) @@ -47,8 +47,8 @@ ]) env.AppendUnique(LIBS = [ - 'cliprocessorxif', - 'clibase', + 'xif_cli_processor', + 'xst_cli', 'xorp_tecla', 'xorp_proto', 'xorp_ipc', Modified: trunk/xorp/cli/tests/SConscript =================================================================== --- trunk/xorp/cli/tests/SConscript 2009-11-27 08:05:11 UTC (rev 11622) +++ trunk/xorp/cli/tests/SConscript 2009-11-27 09:04:36 UTC (rev 11623) @@ -42,8 +42,8 @@ env.AppendUnique(LIBS = [ 'xorp_cli', - 'cliprocessorxif', - 'clibase', + 'xif_cli_processor', + 'xst_cli', 'xorp_finder', 'xorp_tecla', 'xorp_ipc', Modified: trunk/xorp/cli/tools/SConscript =================================================================== --- trunk/xorp/cli/tools/SConscript 2009-11-27 08:05:11 UTC (rev 11622) +++ trunk/xorp/cli/tools/SConscript 2009-11-27 09:04:36 UTC (rev 11623) @@ -38,7 +38,7 @@ ]) env.AppendUnique(LIBS = [ - 'cliprocessorxif', + 'xif_cli_processor', 'xorp_ipc', 'xorp_core', 'xorp_proto', Modified: trunk/xorp/contrib/mld6igmp_lite/SConscript =================================================================== --- trunk/xorp/contrib/mld6igmp_lite/SConscript 2009-11-27 08:05:11 UTC (rev 11622) +++ trunk/xorp/contrib/mld6igmp_lite/SConscript 2009-11-27 09:04:36 UTC (rev 11623) @@ -46,15 +46,15 @@ env.AppendUnique(LIBS = [ 'mld6igmp', 'xorp_fea_client', - 'mld6igmpclientxif', - 'fearawpkt4xif', - 'fearawpkt6xif', - 'feaifmgrmirrorxif', - 'feaifmgrreplicatorxif', - 'climanagerxif', - 'findereventnotifierxif', - 'feaifmgrmirrorbase', - 'mld6igmpbase', + 'xif_mld6igmp_client', + 'xif_fea_rawpkt4', + 'xif_fea_rawpkt6', + 'xif_fea_ifmgr_mirror', + 'xif_fea_ifmgr_replicator', + 'xif_cli_manager', + 'xif_finder_event_notifier', + 'xst_fea_ifmgr_mirror', + 'xst_mld6igmp', 'xorp_mrt', 'xorp_ipc', 'xorp_core', Modified: trunk/xorp/contrib/olsr/SConscript =================================================================== --- trunk/xorp/contrib/olsr/SConscript 2009-11-27 08:05:11 UTC (rev 11622) +++ trunk/xorp/contrib/olsr/SConscript 2009-11-27 09:04:36 UTC (rev 11623) @@ -51,18 +51,18 @@ env.AppendUnique(LIBS = [ 'olsr', - 'olsr4base', + 'xst_olsr4', 'xorp_policy_backend', 'xorp_policy_common', 'xorp_fea_client', - 'ribxif', - 'findereventnotifierxif', - 'feaifmgrmirrorxif', - 'feaifmgrreplicatorxif', - 'profileclientxif', - 'fearawpkt4xif', - 'fearawpkt6xif', - 'feaifmgrmirrorbase', + 'xif_rib', + 'xif_finder_event_notifier', + 'xif_fea_ifmgr_mirror', + 'xif_fea_ifmgr_replicator', + 'xif_profile_client', + 'xif_fea_rawpkt4', + 'xif_fea_rawpkt6', + 'xst_fea_ifmgr_mirror', 'xorp_ipc', 'xorp_core', 'xorp_proto', Modified: trunk/xorp/fea/SConscript =================================================================== --- trunk/xorp/fea/SConscript 2009-11-27 08:05:11 UTC (rev 11622) +++ trunk/xorp/fea/SConscript 2009-11-27 09:04:36 UTC (rev 11623) @@ -81,25 +81,25 @@ libxorp_fea_linkorder.append('libxorp_fea_data_plane_base') libxorp_fea_linkorder += [ - 'feafibclientxif', - 'fearawlinkclientxif', - 'fearawpkt4clientxif', - 'fearawpkt6clientxif', - 'socket4userxif', - 'socket6userxif', - 'findereventnotifierxif', + 'xif_fea_fib_client', + 'xif_fea_rawlink_client', + 'xif_fea_rawpkt4_client', + 'xif_fea_rawpkt6_client', + 'xif_socket4_user', + 'xif_socket6_user', + 'xif_finder_event_notifier', 'xorp_cli', - 'cliprocessorxif', + 'xif_cli_processor', 'xorp_fea_client', - 'feaifmgrmirrorxif', # XXX? - 'feaifmgrreplicatorxif', # XXX? - 'feaifmgrmirrorbase', # XXX? - 'climanagerxif', - 'mfeaclientxif', - 'profileclientxif', - 'clibase', - 'feabase', - 'mfeabase', + 'xif_fea_ifmgr_mirror', # XXX? + 'xif_fea_ifmgr_replicator', # XXX? + 'xst_fea_ifmgr_mirror', # XXX? + 'xif_cli_manager', + 'xif_mfea_client', + 'xif_profile_client', + 'xst_cli', + 'xst_fea', + 'xst_mfea', 'xorp_mrt', 'xorp_tecla', 'xorp_proto', Modified: trunk/xorp/fea/tests/SConscript =================================================================== --- trunk/xorp/fea/tests/SConscript 2009-11-27 08:05:11 UTC (rev 11622) +++ trunk/xorp/fea/tests/SConscript 2009-11-27 09:04:36 UTC (rev 11623) @@ -67,25 +67,25 @@ libxorp_fea_linkorder.append('libxorp_fea_data_plane_base') libxorp_fea_linkorder += [ - 'feafibclientxif', - 'fearawlinkclientxif', - 'fearawpkt4clientxif', - 'fearawpkt6clientxif', - 'socket4userxif', - 'socket6userxif', - 'findereventnotifierxif', + 'xif_fea_fib_client', + 'xif_fea_rawlink_client', + 'xif_fea_rawpkt4_client', + 'xif_fea_rawpkt6_client', + 'xif_socket4_user', + 'xif_socket6_user', + 'xif_finder_event_notifier', 'xorp_cli', - 'cliprocessorxif', + 'xif_cli_processor', 'xorp_fea_client', - 'feaifmgrmirrorxif', # XXX? - 'feaifmgrreplicatorxif', # XXX? - 'feaifmgrmirrorbase', # XXX? - 'climanagerxif', - 'mfeaclientxif', - 'profileclientxif', - 'clibase', - 'feabase', - 'mfeabase', + 'xif_fea_ifmgr_mirror', # XXX? + 'xif_fea_ifmgr_replicator', # XXX? + 'xst_fea_ifmgr_mirror', # XXX? + 'xif_cli_manager', + 'xif_mfea_client', + 'xif_profile_client', + 'xst_cli', + 'xst_fea', + 'xst_mfea', 'xorp_mrt', 'xorp_tecla', 'xorp_proto', Modified: trunk/xorp/fea/tools/SConscript =================================================================== --- trunk/xorp/fea/tools/SConscript 2009-11-27 08:05:11 UTC (rev 11622) +++ trunk/xorp/fea/tools/SConscript 2009-11-27 09:04:36 UTC (rev 11623) @@ -40,9 +40,9 @@ env.AppendUnique(LIBS = [ 'xorp_fea_client', - 'feaifmgrmirrorxif', - 'feaifmgrreplicatorxif', - 'feaifmgrmirrorbase', + 'xif_fea_ifmgr_mirror', + 'xif_fea_ifmgr_replicator', + 'xst_fea_ifmgr_mirror', 'xorp_ipc', 'xorp_core', 'xorp_proto', Modified: trunk/xorp/fib2mrib/SConscript =================================================================== --- trunk/xorp/fib2mrib/SConscript 2009-11-27 08:05:11 UTC (rev 11622) +++ trunk/xorp/fib2mrib/SConscript 2009-11-27 09:04:36 UTC (rev 11623) @@ -43,34 +43,40 @@ ]) env.AppendUnique(LIBS = [ - 'fib2mrib', - 'fib2mribbase', + 'xorp_fib2mrib', + 'xst_fib2mrib', 'xorp_policy_backend', 'xorp_policy_common', 'xorp_fea_client', - 'findereventnotifierxif', - 'feaifmgrmirrorxif', - 'feaifmgrreplicatorxif', - 'ftixif', - 'feafibxif', - 'ribxif', - 'feaifmgrmirrorbase', + 'xif_finder_event_notifier', + 'xif_fea_ifmgr_mirror', + 'xif_fea_ifmgr_replicator', + 'xif_fti', + 'xif_fea_fib', + 'xif_rib', + 'xst_fea_ifmgr_mirror', 'xorp_ipc', 'xorp_core', 'xorp_proto', 'xorp_comm' ]) -libfib2mribsrcs = [ +libxorp_fib2mrib_srcs = [ 'fib2mrib_node.cc', 'fib2mrib_varrw.cc', 'xrl_fib2mrib_node.cc' ] if is_shared: - libfib2mrib = env.SharedLibrary(target = 'libfib2mrib', source = libfib2mribsrcs, LIBS = '') + libxorp_fib2mrib = env.SharedLibrary( + target = 'libxorp_fib2mrib', + source = libxorp_fib2mrib_srcs, + LIBS = '') else: - libfib2mrib = env.StaticLibrary(target = 'libfib2mrib', source = libfib2mribsrcs, LIBS = '') + libxorp_fib2mrib = env.StaticLibrary( + target = 'libxorp_fib2mrib', + source = libxorp_fib2mrib_srcs, + LIBS = '') fib2mribsrcs = [ 'xorp_fib2mrib.cc', @@ -86,6 +92,6 @@ if is_shared: env.Alias('install', - env.InstallLibrary('$libdir', libfib2mrib)) + env.InstallLibrary('$libdir', libxorp_fib2mrib)) Default(fib2mrib) Modified: trunk/xorp/libfeaclient/tests/SConscript =================================================================== --- trunk/xorp/libfeaclient/tests/SConscript 2009-11-27 08:05:11 UTC (rev 11622) +++ trunk/xorp/libfeaclient/tests/SConscript 2009-11-27 09:04:36 UTC (rev 11623) @@ -42,9 +42,9 @@ # XXX Can we inherit these from libfeaclient deps? env.AppendUnique(LIBS = [ 'xorp_fea_client', - 'feaifmgrmirrorxif', - 'feaifmgrreplicatorxif', - 'feaifmgrmirrorbase', + 'xif_fea_ifmgr_mirror', + 'xif_fea_ifmgr_replicator', + 'xst_fea_ifmgr_mirror', 'xorp_ipc', 'xorp_core', 'xorp_comm', @@ -55,11 +55,11 @@ env = env.Clone() env.PrependUnique(LIBS = [ - 'testfeaifmgrmirrorbase', - 'feaifmgrreplicatorxif', + 'xst_test_fea_ifmgr_mirror', + 'xif_fea_ifmgr_replicator', 'xorp_finder', - 'ribxif', - 'ribclientbase', + 'xif_rib', + 'xst_ribclient', ]) test_remote_copy = env.AutoTest(target = 'test_remote_copy', source = 'test_remote_copy.cc') Modified: trunk/xorp/mld6igmp/SConscript =================================================================== --- trunk/xorp/mld6igmp/SConscript 2009-11-27 08:05:11 UTC (rev 11622) +++ trunk/xorp/mld6igmp/SConscript 2009-11-27 09:04:36 UTC (rev 11623) @@ -45,15 +45,15 @@ env.AppendUnique(LIBS = [ 'mld6igmp', 'xorp_fea_client', - 'mld6igmpclientxif', - 'fearawpkt4xif', - 'fearawpkt6xif', - 'feaifmgrmirrorxif', - 'feaifmgrreplicatorxif', - 'climanagerxif', - 'findereventnotifierxif', - 'feaifmgrmirrorbase', - 'mld6igmpbase', + 'xif_mld6igmp_client', + 'xif_fea_rawpkt4', + 'xif_fea_rawpkt6', + 'xif_fea_ifmgr_mirror', + 'xif_fea_ifmgr_replicator', + 'xif_cli_manager', + 'xif_finder_event_notifier', + 'xst_fea_ifmgr_mirror', + 'xst_mld6igmp', 'xorp_mrt', 'xorp_proto', 'xorp_ipc', Modified: trunk/xorp/ospf/SConscript =================================================================== --- trunk/xorp/ospf/SConscript 2009-11-27 08:05:11 UTC (rev 11622) +++ trunk/xorp/ospf/SConscript 2009-11-27 09:04:36 UTC (rev 11623) @@ -51,19 +51,19 @@ env.AppendUnique(LIBS = [ 'xorp_ospf', # Refers to the library, not the executable. - 'ospfv2base', - 'ospfv3base', + 'xst_ospfv2', + 'xst_ospfv3', 'xorp_policy_backend', 'xorp_policy_common', 'xorp_fea_client', - 'ribxif', - 'findereventnotifierxif', - 'feaifmgrmirrorxif', - 'feaifmgrreplicatorxif', - 'profileclientxif', - 'fearawpkt4xif', - 'fearawpkt6xif', - 'feaifmgrmirrorbase', + 'xif_rib', + 'xif_finder_event_notifier', + 'xif_fea_ifmgr_mirror', + 'xif_fea_ifmgr_replicator', + 'xif_profile_client', + 'xif_fea_rawpkt4', + 'xif_fea_rawpkt6', + 'xst_fea_ifmgr_mirror', 'xorp_ipc', 'xorp_core', 'xorp_proto', Modified: trunk/xorp/ospf/tests/SConscript =================================================================== --- trunk/xorp/ospf/tests/SConscript 2009-11-27 08:05:11 UTC (rev 11622) +++ trunk/xorp/ospf/tests/SConscript 2009-11-27 09:04:36 UTC (rev 11623) @@ -44,14 +44,14 @@ ]) env.AppendUnique(LIBS = [ - 'ribxif', - 'findereventnotifierxif', + 'xif_rib', + 'xif_finder_event_notifier', 'xorp_fea_client', - 'feaifmgrmirrorxif', - 'feaifmgrreplicatorxif', - 'feaifmgrmirrorbase', - 'fearawpkt4xif', - 'fearawpkt6xif', + 'xif_fea_ifmgr_mirror', + 'xif_fea_ifmgr_replicator', + 'xst_fea_ifmgr_mirror', + 'xif_fea_rawpkt4', + 'xif_fea_rawpkt6', 'xorp_policy_backend', 'xorp_policy_common', 'xorp_ipc', @@ -63,8 +63,8 @@ # XXX Do we need to link against this now? if is_shared: env.PrependUnique(LIBS = [ - 'ospfv2base', - 'ospfv3base', + 'xst_ospfv2', + 'xst_ospfv3', ]) env.PrependUnique(LIBS = [ Modified: trunk/xorp/ospf/tools/SConscript =================================================================== --- trunk/xorp/ospf/tools/SConscript 2009-11-27 08:05:11 UTC (rev 11622) +++ trunk/xorp/ospf/tools/SConscript 2009-11-27 09:04:36 UTC (rev 11623) @@ -40,8 +40,8 @@ ]) env.AppendUnique(LIBS = [ - 'ospfv2xif', - 'ospfv3xif', + 'xif_ospfv2', + 'xif_ospfv3', 'xorp_ipc', 'xorp_core', 'xorp_proto', Modified: trunk/xorp/pim/SConscript =================================================================== --- trunk/xorp/pim/SConscript 2009-11-27 08:05:11 UTC (rev 11622) +++ trunk/xorp/pim/SConscript 2009-11-27 09:04:36 UTC (rev 11623) @@ -46,17 +46,17 @@ env.AppendUnique(LIBS = [ 'xorp_pim', # The library, not the executable. 'xorp_fea_client', - 'ribxif', - 'mld6igmpxif', - 'mfeaxif', - 'fearawpkt4xif', - 'fearawpkt6xif', - 'feaifmgrmirrorxif', - 'feaifmgrreplicatorxif', - 'climanagerxif', - 'findereventnotifierxif', - 'feaifmgrmirrorbase', - 'pimbase', + 'xif_rib', + 'xif_mld6igmp', + 'xif_mfea', + 'xif_fea_rawpkt4', + 'xif_fea_rawpkt6', + 'xif_fea_ifmgr_mirror', + 'xif_fea_ifmgr_replicator', + 'xif_cli_manager', + 'xif_finder_event_notifier', + 'xst_fea_ifmgr_mirror', + 'xst_pim', 'xorp_mrt', 'xorp_proto', 'xorp_ipc', Modified: trunk/xorp/policy/SConscript =================================================================== --- trunk/xorp/policy/SConscript 2009-11-27 08:05:11 UTC (rev 11622) +++ trunk/xorp/policy/SConscript 2009-11-27 09:04:36 UTC (rev 11623) @@ -51,10 +51,10 @@ 'xorp_policy', 'xorp_policy_backend', 'xorp_policy_common', - 'policybase', - 'policybackendxif', - 'findereventnotifierxif', - 'ribxif', + 'xst_policy', + 'xif_policy_backend', + 'xif_finder_event_notifier', + 'xif_rib', 'xorp_ipc', 'xorp_core', 'xorp_proto', Modified: trunk/xorp/rib/SConscript =================================================================== --- trunk/xorp/rib/SConscript 2009-11-27 08:05:11 UTC (rev 11622) +++ trunk/xorp/rib/SConscript 2009-11-27 09:04:36 UTC (rev 11623) @@ -52,20 +52,20 @@ env.AppendUnique(LIBS = [ 'xorp_rib', # The library, not the executable. 'xorp_fea_client', - 'feaifmgrmirrorxif', - 'feaifmgrreplicatorxif', - 'ftixif', - 'ribclientxif', - 'findereventnotifierxif', - 'redist4xif', - 'redist6xif', - 'redisttransaction4xif', - 'redisttransaction6xif', - 'policyredist4xif', - 'policyredist6xif', - 'profileclientxif', - 'feaifmgrmirrorbase', - 'ribbase', + 'xif_fea_ifmgr_mirror', + 'xif_fea_ifmgr_replicator', + 'xif_fti', + 'xif_rib_client', + 'xif_finder_event_notifier', + 'xif_redist4', + 'xif_redist6', + 'xif_redist_transaction4', + 'xif_redist_transaction6', + 'xif_policy_redist4', + 'xif_policy_redist6', + 'xif_profile_client', + 'xst_fea_ifmgr_mirror', + 'xst_rib', 'xorp_policy_backend', 'xorp_policy_common', 'xorp_finder', Modified: trunk/xorp/rib/tests/SConscript =================================================================== --- trunk/xorp/rib/tests/SConscript 2009-11-27 08:05:11 UTC (rev 11622) +++ trunk/xorp/rib/tests/SConscript 2009-11-27 09:04:36 UTC (rev 11623) @@ -47,20 +47,20 @@ 'xorp_rib', #'xorp_rib_xrl', #notyet 'xorp_fea_client', - 'feaifmgrmirrorxif', - 'feaifmgrreplicatorxif', - 'ftixif', - 'ribclientxif', - 'findereventnotifierxif', - 'redist4xif', - 'redist6xif', - 'redisttransaction4xif', - 'redisttransaction6xif', - 'policyredist4xif', - 'policyredist6xif', - 'profileclientxif', - 'feaifmgrmirrorbase', - 'ribbase', + 'xif_fea_ifmgr_mirror', + 'xif_fea_ifmgr_replicator', + 'xif_fti', + 'xif_rib_client', + 'xif_finder_event_notifier', + 'xif_redist4', + 'xif_redist6', + 'xif_redist_transaction4', + 'xif_redist_transaction6', + 'xif_policy_redist4', + 'xif_policy_redist6', + 'xif_profile_client', + 'xst_fea_ifmgr_mirror', + 'xst_rib', 'xorp_policy_backend', 'xorp_policy_common', 'xorp_proto', @@ -93,8 +93,8 @@ # XXX NOTYET: part of compound test, scripting needed. #env = env.Clone() #env.AppendUnique(LIBS = [ -# 'ribxif', -# 'ribclientbase', +# 'xif_rib', +# 'xst_ribclient', # ]) #test_register_xrls = env.AutoTest(target = 'test_register_xrls', # source = 'test_register_xrls.cc') Modified: trunk/xorp/rib/tools/SConscript =================================================================== --- trunk/xorp/rib/tools/SConscript 2009-11-27 08:05:11 UTC (rev 11622) +++ trunk/xorp/rib/tools/SConscript 2009-11-27 09:04:36 UTC (rev 11623) @@ -38,10 +38,10 @@ ]) env.AppendUnique(LIBS = [ - 'findereventnotifierxif', - 'ribxif', - 'showdistancesbase', - 'showroutesbase', + 'xif_finder_event_notifier', + 'xif_rib', + 'xst_show_distances', + 'xst_show_routes', 'xorp_ipc', 'xorp_core', 'xorp_proto', Modified: trunk/xorp/rip/SConscript =================================================================== --- trunk/xorp/rip/SConscript 2009-11-27 08:05:11 UTC (rev 11622) +++ trunk/xorp/rip/SConscript 2009-11-27 09:04:36 UTC (rev 11623) @@ -111,14 +111,14 @@ e.PrependUnique(LIBS = [ 'xorp_rip_xrl', 'xorp_rip', # Refers to library, not the executable. - 'ripbase', - 'ribxif', - 'findereventnotifierxif', + 'xst_rip', + 'xif_rib', + 'xif_finder_event_notifier', 'xorp_fea_client', - 'feaifmgrmirrorxif', - 'feaifmgrreplicatorxif', - 'feaifmgrmirrorbase', - 'socket4xif', + 'xif_fea_ifmgr_mirror', + 'xif_fea_ifmgr_replicator', + 'xst_fea_ifmgr_mirror', + 'xif_socket4', 'xorp_policy_backend', 'xorp_policy_common', 'xorp_proto', @@ -181,14 +181,14 @@ e.PrependUnique(LIBS = [ 'xorp_ripng_xrl', 'xorp_ripng', - 'ripngbase', - 'ribxif', - 'findereventnotifierxif', + 'xst_ripng', + 'xif_rib', + 'xif_finder_event_notifier', 'xorp_fea_client', - 'feaifmgrmirrorxif', - 'feaifmgrreplicatorxif', - 'feaifmgrmirrorbase', - 'socket6xif', + 'xif_fea_ifmgr_mirror', + 'xif_fea_ifmgr_replicator', + 'xst_fea_ifmgr_mirror', + 'xif_socket6', 'xorp_policy_backend', 'xorp_policy_common', 'xorp_proto', Modified: trunk/xorp/rip/tests/SConscript =================================================================== --- trunk/xorp/rip/tests/SConscript 2009-11-27 08:05:11 UTC (rev 11622) +++ trunk/xorp/rip/tests/SConscript 2009-11-27 09:04:36 UTC (rev 11623) @@ -43,16 +43,16 @@ ]) env.AppendUnique(LIBS = [ - 'ripbase', + 'xst_rip', 'xorp_rip', 'xorp_ripng', - 'ripxif', - 'findereventnotifierxif', + 'xif_rip', + 'xif_finder_event_notifier', 'xorp_fea_client', - 'feaifmgrmirrorxif', - 'feaifmgrreplicatorxif', - 'feaifmgrmirrorbase', - 'socket4xif', + 'xif_fea_ifmgr_mirror', + 'xif_fea_ifmgr_replicator', + 'xst_fea_ifmgr_mirror', + 'xif_socket4', 'xorp_policy_backend', 'xorp_policy_common', 'xorp_ipc', Modified: trunk/xorp/rip/tools/SConscript =================================================================== --- trunk/xorp/rip/tools/SConscript 2009-11-27 08:05:11 UTC (rev 11622) +++ trunk/xorp/rip/tools/SConscript 2009-11-27 09:04:36 UTC (rev 11623) @@ -38,8 +38,8 @@ ]) env.AppendUnique(LIBS = [ - 'ripxif', - 'ripngxif', + 'xif_rip', + 'xif_ripng', 'xorp_ipc', 'xorp_core', 'xorp_proto', Modified: trunk/xorp/rtrmgr/SConscript =================================================================== --- trunk/xorp/rtrmgr/SConscript 2009-11-27 08:05:11 UTC (rev 11622) +++ trunk/xorp/rtrmgr/SConscript 2009-11-27 09:04:36 UTC (rev 11623) @@ -135,9 +135,9 @@ rtrmgr_env.AppendUnique(LIBS = [ 'xorp_rtrmgr', - 'rtrmgrbase', - 'rtrmgrclientxif', - 'findereventnotifierxif', + 'xst_rtrmgr', + 'xif_rtrmgr_client', + 'xif_finder_event_notifier', 'xorp_finder', 'xorp_ipc', 'xorp_comm', @@ -161,13 +161,13 @@ xorpsh_env.AppendUnique(LIBS = [ 'xorp_rtrmgr', 'xorp_cli', - 'clibase', # XXX Not picked up automagically? - 'cliprocessorxif', # XXX ditto? + 'xst_cli', # XXX Not picked up automagically? + 'xif_cli_processor', # XXX ditto? 'xorp_proto', 'xorp_tecla', - 'rtrmgrxif', - 'xorpshbase', - 'findereventnotifierxif', + 'xif_rtrmgr', + 'xst_xorpsh', + 'xif_finder_event_notifier', 'xorp_ipc', 'xorp_comm', 'xorp_core', @@ -190,8 +190,8 @@ profiler_env = env.Clone() profiler_env.AppendUnique(LIBS = [ - 'profilexif', - 'profilerbase', + 'xif_profile', + 'xst_profiler', 'xorp_finder', 'xorp_ipc', 'xorp_comm', Modified: trunk/xorp/static_routes/SConscript =================================================================== --- trunk/xorp/static_routes/SConscript 2009-11-27 08:05:11 UTC (rev 11622) +++ trunk/xorp/static_routes/SConscript 2009-11-27 09:04:36 UTC (rev 11623) @@ -43,15 +43,15 @@ ]) env.AppendUnique(LIBS = [ - 'staticroutes', + 'xorp_static_routes', # the library, not the executable 'xorp_fea_client', - 'feaifmgrmirrorxif', - 'feaifmgrreplicatorxif', - 'findereventnotifierxif', - 'feaifmgrmirrorbase', - 'staticroutesbase', - 'ribxif', - 'findereventnotifierxif', + 'xif_fea_ifmgr_mirror', + 'xif_fea_ifmgr_replicator', + 'xif_finder_event_notifier', + 'xst_fea_ifmgr_mirror', + 'xst_static_routes', + 'xif_rib', + 'xif_finder_event_notifier', 'xorp_policy_backend', 'xorp_policy_common', 'xorp_ipc', @@ -60,23 +60,29 @@ 'xorp_comm', ]) - -libsrsources = [ +libxorp_static_routes_srcs = [ 'static_routes_node.cc', 'static_routes_varrw.cc', 'xrl_static_routes_node.cc' ] -srsources = [ +xorp_static_routes_srcs = [ 'xorp_static_routes.cc' ] if is_shared: - libsr = env.SharedLibrary(LIBS = '', target = 'libstaticroutes', source = libsrsources) + libxorp_static_routes = env.SharedLibrary( + target = 'libxorp_static_routes', + source = libxorp_static_routes_srcs, + LIBS = '') else: - libsr = env.StaticLibrary(LIBS = '', target = 'libstaticroutes', source = libsrsources) + libxorp_static_routes = env.StaticLibrary( + target = 'libxorp_static_routes', + source = libxorp_static_routes_srcs, + LIBS = '') -xorp_static_routes = env.Program(target = 'xorp_static_routes', source = srsources) +xorp_static_routes = env.Program(target = 'xorp_static_routes', + source = xorp_static_routes_srcs) #srpath = '$bindir' srpath = '$exec_prefix/static_routes' @@ -86,6 +92,6 @@ if is_shared: env.Alias('install', - env.InstallLibrary('$libdir', libsr)) + env.InstallLibrary('$libdir', libxorp_static_routes)) Default(xorp_static_routes) Modified: trunk/xorp/vrrp/SConscript =================================================================== --- trunk/xorp/vrrp/SConscript 2009-11-27 08:05:11 UTC (rev 11622) +++ trunk/xorp/vrrp/SConscript 2009-11-27 09:04:36 UTC (rev 11623) @@ -47,14 +47,14 @@ env.AppendUnique(LIBS = [ 'xorp_vrrp', - 'vrrpbase', + 'xst_vrrp', 'xorp_fea_client', - 'feaifmgrxif', - 'feaifmgrmirrorxif', - 'feaifmgrreplicatorxif', - 'fearawlinkxif', - 'fearawpkt4xif', - 'feaifmgrmirrorbase', + 'xif_fea_ifmgr', + 'xif_fea_ifmgr_mirror', + 'xif_fea_ifmgr_replicator', + 'xif_fea_rawlink', + 'xif_fea_rawpkt4', + 'xst_fea_ifmgr_mirror', 'xorp_ipc', 'xorp_core', 'xorp_proto', Modified: trunk/xorp/xrl/interfaces/SConscript =================================================================== --- trunk/xorp/xrl/interfaces/SConscript 2009-11-27 08:05:11 UTC (rev 11622) +++ trunk/xorp/xrl/interfaces/SConscript 2009-11-27 09:04:36 UTC (rev 11623) @@ -98,7 +98,7 @@ for xif in xifs: base = xif[:-len('.xif')] - tgt = 'lib' + base.translate(string.maketrans('',''),'_') + 'xif' + tgt = 'libxif_' + base src = base + '_xif.cc' env.CLNTGEN(xif) Modified: trunk/xorp/xrl/targets/SConscript =================================================================== --- trunk/xorp/xrl/targets/SConscript 2009-11-27 08:05:11 UTC (rev 11622) +++ trunk/xorp/xrl/targets/SConscript 2009-11-27 09:04:36 UTC (rev 11623) @@ -84,7 +84,7 @@ def BuildXrlTarget(tgt): lib = None base = tgt[:-len('.tgt')] - target = 'lib' + base.translate(string.maketrans('',''),'_') + 'base' + target = 'libxst_' + base source = base + '_base.cc' env.TGTGEN(tgt) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bms_fbsd at users.sourceforge.net Fri Nov 27 01:17:17 2009 From: bms_fbsd at users.sourceforge.net (bms_fbsd at users.sourceforge.net) Date: Fri, 27 Nov 2009 09:17:17 +0000 Subject: [Xorp-cvs] SF.net SVN: xorp:[11624] trunk/xorp Message-ID: Revision: 11624 http://xorp.svn.sourceforge.net/xorp/?rev=11624&view=rev Author: bms_fbsd Date: 2009-11-27 09:17:16 +0000 (Fri, 27 Nov 2009) Log Message: ----------- libmld6igmp => libxorp_mld6igmp Modified Paths: -------------- trunk/xorp/contrib/mld6igmp_lite/SConscript trunk/xorp/mld6igmp/SConscript Modified: trunk/xorp/contrib/mld6igmp_lite/SConscript =================================================================== --- trunk/xorp/contrib/mld6igmp_lite/SConscript 2009-11-27 09:04:36 UTC (rev 11623) +++ trunk/xorp/contrib/mld6igmp_lite/SConscript 2009-11-27 09:17:16 UTC (rev 11624) @@ -44,7 +44,7 @@ ]) env.AppendUnique(LIBS = [ - 'mld6igmp', + 'xorp_mld6igmp', 'xorp_fea_client', 'xif_mld6igmp_client', 'xif_fea_rawpkt4', Modified: trunk/xorp/mld6igmp/SConscript =================================================================== --- trunk/xorp/mld6igmp/SConscript 2009-11-27 09:04:36 UTC (rev 11623) +++ trunk/xorp/mld6igmp/SConscript 2009-11-27 09:17:16 UTC (rev 11624) @@ -43,7 +43,7 @@ ]) env.AppendUnique(LIBS = [ - 'mld6igmp', + 'xorp_mld6igmp', 'xorp_fea_client', 'xif_mld6igmp_client', 'xif_fea_rawpkt4', @@ -61,7 +61,7 @@ 'xorp_comm' ]) -libmld6igmpsrcs = [ +libxorp_mld6igmp_srcs = [ 'mld6igmp_config.cc', 'mld6igmp_group_record.cc', 'mld6igmp_node.cc', @@ -73,9 +73,13 @@ ] if is_shared: - libmld6igmp = env.SharedLibrary(target = 'libmld6igmp', source = libmld6igmpsrcs, LIBS = '') + libxorp_mld6igmp = env.SharedLibrary(target = 'libxorp_mld6igmp', + source = libxorp_mld6igmp_srcs, + LIBS = '') else: - libmld6igmp = env.StaticLibrary(target = 'libmld6igmp', source = libmld6igmpsrcs, LIBS = '') + libxorp_mld6igmp = env.StaticLibrary(target = 'libxorp_mld6igmp', + source = libxorp_mld6igmp_srcs, + LIBS = '') igmpsrcs = [ 'xorp_igmp.cc', @@ -100,6 +104,6 @@ if is_shared: env.Alias('install', - env.InstallLibrary('$libdir', libmld6igmp)) + env.InstallLibrary('$libdir', libxorp_mld6igmp)) Default(igmp, mld) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bms_fbsd at users.sourceforge.net Sat Nov 28 15:37:16 2009 From: bms_fbsd at users.sourceforge.net (bms_fbsd at users.sourceforge.net) Date: Sat, 28 Nov 2009 23:37:16 +0000 Subject: [Xorp-cvs] SF.net SVN: xorp:[11625] trunk/xorp/site_scons/site_tools/autotest.py Message-ID: Revision: 11625 http://xorp.svn.sourceforge.net/xorp/?rev=11625&view=rev Author: bms_fbsd Date: 2009-11-28 23:37:15 +0000 (Sat, 28 Nov 2009) Log Message: ----------- Remove ORIGIN magic from the AutoTest() builder, as test binaries are never installed outside of the $BUILDDIR. Modified Paths: -------------- trunk/xorp/site_scons/site_tools/autotest.py Modified: trunk/xorp/site_scons/site_tools/autotest.py =================================================================== --- trunk/xorp/site_scons/site_tools/autotest.py 2009-11-27 09:17:16 UTC (rev 11624) +++ trunk/xorp/site_scons/site_tools/autotest.py 2009-11-28 23:37:15 UTC (rev 11625) @@ -64,23 +64,15 @@ rpath = Split( multiget([kwargs, env], 'RPATH')) linkflags = Split( multiget([kwargs, env], 'LINKFLAGS')) - myrpath = rpath - # For a test, take the our passed in LIBPATH, expand it, and prepend # to our passed in RPATH, so that tests can build using shared # libraries, even though they are not installed. + # Tests are not intended to be installed, so we don't do any + # further RPATH magic here. + myrpath = rpath if env.has_key('SHAREDLIBS'): - # Figure out our absolute BUILDDIR path. If we're not using - # ORIGIN, then the test can be run - my_rpath_base = Dir(env['BUILDDIR']).abspath - # If ORIGIN is enabled, figure out our test's path relative - # to the BUILDDIR, and pass that to the linker in RPATH. - # XXX: Perhaps we should set '-z origin' at the top level? - #if env['use_rtld_origin']: - # env.PrependUnique( LINKFLAGS = Split('-z origin') ) - # my_rpath_base = os.path.relpath(my_rpath_base, Dir('.').abspath) - # Expand the RPATH according to destdir layout. - myrpath += [ x.replace('$BUILDDIR', my_rpath_base) for x in libpath ] + baserpath = Dir(env['BUILDDIR']).abspath + myrpath += [ x.replace('$BUILDDIR', baserpath) for x in libpath ] # fill the flags into kwargs kwargs["CXXFLAGS"] = cxxflags This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bms_fbsd at users.sourceforge.net Sat Nov 28 16:03:38 2009 From: bms_fbsd at users.sourceforge.net (bms_fbsd at users.sourceforge.net) Date: Sun, 29 Nov 2009 00:03:38 +0000 Subject: [Xorp-cvs] SF.net SVN: xorp:[11626] trunk/xorp/SConstruct Message-ID: Revision: 11626 http://xorp.svn.sourceforge.net/xorp/?rev=11626&view=rev Author: bms_fbsd Date: 2009-11-29 00:03:38 +0000 (Sun, 29 Nov 2009) Log Message: ----------- Commit top level support for rtld ORIGIN as an experimental build feature. Default to disabled. ORIGIN support allows relative paths to shared libraries to be embedded in binaries, instead of absolute ones. XORP uses a lot of shared libraries of its own, so may benefit from this support. Unfortunately, RPATH ORIGIN support hasn't been MFC'ed yet to FreeBSD 7.2, so I cannot fully test this change just now. Also, because we currently install binaries in various weird and wonderful places which roughly match to the layout of the source tree, RPATH would need to be set individually for each set of binaries with a system location. The use of os.path.relpath() also requires Python 2.6 to run the SConstruct when this feature is in use. Modified Paths: -------------- trunk/xorp/SConstruct Modified: trunk/xorp/SConstruct =================================================================== --- trunk/xorp/SConstruct 2009-11-28 23:37:15 UTC (rev 11625) +++ trunk/xorp/SConstruct 2009-11-29 00:03:38 UTC (rev 11626) @@ -63,7 +63,7 @@ vars.AddVariables( BoolVariable('shared', 'build with shared libraries', True), BoolVariable('strip', 'strip executables and libraries when installed', False), - #BoolVariable('use_rtld_origin', 'Use ORIGIN in dynamically linked programs ', False), + BoolVariable('rtld_origin', 'Use ORIGIN in dynamically linked programs', False), BoolVariable('ignore_check_errors', 'Ignore errors when building tests', False), BoolVariable('debug_stl', 'Build with checked STL operations', False), BoolVariable('debug_msg', 'Build with debug messages', False), @@ -163,6 +163,7 @@ print gnutoolwarning % 'ld linker' env['SHAREDLIBS'] = "defined" print 'Shared libraries: ', env.has_key('SHAREDLIBS') +print 'Use rtld ORIGIN: ', env['rtld_origin'] # AUTOTEST_SKIP_ERRORS is SetDefault() by site_scons/site_tools/autotest.py, # so print its value here. @@ -452,11 +453,31 @@ ]) # Shared libraries are installed in $exec_prefix/lib by default. -env.AppendUnique(RPATH = [ - '$libdir', - ]) +# +# Experimental feature: if rtld_origin is True, the linker will +# be passed a relative RPATH. The ORIGIN flag will be enabled for all +# dynamically linked binaries, instead of hardcoding an absolute RPATH. +# +# XXX This may not be correct for all binaries. Some binaries still +# get installed in locations other than $bindir. +if env.has_key('SHAREDLIBS'): + if env['rtld_origin']: + # XXX Will this pass it to the linker correctly? + # In most cases the C++ compiler is used as the link tool. + #env.PrependUnique( LINKFLAGS = [ '-Wl,-z,origin' ] ) + env.PrependUnique( LINKFLAGS = Split('-z origin') ) + rellibdir = os.path.relpath(env.Dir('$libdir').abspath, + env.Dir('$bindir').abspath) + env.AppendUnique(RPATH = [ + env.Literal(os.path.join('\\$$ORIGIN', rellibdir)) + ]) + else: + env.AppendUnique(RPATH = [ + '$libdir', + ]) -# Export dynamic symbols in executables for runtime backtraces w/o GDB. +# Export global symbols as dynamic in executables for runtime backtraces +# w/o GDB or corefiles in production deployments. # NOTE: GNU ld specific flag. env.AppendUnique(LINKFLAGS = [ '-rdynamic', This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bms_fbsd at users.sourceforge.net Sat Nov 28 17:35:12 2009 From: bms_fbsd at users.sourceforge.net (bms_fbsd at users.sourceforge.net) Date: Sun, 29 Nov 2009 01:35:12 +0000 Subject: [Xorp-cvs] SF.net SVN: xorp:[11627] trunk/xorp/rip/SConscript Message-ID: Revision: 11627 http://xorp.svn.sourceforge.net/xorp/?rev=11627&view=rev Author: bms_fbsd Date: 2009-11-29 01:35:12 +0000 (Sun, 29 Nov 2009) Log Message: ----------- Fix typo in static library build of RIPNG Modified Paths: -------------- trunk/xorp/rip/SConscript Modified: trunk/xorp/rip/SConscript =================================================================== --- trunk/xorp/rip/SConscript 2009-11-29 00:03:38 UTC (rev 11626) +++ trunk/xorp/rip/SConscript 2009-11-29 01:35:12 UTC (rev 11627) @@ -211,7 +211,7 @@ libxorp_ripng = e.StaticLibrary(target = 'libxorp_ripng', source = libxorp_rip_srcs, LIBS = '') - libxorp_ripngxrl = e.StaticLibrary(target = 'libxorp_ripngxrl', + libxorp_ripngxrl = e.StaticLibrary(target = 'libxorp_ripng_xrl', source = libxorp_rip_xrl_srcs, LIBS = '') This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bms_fbsd at users.sourceforge.net Sat Nov 28 17:44:40 2009 From: bms_fbsd at users.sourceforge.net (bms_fbsd at users.sourceforge.net) Date: Sun, 29 Nov 2009 01:44:40 +0000 Subject: [Xorp-cvs] SF.net SVN: xorp:[11628] trunk/xorp/bgp/bgp.hh Message-ID: Revision: 11628 http://xorp.svn.sourceforge.net/xorp/?rev=11628&view=rev Author: bms_fbsd Date: 2009-11-29 01:44:39 +0000 (Sun, 29 Nov 2009) Log Message: ----------- Fix a warning which is only reported when compiling with the '-pg' compiler option in GCC 4.2.1. Modified Paths: -------------- trunk/xorp/bgp/bgp.hh Modified: trunk/xorp/bgp/bgp.hh =================================================================== --- trunk/xorp/bgp/bgp.hh 2009-11-29 01:35:12 UTC (rev 11627) +++ trunk/xorp/bgp/bgp.hh 2009-11-29 01:44:39 UTC (rev 11628) @@ -1167,7 +1167,7 @@ bool& multicast_global) { IPNet prefix; - bool unicast, multicast; + bool unicast = false, multicast = false; uint32_t internal_token, global_token; internal_token = global_token = token; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bms_fbsd at users.sourceforge.net Sat Nov 28 18:45:56 2009 From: bms_fbsd at users.sourceforge.net (bms_fbsd at users.sourceforge.net) Date: Sun, 29 Nov 2009 02:45:56 +0000 Subject: [Xorp-cvs] SF.net SVN: xorp:[11629] trunk/xorp/SConstruct Message-ID: Revision: 11629 http://xorp.svn.sourceforge.net/xorp/?rev=11629&view=rev Author: bms_fbsd Date: 2009-11-29 02:45:56 +0000 (Sun, 29 Nov 2009) Log Message: ----------- Add basic support for using compiler and link level performance profiling tools. To compile XORP for profiling with gprof, tell SCons 'profile=gprof', and also 'shared=false'. To compile XORP for profiling with pprof (from the Google Performance Tools package), tell SCons 'profile=pprof'. Tools such as KCacheGrind can use the pprof output directly. Using gprof is not guaranteed to work in all situations. Using pprof requires we link with the '-lprofiler' library from the Google Performance Tools package. To avoid having to insert calls to the profiler, use the environment variable CPUPROFILE when running the program. Modified Paths: -------------- trunk/xorp/SConstruct Modified: trunk/xorp/SConstruct =================================================================== --- trunk/xorp/SConstruct 2009-11-29 01:44:39 UTC (rev 11628) +++ trunk/xorp/SConstruct 2009-11-29 02:45:56 UTC (rev 11629) @@ -76,6 +76,9 @@ EnumVariable('optimize', 'Build with optimization', 'yes', allowed_values=('no', 'yes', 'full', 'size', 'override'), map={}, ignorecase=2), + EnumVariable('profile', 'Build with profiling', 'no', + allowed_values=('no', 'gprof', 'pprof', 'override'), + map={}, ignorecase=2), ) def tgt_guess(): @@ -156,6 +159,9 @@ # most of the template fat. print 'Optimize code: ', env['optimize'] +# Default to disable; wrapper for compiler profiling support. +print 'Profile code: ', env['profile'] + # Most of our shared library tweaks are specific to GNU ld. # Check if the GNU linker is available, and print a warning if not. if env['shared']: @@ -372,8 +378,9 @@ Split(env['CXXFLAGS']))) bigodict = { 'no': '-O0', 'yes': '-O1', 'full': '-O2', 'size': '-Os' } bigoflag = bigodict[env['optimize']] - env.AppendUnique(CFLAGS = [ bigoflag ]) - env.AppendUnique(CXXFLAGS = [ bigoflag ]) + if not env['optimize'] == 'no': + env.AppendUnique(CFLAGS = [ bigoflag ]) + env.AppendUnique(CXXFLAGS = [ bigoflag ]) # Do the same for the flags which control debug symbols. if not env['debug'] == 'override': @@ -383,9 +390,48 @@ Split(env['CXXFLAGS']))) gdict = { 'no': '', 'yes': '-g', 'full': '-g3' } gflag = gdict[env['debug']] - env.AppendUnique(CFLAGS = [ gflag ]) - env.AppendUnique(CXXFLAGS = [ gflag ]) + if not env['debug'] == 'no': + env.AppendUnique(CFLAGS = [ gflag ]) + env.AppendUnique(CXXFLAGS = [ gflag ]) +# Do the same for the flags which control code profiling. +if not env['profile'] == 'override': + if env['profile'] == 'gprof' and env.has_key('SHAREDLIBS'): + print """ +WARNING: You have requested GNU gprof style profiling +and shared libraries. This is UNSUPPORTED, and probably will not link. +""" + strip_pg_flags = [ '-pg', '-finstrument-functions', '-fno-omit-frame-pointer', '-fno-optimize-sibling-calls' ] + env.Replace( CFLAGS = filter( + lambda s: not s.startswith(tuple(strip_pg_flags)), + Split(env['CFLAGS'])) + ) + env.Replace( CXXFLAGS = filter( + lambda s: not s.startswith(tuple(strip_pg_flags)), + Split(env['CXXFLAGS'])) + ) + # Full use of profiling may require more than one flag, so Split() them. + pgdict = {'no': '', + 'gprof': '-pg', + 'pprof': '', + } + pgflag = pgdict[env['profile']] + if not env['profile'] == 'no': + pgflags = pgflag + ' -fno-omit-frame-pointer -fno-optimize-sibling-calls' + env.AppendUnique( CFLAGS = Split(pgflags)) + env.AppendUnique( CXXFLAGS = Split(pgflags) ) + # Using gprof requires we link with the '-pg' option. + if env['profile'] == 'gprof': + env.AppendUnique( LINKFLAGS = Split(pgflag) ) + # Using pprof requires we link with the '-lprofiler' library + # from the Google Performance Tools package. To avoid having + # to insert calls to the profiler, use the environment + # variable CPUPROFILE when running the program. + # If you do insert calls, please bracket them with WITH_PPROF. + if env['profile'] == 'pprof': + env.AppendUnique( LIBS = [ 'profiler' ] ) + env.AppendUnique( CPPDEFINES = [ 'WITH_PPROF' ] ) + env.AppendUnique(CPPDEFINES = [ ( '_FORTIFY_SOURCE', 0 ), ]) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bms_fbsd at users.sourceforge.net Sat Nov 28 18:46:41 2009 From: bms_fbsd at users.sourceforge.net (bms_fbsd at users.sourceforge.net) Date: Sun, 29 Nov 2009 02:46:41 +0000 Subject: [Xorp-cvs] SF.net SVN: xorp:[11630] trunk/xorp/SConstruct Message-ID: Revision: 11630 http://xorp.svn.sourceforge.net/xorp/?rev=11630&view=rev Author: bms_fbsd Date: 2009-11-29 02:46:41 +0000 (Sun, 29 Nov 2009) Log Message: ----------- Comment out WITH_PPROF; don't define it by default (even if pprof is in use), it will force recompilation even when not needed. Modified Paths: -------------- trunk/xorp/SConstruct Modified: trunk/xorp/SConstruct =================================================================== --- trunk/xorp/SConstruct 2009-11-29 02:45:56 UTC (rev 11629) +++ trunk/xorp/SConstruct 2009-11-29 02:46:41 UTC (rev 11630) @@ -430,7 +430,7 @@ # If you do insert calls, please bracket them with WITH_PPROF. if env['profile'] == 'pprof': env.AppendUnique( LIBS = [ 'profiler' ] ) - env.AppendUnique( CPPDEFINES = [ 'WITH_PPROF' ] ) + #env.AppendUnique( CPPDEFINES = [ 'WITH_PPROF' ] ) env.AppendUnique(CPPDEFINES = [ ( '_FORTIFY_SOURCE', 0 ), This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bms_fbsd at users.sourceforge.net Sat Nov 28 19:01:27 2009 From: bms_fbsd at users.sourceforge.net (bms_fbsd at users.sourceforge.net) Date: Sun, 29 Nov 2009 03:01:27 +0000 Subject: [Xorp-cvs] SF.net SVN: xorp:[11631] trunk/xorp/SConstruct Message-ID: Revision: 11631 http://xorp.svn.sourceforge.net/xorp/?rev=11631&view=rev Author: bms_fbsd Date: 2009-11-29 03:01:26 +0000 (Sun, 29 Nov 2009) Log Message: ----------- Log build arguments to a file in the build directory. Submitted by: Ben Greear (with changes) Modified Paths: -------------- trunk/xorp/SConstruct Modified: trunk/xorp/SConstruct =================================================================== --- trunk/xorp/SConstruct 2009-11-29 02:46:41 UTC (rev 11630) +++ trunk/xorp/SConstruct 2009-11-29 03:01:26 UTC (rev 11631) @@ -81,6 +81,13 @@ map={}, ignorecase=2), ) +def log_args(afname): + f = open(afname, 'w') + for a in ARGUMENTS.iteritems(): + print >>f, "%s=%s" % a, + print >>f + f.close() + def tgt_guess(): p = subprocess.Popen(['./config.guess'], stdout=subprocess.PIPE) o = p.communicate()[0] @@ -113,6 +120,8 @@ SConsignFile(builddir + '/.sconsign') +log_args(builddir + '/.scons_build_args') + prefix = ARGUMENTS.get('prefix', '/usr/local/xorp') print 'Build System Type: ', build This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bms_fbsd at users.sourceforge.net Sat Nov 28 19:10:38 2009 From: bms_fbsd at users.sourceforge.net (bms_fbsd at users.sourceforge.net) Date: Sun, 29 Nov 2009 03:10:38 +0000 Subject: [Xorp-cvs] SF.net SVN: xorp:[11632] trunk/xorp/libxipc/tests Message-ID: Revision: 11632 http://xorp.svn.sourceforge.net/xorp/?rev=11632&view=rev Author: bms_fbsd Date: 2009-11-29 03:10:37 +0000 (Sun, 29 Nov 2009) Log Message: ----------- Re-add the bench scripts for IPC with some changes. 'inproc' and 'udp' transports are no longer built by default. Added Paths: ----------- trunk/xorp/libxipc/tests/bench_ipc.awk trunk/xorp/libxipc/tests/bench_ipc.sh trunk/xorp/libxipc/tests/bench_ipc_gnuplot.sh Added: trunk/xorp/libxipc/tests/bench_ipc.awk =================================================================== --- trunk/xorp/libxipc/tests/bench_ipc.awk (rev 0) +++ trunk/xorp/libxipc/tests/bench_ipc.awk 2009-11-29 03:10:37 UTC (rev 11632) @@ -0,0 +1,52 @@ +# +# $XORP$ +# + +# +# An AWK script to process and print statistics of data collected +# by script bench_ipc.sh +# + +/^XrlAtoms/ { + if (n > 0) + dump_stats(); + + t = 0; # total + tsq = 0; # total of squares + n = 0; # number of readings + min = 10000000; + max = 0; + n_xrl = $5; +} + +/^Received/ { + x = $10; + t = t + x; + tsq = tsq + x * x; + n++; + if (x > max) + max = x; + if (x < min) + min = x; +} + +BEGIN { + print "# Column 0 XrlAtoms per Xrl"; + print "# Column 1 Mean XRLs per sec"; + print "# Column 2 Std dev of XRLs per sec"; + print "# Column 3 Min XRLs per sec"; + print "# Column 4 Max XRLs per sec"; +} + +END { + dump_stats() +} + +function dump_stats() { + m = t / n; + msq = tsq / n; + + sigma = (msq - m * m) ** 0.5; + + print n_xrl, m, sigma, min, max; +} Added: trunk/xorp/libxipc/tests/bench_ipc.sh =================================================================== --- trunk/xorp/libxipc/tests/bench_ipc.sh (rev 0) +++ trunk/xorp/libxipc/tests/bench_ipc.sh 2009-11-29 03:10:37 UTC (rev 11632) @@ -0,0 +1,46 @@ +#!/usr/bin/env bash + +# +# $XORP$ +# + +# +# A script to perform IPC performance measurements +# + +# Conditionally set ${srcdir} if it wasn't assigned (e.g., by `gmake check`) +if [ "X${srcdir}" = "X" ] ; then srcdir=`dirname $0` ; fi + +BINDIR=. + +${BINDIR}/xorp_finder & +FINDER_PID=$! + +test_pf() +{ + local pfname=$1 + local pfenv=$2 + local pfcmd=$3 + local rawfile=${pfname}.log + local i + + echo "-------------------------------------" + echo "Collecting measurements for ${pfname}" + echo "-------------------------------------" + + for i in 0 1 2 3 4 5 6 7 8 9 10 12 15 18 20 25; do + XORP_PF=${pfenv} ${BINDIR}/test_xrl_sender ${pfcmd} -n $i + done | tee ${rawfile} + outfile=${pfname}.dat + cat ${rawfile} | awk -f ${srcdir}/bench_ipc.awk > $outfile + + echo "Output:" + echo " Raw data file = ${rawfile}" + echo " Processed data file = ${outfile}" +} + +#test_pf "inproc" "i" "-m 0 -r" +#test_pf "udp" "u" "-m 0 -r" +test_pf "tcp" "t" "-m 0 -r" + +kill ${FINDER_PID} Property changes on: trunk/xorp/libxipc/tests/bench_ipc.sh ___________________________________________________________________ Added: svn:executable + * Added: trunk/xorp/libxipc/tests/bench_ipc_gnuplot.sh =================================================================== --- trunk/xorp/libxipc/tests/bench_ipc_gnuplot.sh (rev 0) +++ trunk/xorp/libxipc/tests/bench_ipc_gnuplot.sh 2009-11-29 03:10:37 UTC (rev 11632) @@ -0,0 +1,97 @@ +#!/bin/sh + +# +# $XORP$ +# + +# +# A script to plot the IPC performance measurements results. +# + +# Terminal and label fonts +SET_TERM="set term post eps \"Times-Roman\" 23" +FONT="Times-Roman, 23" +SET_POINTSIZE="set pointsize 1.8" + +# Default setup +XLABEL="" +YlABEL="" +SET_KEY="set key top right" + + +post_process_eps() { +# sed 's/BoundingBox: 50 50 410 302/BoundingBox: 60 60 315 290/g' $OFILE >$OFILE.tmp +# mv $OFILE.tmp $OFILE +} + +# Plot functions +plot_eps() { +gnuplot < $2 +} + +# Setup various parameters +setup_vars() { + +filter_input $stat1.dat $stat1.dat.gnuplot +filter_input $stat2.dat $stat2.dat.gnuplot +filter_input $stat3.dat $stat3.dat.gnuplot + +IFILE1="$stat1.dat.gnuplot" +IFILE2="$stat2.dat.gnuplot" +IFILE3="$stat3.dat.gnuplot" + +# Parameters +PAR_AVE1="using 1:2 t \"$NAME1\" w lp lt 1 lw 2 pt 2" +PAR_BAR1="t \"\" w yerrorbars lt 1 lw 2 pt 2" +PAR_AVE2="using 1:2 t \"$NAME2\" w lp lt 1 lw 2 pt 4" +PAR_BAR2="t \"\" w yerrorbars lt 1 lw 2 pt 4" +PAR_AVE3="using 1:2 t \"$NAME3\" w lp lt 1 lw 2 pt 6" +PAR_BAR3="t \"\" w yerrorbars lt 1 lw 2 pt 6" + +} + + +# Common setup +XLABEL="Number of XRL arguments" +LOGSCALE="nologscale xy" +XRANGE="[*:*]" +YRANGE="[*:*]" +#SET_KEY="set key top right" +PLOT="plot \"$IFILE1\" $PAR_AVE1, \"$IFILE1\" $PAR_BAR1, \"$IFILE2\" $PAR_AVE2, \"$IFILE2\" $PAR_BAR2, \"$IFILE3\" $PAR_AVE3, \"$IFILE3\" $PAR_BAR3" + +stat1="inproc" +stat2="tcp" +stat3="udp" +NAME1="In-Process" +NAME2="TCP" +NAME3="UDP" +YLABEL="Performance (XRLs/sec)" +TITLE="XRL performance for various communication families" +setup_vars +OFILE="xrl_performance.eps" +# Select with or without std. deviation +#PLOT="plot \"$IFILE1\" $PAR_AVE1, \"$IFILE2\" $PAR_AVE2, \"$IFILE3\" $PAR_AVE3" +PLOT="plot \"$IFILE1\" $PAR_AVE1, \"$IFILE1\" $PAR_BAR1, \"$IFILE2\" $PAR_AVE2, \"$IFILE2\" $PAR_BAR2, \"$IFILE3\" $PAR_AVE3, \"$IFILE3\" $PAR_BAR3" +plot_eps + +exit 0 Property changes on: trunk/xorp/libxipc/tests/bench_ipc_gnuplot.sh ___________________________________________________________________ Added: svn:executable + * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bms_fbsd at users.sourceforge.net Sat Nov 28 19:12:06 2009 From: bms_fbsd at users.sourceforge.net (bms_fbsd at users.sourceforge.net) Date: Sun, 29 Nov 2009 03:12:06 +0000 Subject: [Xorp-cvs] SF.net SVN: xorp:[11633] trunk/xorp/libxipc Message-ID: Revision: 11633 http://xorp.svn.sourceforge.net/xorp/?rev=11633&view=rev Author: bms_fbsd Date: 2009-11-29 03:12:06 +0000 (Sun, 29 Nov 2009) Log Message: ----------- Complete the move. Removed Paths: ------------- trunk/xorp/libxipc/bench_ipc.awk trunk/xorp/libxipc/bench_ipc.sh trunk/xorp/libxipc/bench_ipc_gnuplot.sh Deleted: trunk/xorp/libxipc/bench_ipc.awk =================================================================== --- trunk/xorp/libxipc/bench_ipc.awk 2009-11-29 03:10:37 UTC (rev 11632) +++ trunk/xorp/libxipc/bench_ipc.awk 2009-11-29 03:12:06 UTC (rev 11633) @@ -1,52 +0,0 @@ -# -# $XORP$ -# - -# -# An AWK script to process and print statistics of data collected -# by script bench_ipc.sh -# - -/^XrlAtoms/ { - if (n > 0) - dump_stats(); - - t = 0; # total - tsq = 0; # total of squares - n = 0; # number of readings - min = 10000000; - max = 0; - n_xrl = $5; -} - -/^Received/ { - x = $10; - t = t + x; - tsq = tsq + x * x; - n++; - if (x > max) - max = x; - if (x < min) - min = x; -} - -BEGIN { - print "# Column 0 XrlAtoms per Xrl"; - print "# Column 1 Mean XRLs per sec"; - print "# Column 2 Std dev of XRLs per sec"; - print "# Column 3 Min XRLs per sec"; - print "# Column 4 Max XRLs per sec"; -} - -END { - dump_stats() -} - -function dump_stats() { - m = t / n; - msq = tsq / n; - - sigma = (msq - m * m) ** 0.5; - - print n_xrl, m, sigma, min, max; -} Deleted: trunk/xorp/libxipc/bench_ipc.sh =================================================================== --- trunk/xorp/libxipc/bench_ipc.sh 2009-11-29 03:10:37 UTC (rev 11632) +++ trunk/xorp/libxipc/bench_ipc.sh 2009-11-29 03:12:06 UTC (rev 11633) @@ -1,46 +0,0 @@ -#!/usr/local/bin/bash - -# -# $XORP$ -# - -# -# A script to perform IPC performance measurements -# - -# Conditionally set ${srcdir} if it wasn't assigned (e.g., by `gmake check`) -if [ "X${srcdir}" = "X" ] ; then srcdir=`dirname $0` ; fi - -BINDIR=. - -${BINDIR}/xorp_finder & -FINDER_PID=$! - -test_pf() -{ - local pfname=$1 - local pfenv=$2 - local pfcmd=$3 - local rawfile=${pfname}.log - local i - - echo "-------------------------------------" - echo "Collecting measurements for ${pfname}" - echo "-------------------------------------" - - for i in 0 1 2 3 4 5 6 7 8 9 10 12 15 18 20 25; do - XORP_PF=${pfenv} ${BINDIR}/test_xrl_sender ${pfcmd} -n $i - done | tee ${rawfile} - outfile=${pfname}.dat - cat ${rawfile} | awk -f ${srcdir}/bench_ipc.awk > $outfile - - echo "Output:" - echo " Raw data file = ${rawfile}" - echo " Processed data file = ${outfile}" -} - -test_pf "inproc" "i" "-m 0 -r" -test_pf "udp" "u" "-m 0 -r" -test_pf "tcp" "t" "-m 0 -r" - -kill ${FINDER_PID} Deleted: trunk/xorp/libxipc/bench_ipc_gnuplot.sh =================================================================== --- trunk/xorp/libxipc/bench_ipc_gnuplot.sh 2009-11-29 03:10:37 UTC (rev 11632) +++ trunk/xorp/libxipc/bench_ipc_gnuplot.sh 2009-11-29 03:12:06 UTC (rev 11633) @@ -1,97 +0,0 @@ -#!/bin/sh - -# -# $XORP$ -# - -# -# A script to plot the IPC performance measurements results. -# - -# Terminal and label fonts -SET_TERM="set term post eps \"Times-Roman\" 23" -FONT="Times-Roman, 23" -SET_POINTSIZE="set pointsize 1.8" - -# Default setup -XLABEL="" -YlABEL="" -SET_KEY="set key top right" - - -post_process_eps() { -# sed 's/BoundingBox: 50 50 410 302/BoundingBox: 60 60 315 290/g' $OFILE >$OFILE.tmp -# mv $OFILE.tmp $OFILE -} - -# Plot functions -plot_eps() { -gnuplot < $2 -} - -# Setup various parameters -setup_vars() { - -filter_input $stat1.dat $stat1.dat.gnuplot -filter_input $stat2.dat $stat2.dat.gnuplot -filter_input $stat3.dat $stat3.dat.gnuplot - -IFILE1="$stat1.dat.gnuplot" -IFILE2="$stat2.dat.gnuplot" -IFILE3="$stat3.dat.gnuplot" - -# Parameters -PAR_AVE1="using 1:2 t \"$NAME1\" w lp lt 1 lw 2 pt 2" -PAR_BAR1="t \"\" w yerrorbars lt 1 lw 2 pt 2" -PAR_AVE2="using 1:2 t \"$NAME2\" w lp lt 1 lw 2 pt 4" -PAR_BAR2="t \"\" w yerrorbars lt 1 lw 2 pt 4" -PAR_AVE3="using 1:2 t \"$NAME3\" w lp lt 1 lw 2 pt 6" -PAR_BAR3="t \"\" w yerrorbars lt 1 lw 2 pt 6" - -} - - -# Common setup -XLABEL="Number of XRL arguments" -LOGSCALE="nologscale xy" -XRANGE="[*:*]" -YRANGE="[*:*]" -#SET_KEY="set key top right" -PLOT="plot \"$IFILE1\" $PAR_AVE1, \"$IFILE1\" $PAR_BAR1, \"$IFILE2\" $PAR_AVE2, \"$IFILE2\" $PAR_BAR2, \"$IFILE3\" $PAR_AVE3, \"$IFILE3\" $PAR_BAR3" - -stat1="inproc" -stat2="tcp" -stat3="udp" -NAME1="In-Process" -NAME2="TCP" -NAME3="UDP" -YLABEL="Performance (XRLs/sec)" -TITLE="XRL performance for various communication families" -setup_vars -OFILE="xrl_performance.eps" -# Select with or without std. deviation -#PLOT="plot \"$IFILE1\" $PAR_AVE1, \"$IFILE2\" $PAR_AVE2, \"$IFILE3\" $PAR_AVE3" -PLOT="plot \"$IFILE1\" $PAR_AVE1, \"$IFILE1\" $PAR_BAR1, \"$IFILE2\" $PAR_AVE2, \"$IFILE2\" $PAR_BAR2, \"$IFILE3\" $PAR_AVE3, \"$IFILE3\" $PAR_BAR3" -plot_eps - -exit 0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bms_fbsd at users.sourceforge.net Sat Nov 28 19:38:09 2009 From: bms_fbsd at users.sourceforge.net (bms_fbsd at users.sourceforge.net) Date: Sun, 29 Nov 2009 03:38:09 +0000 Subject: [Xorp-cvs] SF.net SVN: xorp:[11634] trunk/xorp/libxipc/tests/SConscript Message-ID: Revision: 11634 http://xorp.svn.sourceforge.net/xorp/?rev=11634&view=rev Author: bms_fbsd Date: 2009-11-29 03:38:09 +0000 (Sun, 29 Nov 2009) Log Message: ----------- Build test_xrl_receiver and test_xrl_sender during 'scons check', but do not run them [yet]. Modified Paths: -------------- trunk/xorp/libxipc/tests/SConscript Modified: trunk/xorp/libxipc/tests/SConscript =================================================================== --- trunk/xorp/libxipc/tests/SConscript 2009-11-29 03:12:06 UTC (rev 11633) +++ trunk/xorp/libxipc/tests/SConscript 2009-11-29 03:38:09 UTC (rev 11634) @@ -29,6 +29,8 @@ ]) env.AppendUnique(LIBPATH = [ + '$BUILDDIR/xrl/interfaces', + '$BUILDDIR/xrl/targets', '$BUILDDIR/libxipc', '$BUILDDIR/libxorp', '$BUILDDIR/libcomm', @@ -65,9 +67,7 @@ 'xrl_atom', 'xrl_error', 'xrl_parser', - #'xrl_receiver', # compound #'xrl_router', # uses XrlPFUDP* - #'xrl_sender', # compound ] cpp_test_targets = [] @@ -75,3 +75,32 @@ for ct in simple_cpp_tests: cpp_test_targets.append(env.AutoTest(target = 'test_%s' % ct, source = 'test_%s.cc' % ct)) + +### test_xrl_sender/receiver + +env = env.Clone() + +env.PrependUnique(LIBS = [ + 'xif_test_xrls', + 'xst_test_xrls', + ]) + +test_receiver_o = env.Object('test_receiver.cc') + +test_xrl_receiver_srcs = [ 'test_xrl_receiver.cc', test_receiver_o ] +test_xrl_receiver = env.Program(target = 'test_xrl_receiver', + source = test_xrl_receiver_srcs) +# XXX Build on 'check', but don't run. +env.Alias('check', test_xrl_receiver) + +# TODO: Run on 'check' using the provided shell scripts. +#runner = env.Action(test[0].abspath) +#env.Alias('check', test, runner) + +test_xrl_sender_srcs = [ 'test_xrl_sender.cc', test_receiver_o ] +test_xrl_sender = env.Program(target = 'test_xrl_sender', + source = test_xrl_sender_srcs) +# XXX Build on 'check', but don't run. +env.Alias('check', test_xrl_sender) + +Default() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bms_fbsd at users.sourceforge.net Sat Nov 28 19:57:49 2009 From: bms_fbsd at users.sourceforge.net (bms_fbsd at users.sourceforge.net) Date: Sun, 29 Nov 2009 03:57:49 +0000 Subject: [Xorp-cvs] SF.net SVN: xorp:[11635] trunk/xorp/libxipc/tests/test_xrl_router.cc Message-ID: Revision: 11635 http://xorp.svn.sourceforge.net/xorp/?rev=11635&view=rev Author: bms_fbsd Date: 2009-11-29 03:57:49 +0000 (Sun, 29 Nov 2009) Log Message: ----------- Use local TCP, not UDP transport; as UDP has been deprecated from the library. It's an unreliable transport, and XRL needs reliable semantics. Modified Paths: -------------- trunk/xorp/libxipc/tests/test_xrl_router.cc Modified: trunk/xorp/libxipc/tests/test_xrl_router.cc =================================================================== --- trunk/xorp/libxipc/tests/test_xrl_router.cc 2009-11-29 03:38:09 UTC (rev 11634) +++ trunk/xorp/libxipc/tests/test_xrl_router.cc 2009-11-29 03:57:49 UTC (rev 11635) @@ -26,7 +26,7 @@ #include "xrl_module.h" #include "libxorp/xlog.h" #include "xrl_router.hh" -#include "xrl_pf_sudp.hh" +#include "xrl_pf_stcp.hh" #include "xrl_args.hh" #include "finder_server.hh" @@ -121,7 +121,7 @@ // Create and configure "party_A" XrlRouter party_a(eventloop, "party_A", finder->addr(), finder->port()); - XrlPFSUDPListener listener_a(eventloop); + XrlPFSTCPListener listener_a(eventloop); party_a.add_listener(&listener_a); // Add command that party_A knows about @@ -132,7 +132,7 @@ // Create and configure "party_B" XrlRouter party_b(eventloop, "party_B", finder->addr(), finder->port()); - XrlPFSUDPListener listener_b(eventloop); + XrlPFSTCPListener listener_b(eventloop); party_b.add_listener(&listener_b); party_b.finalize(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bms_fbsd at users.sourceforge.net Sat Nov 28 19:58:36 2009 From: bms_fbsd at users.sourceforge.net (bms_fbsd at users.sourceforge.net) Date: Sun, 29 Nov 2009 03:58:36 +0000 Subject: [Xorp-cvs] SF.net SVN: xorp:[11636] trunk/xorp/libxipc/tests/SConscript Message-ID: Revision: 11636 http://xorp.svn.sourceforge.net/xorp/?rev=11636&view=rev Author: bms_fbsd Date: 2009-11-29 03:58:36 +0000 (Sun, 29 Nov 2009) Log Message: ----------- Build test_xrl_router as a simple test, and run it with the others. Correct the RPATH for test_xrl_router/test_xrl_sender. Modified Paths: -------------- trunk/xorp/libxipc/tests/SConscript Modified: trunk/xorp/libxipc/tests/SConscript =================================================================== --- trunk/xorp/libxipc/tests/SConscript 2009-11-29 03:57:49 UTC (rev 11635) +++ trunk/xorp/libxipc/tests/SConscript 2009-11-29 03:58:36 UTC (rev 11636) @@ -67,7 +67,7 @@ 'xrl_atom', 'xrl_error', 'xrl_parser', - #'xrl_router', # uses XrlPFUDP* + 'xrl_router', ] cpp_test_targets = [] @@ -76,10 +76,19 @@ cpp_test_targets.append(env.AutoTest(target = 'test_%s' % ct, source = 'test_%s.cc' % ct)) +# XXX Now to run them. + ### test_xrl_sender/receiver env = env.Clone() +def local_rpath(tenv): + """ Return tenv's RPATH munged to contain absolute build path. """ + return [ x.replace('$BUILDDIR', Dir(tenv['BUILDDIR']).abspath) \ + for x in tenv['LIBPATH'] ] + +env['RPATH'] += local_rpath(env) + env.PrependUnique(LIBS = [ 'xif_test_xrls', 'xst_test_xrls', @@ -100,6 +109,7 @@ test_xrl_sender_srcs = [ 'test_xrl_sender.cc', test_receiver_o ] test_xrl_sender = env.Program(target = 'test_xrl_sender', source = test_xrl_sender_srcs) + # XXX Build on 'check', but don't run. env.Alias('check', test_xrl_sender) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bms_fbsd at users.sourceforge.net Sat Nov 28 21:04:15 2009 From: bms_fbsd at users.sourceforge.net (bms_fbsd at users.sourceforge.net) Date: Sun, 29 Nov 2009 05:04:15 +0000 Subject: [Xorp-cvs] SF.net SVN: xorp:[11637] trunk/xorp/libxipc/tests/test_xrl_sender.cc Message-ID: Revision: 11637 http://xorp.svn.sourceforge.net/xorp/?rev=11637&view=rev Author: bms_fbsd Date: 2009-11-29 05:04:14 +0000 (Sun, 29 Nov 2009) Log Message: ----------- Add -N flag to control the number of XRL sends per run. Defaults to 10000. Modified Paths: -------------- trunk/xorp/libxipc/tests/test_xrl_sender.cc Modified: trunk/xorp/libxipc/tests/test_xrl_sender.cc =================================================================== --- trunk/xorp/libxipc/tests/test_xrl_sender.cc 2009-11-29 03:58:36 UTC (rev 11636) +++ trunk/xorp/libxipc/tests/test_xrl_sender.cc 2009-11-29 05:04:14 UTC (rev 11637) @@ -106,8 +106,8 @@ // // Global variables // -static uint32_t MAX_XRL_ID = 10000; // Number of Xrls in a test run static uint32_t XRL_PIPE_SIZE = 40; // Maximum in flight +static uint32_t g_max_xrls_per_run = 10000; static uint32_t g_send_method = SEND_METHOD_PIPELINE; static uint32_t g_send_style = SEND_CMDLINE_VAR_XRL; static uint32_t g_atoms_per_xrl = 1; @@ -329,7 +329,7 @@ void TestSender::send_batch() { - unsigned xrls = 100000; + unsigned int xrls = 100000; // XXX get target into finder cache bool rc = transmit_xrl_next(&TestSender::send_batch_cb); @@ -634,6 +634,7 @@ fprintf(output, " -h : usage (this message)\n"); fprintf(output, " -m : send method (see below)\n"); fprintf(output, " -n : number of XrlAtoms in each Xrl call\n"); + fprintf(output, " -N : number of Xrls to send in a test run\n"); fprintf(output, " -r : run receiver in same process\n"); fprintf(output, " -a : eventloop aggressiveness\n"); fprintf(output, " -1 : parameter 1\n"); @@ -670,7 +671,7 @@ XrlStdRouter xrl_std_router_test_sender(eventloop, "test_xrl_sender", finder_hostname, finder_port); TestSender test_sender(eventloop, &xrl_std_router_test_sender, - MAX_XRL_ID); + g_max_xrls_per_run); g_test_sender = &test_sender; xrl_std_router_test_sender.finalize(); @@ -744,7 +745,7 @@ // // Get the program options // - while ((ch = getopt(argc, argv, "F:hm:n:ra:1:2:")) != -1) { + while ((ch = getopt(argc, argv, "F:hm:n:N:ra:1:2:")) != -1) { switch (ch) { case 'a': g_aggressiveness = atoi(optarg); @@ -782,6 +783,9 @@ case 'n': g_atoms_per_xrl = atoi(optarg); break; + case 'N': + g_max_xrls_per_run = atoi(optarg); + break; case 'r': g_run_receiver = true; break; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bms_fbsd at users.sourceforge.net Sat Nov 28 21:05:45 2009 From: bms_fbsd at users.sourceforge.net (bms_fbsd at users.sourceforge.net) Date: Sun, 29 Nov 2009 05:05:45 +0000 Subject: [Xorp-cvs] SF.net SVN: xorp:[11638] trunk/xorp/libxipc/tests/test_leaks.sh Message-ID: Revision: 11638 http://xorp.svn.sourceforge.net/xorp/?rev=11638&view=rev Author: bms_fbsd Date: 2009-11-29 05:05:45 +0000 (Sun, 29 Nov 2009) Log Message: ----------- Kill test_leaks.sh. LeakTracer has bitrotted somewhat; valgrind's memcheck tool is the king of the runtime memory profilers. Removed Paths: ------------- trunk/xorp/libxipc/tests/test_leaks.sh Deleted: trunk/xorp/libxipc/tests/test_leaks.sh =================================================================== --- trunk/xorp/libxipc/tests/test_leaks.sh 2009-11-29 05:04:14 UTC (rev 11637) +++ trunk/xorp/libxipc/tests/test_leaks.sh 2009-11-29 05:05:45 UTC (rev 11638) @@ -1,120 +0,0 @@ -#!/bin/sh - -# This script runs some of the libxipc tests through Erwin Andreason -# and Henner Zeller's LeakTracer in an attempt to spot memory leaks. -# It is little more than glue to automate both elements of the leak -# detection method - ie generating leak output and correlating it with -# the source code. - -# -# Synopsis: -# spot_leaks -# -# Description: -# Attempt to run command and look for leaks. The supplied command -# must be a dynamically linked C++ program since LeakTracer uses dynamic -# link loading to override the new and delete operators in libstdc++.XX.so. -# -spot_leaks() -{ - local cxxlibs - - if [ $# -eq 0 ] ; then - echo "No command supplied to spots leak." - return 1; - fi - - if [ ! -x ${1} ] ; then - echo "\"$1\" either does not exist or is not executable" - return 1 - fi - - cxxlibs=`ldd $1 2>/dev/null | grep c++` - if [ $? -ne 0 ] ; then - echo "$1 does not appear to be dynamically linked." - return 0 - fi - - if [ -z "${cxxlibs}" ] ; then - echo "$1 does not appear to be a C++ generated executable (ignoring)." - return 0 - fi - - status=">>> Running LeakTracer on \"$*\"" - echo "$status" - - LeakCheck $* 1>/dev/null 2>&1 - leak-analyze $1 1>leak-log 2>warn-log - - grep -q 'Gathered' warn-log - if [ $? -ne 0 ] ; then - echo "Did not appear to generate data points" - cat warn-log leak-log - return 1 - fi - - # Get number of unique points, ie leaks - leaks=`cat warn-log | sed -n '1s/[^(]*(\([0-9][0-9]*\).*/\1/p'` - ret=0 - - if [ "${leaks}" -eq 0 ] ; then - echo " ==> No leaks detected." - else - echo " ==> Leaks detected." - cat warn-log leak-log - ret=1 - fi - return ${ret} -} - -tidy_up() -{ - rm -rf warn-log leak-log -} - -# -# Check LeakTracer is installed. -# -have_leak_check="no" -for p in `echo ${PATH} | tr ':' ' '` ; do - if [ -x $p/LeakCheck ] ; then - have_leak_check=yes - break - fi -done - -if [ "$have_leak_check" = "no" ] ; then - echo "LeakCheck binary not found skipping test." - exit 0 -fi - -# -# These are the "simple" libxipc test programs, i.e. they take no -# arguments. -# -SIMPLE_TESTS="./test_xrl_error ./test_xrl ./test_xrl_atom ./test_xrl_args" -SIMPLE_TESTS="${SIMPLE_TESTS} ./test_inproc ./test_stcp ./test_sudp " -SIMPLE_TESTS="${SIMPLE_TESTS} ./test_lemming ./test_xrl_router" -SIMPLE_TESTS="${SIMPLE_TESTS} ./test_finder ./test_finder_msgs" -SIMPLE_TESTS="${SIMPLE_TESTS} ./test_finder_messenger" - -failures=0 -for t in ${SIMPLE_TESTS} ; do - spot_leaks $t - [ $? -eq 0 ] || failures=1 -done - -# -# There are the "harder" libxipc test programs, ie those that take arguments -# or have test file inputs. -# -spot_leaks ./test_finder_events -b 2 -r 4 -[ $? -eq 0 ] || failures=1 - -if [ "X${srcdir}" = "X" ] ; then srcdir=`dirname $0` ; fi -test_parser_data=${srcdir}/test_xrl_parser.data -spot_leaks ./test_xrl_parser ${test_parser_data} -[ $? -eq 0 ] || failures=1 - -tidy_up -exit ${failures} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. From bms_fbsd at users.sourceforge.net Sat Nov 28 22:20:10 2009 From: bms_fbsd at users.sourceforge.net (bms_fbsd at users.sourceforge.net) Date: Sun, 29 Nov 2009 06:20:10 +0000 Subject: [Xorp-cvs] SF.net SVN: xorp:[11639] trunk/xorp/site_scons/config/allconfig.py Message-ID: Revision: 11639 http://xorp.svn.sourceforge.net/xorp/?rev=11639&view=rev Author: bms_fbsd Date: 2009-11-29 06:20:09 +0000 (Sun, 29 Nov 2009) Log Message: ----------- Add a check for FreeBSD's CLOCK_MONOTONIC_FAST, mostly for testing callgrind. There is a small decrease in syscall time if clock_gettime() is called with this slightly faster clock ID. Modified Paths: -------------- trunk/xorp/site_scons/config/allconfig.py Modified: trunk/xorp/site_scons/config/allconfig.py =================================================================== --- trunk/xorp/site_scons/config/allconfig.py 2009-11-29 05:05:45 UTC (rev 11638) +++ trunk/xorp/site_scons/config/allconfig.py 2009-11-29 06:20:09 UTC (rev 11639) @@ -112,6 +112,11 @@ has_clock_monotonic = conf.CheckDeclaration('CLOCK_MONOTONIC', '#include ') if has_clock_monotonic: conf.Define('HAVE_CLOCK_MONOTONIC') # autoconf compat + # BSD extension + has_clock_monotonic_fast = conf.CheckDeclaration( + 'CLOCK_MONOTONIC_FAST', '#include ') + if has_clock_monotonic_fast: + conf.Define('HAVE_CLOCK_MONOTONIC_FAST') has_struct_timespec = conf.CheckType('struct timespec', includes='#include ') This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.