No subject
Fri Aug 1 16:07:29 2003
Return-Path: xorp-cvs-admin@icir.org
Delivery-Date: Fri, 01 Aug 2003 16:08:43 -0700
Received: from wyvern.icir.org (wyvern.icir.org [192.150.187.14])
by tigger.icir.org (8.12.8p1/8.12.3) with ESMTP id h71N8hvs014327
for <atanu@tigger.icir.org>; Fri, 1 Aug 2003 16:08:43 -0700 (PDT)
(envelope-from xorp-cvs-admin@icir.org)
Received: from fruitcake.ICSI.Berkeley.EDU (fruitcake.ICSI.Berkeley.EDU [192.150.186.11])
by wyvern.icir.org (8.12.8p1/8.12.3) with ESMTP id h71N8gdk095873
for <atanu@icir.org>; Fri, 1 Aug 2003 16:08:42 -0700 (PDT)
(envelope-from xorp-cvs-admin@icir.org)
Received: from fruitcake.ICSI.Berkeley.EDU (localhost [127.0.0.1])
by fruitcake.ICSI.Berkeley.EDU (8.12.9/8.12.9) with ESMTP id h71N82RW023824;
Fri, 1 Aug 2003 16:08:41 -0700 (PDT)
Received: from wyvern.icir.org (wyvern.icir.org [192.150.187.14])
by fruitcake.ICSI.Berkeley.EDU (8.12.9/8.12.9) with ESMTP id h71N7URW023813
for <xorp-cvs@icsi.berkeley.edu>; Fri, 1 Aug 2003 16:07:30 -0700 (PDT)
Received: from xorpc.icir.org (xorpc.icir.org [192.150.187.68])
by wyvern.icir.org (8.12.8p1/8.12.3) with ESMTP id h71N7Udk095869
for <xorp-cvs@icir.org>; Fri, 1 Aug 2003 16:07:30 -0700 (PDT)
(envelope-from pavlin@xorpc.icir.org)
Received: from xorpc.icir.org (localhost [127.0.0.1])
by xorpc.icir.org (8.12.8p1/8.12.3) with ESMTP id h71N7UkN039120
for <xorp-cvs@icir.org>; Fri, 1 Aug 2003 16:07:30 -0700 (PDT)
(envelope-from pavlin@xorpc.icir.org)
Received: (from pavlin@localhost)
by xorpc.icir.org (8.12.8p1/8.12.3/Submit) id h71N7UhV039119;
Fri, 1 Aug 2003 16:07:30 -0700 (PDT)
(envelope-from pavlin)
From: Pavlin Radoslavov <pavlin@icir.org>
Message-Id: <200308012307.h71N7UhV039119@xorpc.icir.org>
Date: Fri, 1 Aug 2003 16:07:29 ()
To: xorp-cvs@icir.org
Reply-To: pavlin@icir.org
Subject: [Xorp-cvs] XORP cvs commit: xorp/rtrmgr/ main_rtrmgr.cc module_manager.cc module_manager.hh op_commands.cc template_tree.cc template_tree.hh test_module_manager.cc test_sample_config.cc test_templates.cc xorpsh_main.cc xorpsh_main.hh
Sender: xorp-cvs-admin@icir.org
Errors-To: xorp-cvs-admin@icir.org
X-BeenThere: xorp-cvs@icir.org
X-Mailman-Version: 2.0
Precedence: bulk
List-Help: <mailto:xorp-cvs-request@icir.org?subject=help>
List-Post: <mailto:xorp-cvs@icir.org>
List-Subscribe: <http://mailman.ICSI.Berkeley.EDU/mailman/listinfo/xorp-cvs>,
<mailto:xorp-cvs-request@icir.org?subject=subscribe>
List-Id: Mailing list for XORP CVS commit messages <xorp-cvs.icir.org>
List-Unsubscribe: <http://mailman.ICSI.Berkeley.EDU/mailman/listinfo/xorp-cvs>,
<mailto:xorp-cvs-request@icir.org?subject=unsubscribe>
CVSROOT: /usr/local/share/doc/apache/cvs
Module name: xorp
Repository: xorp/rtrmgr/
Changes by: pavlin@xorpc.icir.org. 03/08/01 16:07:29
Modified files:
xorp/rtrmgr/: main_rtrmgr.cc module_manager.cc module_manager.hh
op_commands.cc template_tree.cc template_tree.hh
test_module_manager.cc test_sample_config.cc
test_templates.cc xorpsh_main.cc xorpsh_main.hh
Log message:
* Add support for using the root of the xorp tree for calculating
all paths to template and xrl files, etc. The ordering in
computing the root of the tree is:
1. The shell environment XORP_ROOT
2. The parent directory the binary in question is run from
(only if it contains the etc/templates and the xrl/targets directories)
3. The XORP_ROOT value as defined in config.h
(currently this is the installation directory, and it
defaults to /usr/local/xorp)
* Now the root of the tree is used for the following:
1. To compute the path to the config template dir, and the xrl dir.
Default:
xorp_root_dir + "/" + "etc/templates"
xorp_root_dir + "/" + "xrl/targets"
2. To compute the path to the config boot file.
Default:
config_root_dir + "/" + config.boot
3. To compute the path to the Xorp modules binaries as specified
in the "%modinfo path" variables in the etc/templates/*.tp files:
xorp_root_dir + "/" + modinfo_path
4. To compute the path to the xorpsh commands as specified in
the "%command" variables in the etc/templates/*.cmds files:
xorp_root_dir + "/" + command
* When starting xorpsh, don't search anymore for the executable
"show" commands in the current and the parent directory. Instead,
use only the xorp_root_dir + the configured path to each command.
This change is for consistency reasons with the rest of the paths
configurations.
* Fix the XORP finder naming in test_module_manager.cc :
"../libxipc/finder" -> "../libxipc/xorp_finder"
* Misc. formatting nits here and there.
_______________________________________________
Xorp-cvs mailing list
Xorp-cvs@icir.org
http://mailman.ICSI.Berkeley.EDU/mailman/listinfo/xorp-cvs