[Xorp-hackers] [greearb/xorp.ct] 572265: xorp: cli: Sconscript: Make symlink to libxorp_cli...

Fri Feb 17 11:38:25 PST 2012

  Branch: refs/heads/master
  Home:   https://github.com/greearb/xorp.ct
  Commit: 5722655ccebb4c3abb599e105082abd6f7efa6dd
      https://github.com/greearb/xorp.ct/commit/5722655ccebb4c3abb599e105082abd6f7efa6dd
  Author: Igor Maravic <igorm at etf.rs>
  Date:   2012-02-17 (Fri, 17 Feb 2012)

  Changed paths:
    M xorp/cli/SConscript

  Log Message:
  -----------
  xorp: cli: Sconscript: Make symlink to libxorp_cli.so

Make symlink to libxorp_cli.so for resolving links while we are in BUILDDIR.

Signed-off-by: Igor Maravic <igorm at etf.rs>

  Commit: 1af1eb9adbf3ffe305abfe3249aa02b5b3d664aa
      https://github.com/greearb/xorp.ct/commit/1af1eb9adbf3ffe305abfe3249aa02b5b3d664aa
  Author: Igor Maravic <igorm at etf.rs>
  Date:   2012-02-17 (Fri, 17 Feb 2012)

  Changed paths:
    M xorp/cli/libtecla/SConscript

  Log Message:
  -----------
  xorp: cli: libtecla: Sconscript: Make symlink to libxorp_tecla.so

Make symlink to libxorp_tecla.so for resolving links while we are in BUILDDIR.

Signed-off-by: Igor Maravic <igorm at etf.rs>

  Commit: 18eceadab7e9569474b9cd4ac37ee1c8bc9b9308
      https://github.com/greearb/xorp.ct/commit/18eceadab7e9569474b9cd4ac37ee1c8bc9b9308
  Author: Igor Maravic <igorm at etf.rs>
  Date:   2012-02-17 (Fri, 17 Feb 2012)

  Changed paths:
    M xorp/SConstruct

  Log Message:
  -----------
  xorp: Sconstruct: Create subdirectories to hold symlinks to command and module bins in $BUILDDIR

If env['rtld_origin'] is set to TRUE, creates /bin and /sbin directories in $BUILDDIR/lib/xorp to hold symlinks for
command and module bins, respectivly.
We need that, so we coud run xorpsh from $BUILDDIR. Also this commit makes running of xorp_rtrmngr from $BUILDDIR easier.

Signed-off-by: Igor Maravic <igorm at etf.rs>

  Commit: e97916e637ab2d444cd0bcbd943439ab32fe540c
      https://github.com/greearb/xorp.ct/commit/e97916e637ab2d444cd0bcbd943439ab32fe540c
  Author: Igor Maravic <igorm at etf.rs>
  Date:   2012-02-17 (Fri, 17 Feb 2012)

  Changed paths:
    M xorp/rtrmgr/util.cc

  Log Message:
  -----------
  xorp: rtrmgr: util.cc: Changed s_cfg_root and s_config_root and introduced s_template_dir and s_target_dir

When current_root == build_root, changed s_cfg_root to be equal build_root, so the xorpsh and xorp_rtrmgr
would expect command and module bins in $BUILDDIR/lib/xorp/{bin, sbin} by default.

Changed s_config_file to be equal xorp_real_path(XORP_SRC_ROOT) + "/rtrmgr/config/xorp.conf",
so the xorpsh and xorp_rtrmgr would expect xorp.conf in subdir, where all example .conf files are,
by default.

Introduced s_template_dir and s_target_dir, so when xorpsh and xorp_rtrmgr are run from $BUILDDIR,
they would look for template files in $BUILDDIR/etc/templates and target files in $BUILDDIR/xrl/targets.
In other cases, they look for template files in s_cfg_root+"/share/xorp/templates" and for target files
in s_cfg_root+"/share/xorp/xrl/targets", like they used to do.

Signed-off-by: Igor Maravic <igorm at etf.rs>

  Commit: dd4f0084815a27200b7e197c713df26e0df4883b
      https://github.com/greearb/xorp.ct/commit/dd4f0084815a27200b7e197c713df26e0df4883b
  Author: Igor Maravic <igorm at etf.rs>
  Date:   2012-02-17 (Fri, 17 Feb 2012)

  Changed paths:
    M xorp/bgp/SConscript
  M xorp/contrib/mld6igmp_lite/SConscript
  M xorp/contrib/olsr/SConscript
  M xorp/fea/SConscript
  M xorp/fib2mrib/SConscript
  M xorp/libxipc/SConscript
  M xorp/mld6igmp/SConscript
  M xorp/ospf/SConscript
  M xorp/pim/SConscript
  M xorp/policy/SConscript
  M xorp/rib/SConscript
  M xorp/rip/SConscript
  M xorp/static_routes/SConscript
  M xorp/vrrp/SConscript

  Log Message:
  -----------
  xorp: Make symlink to module bins in $BUILDDIR/lib/xorp/sbin

If env['rtld_origin'] is set to TRUE, makes symlinks for module
bins in $BUILDDIR/lib/xorp/sbin, so xorpsh could be run from $BUILDDIR.
Also, makes running of xorp_rtrmgr from $BUILDDIR easier.

Signed-off-by: Igor Maravic <igorm at etf.rs>

  Commit: 73384d43886768342b8f64ef2ea050d926342cb0
      https://github.com/greearb/xorp.ct/commit/73384d43886768342b8f64ef2ea050d926342cb0
  Author: Igor Maravic <igorm at etf.rs>
  Date:   2012-02-17 (Fri, 17 Feb 2012)

  Changed paths:
    M xorp/bgp/tools/SConscript
  M xorp/cli/tools/SConscript
  M xorp/contrib/olsr/tools/SConscript
  M xorp/fea/tools/SConscript
  M xorp/ospf/tools/SConscript
  M xorp/rib/tools/SConscript
  M xorp/rip/tools/SConscript
  M xorp/utils/SConscript

  Log Message:
  -----------
  xorp: Make symlinks to command bins in $BUILDDIR/lib/xorp/bin

If env['rtld_origin'] is set to TRUE, makes symlinks to command
bins in $BUILDDIR/lib/xorp/bin, so the xorpsh could be run from
$BUILDDIR. Also, makes running of xorp_rtrmgr from $BUILDDIR easier.

Signed-off-by: Igor Maravic <igorm at etf.rs>

  Commit: df58d12c19c8fdcfc9ec2083fae9f87f7fae18f2
      https://github.com/greearb/xorp.ct/commit/df58d12c19c8fdcfc9ec2083fae9f87f7fae18f2
  Author: Igor Maravic <igorm at etf.rs>
  Date:   2012-02-17 (Fri, 17 Feb 2012)

  Changed paths:
    M xorp/SConstruct

  Log Message:
  -----------
  xorp: SConstruct: Create subdir $BUILDDIR/etc/templates

Creates subdir $BUILDDIR/etc/templates for holding template files.

Signed-off-by: Igor Maravic <igorm at etf.rs>

  Commit: 95cdfaa59f95352f4e66b651bb64c716e413067f
      https://github.com/greearb/xorp.ct/commit/95cdfaa59f95352f4e66b651bb64c716e413067f
  Author: Igor Maravic <igorm at etf.rs>
  Date:   2012-02-17 (Fri, 17 Feb 2012)

  Changed paths:
    M xorp/etc/templates/SConscript

  Log Message:
  -----------
  xorp: etc: templates: Sconscript: Copy necessary template files to $BUILDDIR/etc/templates

Copy necessary template files to $BUILDDIR/etc/templates, if env['rtld_origin'] is set to TRUE.
With this, we can run xorpsh from $BUILDDIR. Also makes running xorp_rtrmgr from $BUILDDIR
easier.

Signed-off-by: Igor Maravic <igorm at etf.rs>

  Commit: 9115d926855250c66ed2e2d5e37183deb55ec38b
      https://github.com/greearb/xorp.ct/commit/9115d926855250c66ed2e2d5e37183deb55ec38b
  Author: Igor Maravic <igorm at etf.rs>
  Date:   2012-02-17 (Fri, 17 Feb 2012)

  Changed paths:
    M xorp/contrib/mld6igmp_lite/SConscript
  M xorp/contrib/olsr/SConscript
  M xorp/fea/data_plane/control_socket/SConscript
  M xorp/fea/data_plane/fibconfig/SConscript
  M xorp/fea/data_plane/firewall/SConscript
  M xorp/fea/data_plane/ifconfig/SConscript
  M xorp/fea/data_plane/io/SConscript
  M xorp/fea/data_plane/managers/SConscript

  Log Message:
  -----------
  xorp: Make symlinks for shared libraries

Make symlinks to shared libraries, so xorpsh and xorp_rtrmgr could be run from
$BUILDDIR.

Signed-off-by: Igor Maravic <igorm at etf.rs>

Compare: https://github.com/greearb/xorp.ct/compare/c543e71...9115d92