[Xorp-cvs] SF.net SVN: xorp:[11648] trunk/xorp
bms_fbsd at users.sourceforge.net
bms_fbsd at users.sourceforge.net
Thu Dec 3 08:46:36 PST 2009
Revision: 11648
http://xorp.svn.sourceforge.net/xorp/?rev=11648&view=rev
Author: bms_fbsd
Date: 2009-12-03 16:46:35 +0000 (Thu, 03 Dec 2009)
Log Message:
-----------
Continue implementation of FHS style package layout for XORP.
With this change, binaries are now installed as follows:
$prefix/sbin xorpsh, router manager and profiler
$prefix/lib/xorp/bin anything in */tools/*
$prefix/lib/xorp/sbin all protocol modules
$prefix/lib/xorp/lib all shared libraries
$prefix/share/xorp/templates templates are arch independent data
$prefix/share/xorp/xrls *.xrls if debug_xrldb is enabled
Fix some fallout from the last commit, where exec_prefix was
set as a local in SConstruct, but not added to the SCons environmnet.
Use explicit env['foo'] references, rather than relying on '$foo',
to catch this sort of thing sooner in the dependent SConscripts.
NOTE WELL: Trunk at this revision will NOT run, until I've
finished updating the Router Manager for the FHS style paths.
This should happen within the next 24 hours.
If you need a working checkout from trunk, use revision 11646.
Revision Links:
--------------
http://xorp.svn.sourceforge.net/xorp/?rev=11646&view=rev
Modified Paths:
--------------
trunk/xorp/SConstruct
trunk/xorp/bgp/SConscript
trunk/xorp/bgp/tools/SConscript
trunk/xorp/cli/SConscript
trunk/xorp/cli/libtecla/SConscript
trunk/xorp/cli/tools/SConscript
trunk/xorp/contrib/mld6igmp_lite/SConscript
trunk/xorp/contrib/olsr/SConscript
trunk/xorp/etc/templates/SConscript
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/tools/SConscript
trunk/xorp/fib2mrib/SConscript
trunk/xorp/libcomm/SConscript
trunk/xorp/libfeaclient/SConscript
trunk/xorp/libproto/SConscript
trunk/xorp/libxipc/SConscript
trunk/xorp/libxorp/SConscript
trunk/xorp/mld6igmp/SConscript
trunk/xorp/mrt/SConscript
trunk/xorp/ospf/SConscript
trunk/xorp/ospf/tools/SConscript
trunk/xorp/pim/SConscript
trunk/xorp/policy/SConscript
trunk/xorp/policy/backend/SConscript
trunk/xorp/policy/common/SConscript
trunk/xorp/rib/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
trunk/xorp/xrl/interfaces/SConscript
trunk/xorp/xrl/targets/SConscript
Modified: trunk/xorp/SConstruct
===================================================================
--- trunk/xorp/SConstruct 2009-12-03 15:05:32 UTC (rev 11647)
+++ trunk/xorp/SConstruct 2009-12-03 16:46:35 UTC (rev 11648)
@@ -264,7 +264,7 @@
# from 'prefix'.
# Not all of them are used at the moment.
#
-exec_prefix = ARGUMENTS.get('exec_prefix', '$prefix')
+env['exec_prefix'] = ARGUMENTS.get('exec_prefix', '$prefix')
env['sbindir'] = ARGUMENTS.get('sbindir', '$exec_prefix/sbin')
env['libexecdir'] = ARGUMENTS.get('libexecdir', '$exec_prefix/lib')
env['datarootdir'] = ARGUMENTS.get('datarootdir', '$prefix/share')
@@ -284,13 +284,13 @@
# The image layout is intended to be FHS 2.3 compliant, for the benefit
# of 3rd party packagers and distributors.
#
-env['xorp_confdir'] = '$sysconfdir' # path to xorp.conf
-env['xorp_libdir'] = '$libdir/xorp/lib' # Shared libraries
-env['xorp_moduledir'] = '$libdir/xorp/sbin' # Protocol modules
-env['xorp_sbindir'] = '$sbindir' # End-user binaries
-env['xorp_templatedir'] = '$datadir/xorp/templates' # Router Manager .tp
-env['xorp_tooldir'] = '$libdir/xorp/bin' # tools/*
-env['xorp_xrlsdir'] = '$datadir/xorp/xrls' # *.xrls
+env['xorp_confdir'] = env['sysconfdir'] # path to xorp.conf
+env['xorp_libdir'] = env['libdir'] + '/xorp/lib' # Shared libraries
+env['xorp_moduledir'] = env['libdir'] + '/xorp/sbin' # Protocol modules
+env['xorp_sbindir'] = env['sbindir'] # End-user binaries
+env['xorp_templatedir'] = env['datadir'] + '/templates'
+env['xorp_tooldir'] = env['libdir'] + '/xorp/bin' # tools/*
+env['xorp_xrlsdir'] = env['datadir'] + '/xorp/xrls' # *.xrls
# XXX needed by scons xrl idl wrappers
# ...and rtrmgr/util.cc
Modified: trunk/xorp/bgp/SConscript
===================================================================
--- trunk/xorp/bgp/SConscript 2009-12-03 15:05:32 UTC (rev 11647)
+++ trunk/xorp/bgp/SConscript 2009-12-03 16:46:35 UTC (rev 11648)
@@ -150,11 +150,6 @@
]
bgp = bgp_env.Program(target = 'xorp_bgp', source = bgpsrcs)
+env.Alias('install', env.InstallProgram(env['xorp_moduledir'], bgp))
-bgppath = '$bindir'
-bgppath = '$exec_prefix/bgp'
-
-env.Alias('install',
- env.InstallProgram(bgppath, bgp))
-
Default(libxorp_bgp, bgp)
Modified: trunk/xorp/bgp/tools/SConscript
===================================================================
--- trunk/xorp/bgp/tools/SConscript 2009-12-03 15:05:32 UTC (rev 11647)
+++ trunk/xorp/bgp/tools/SConscript 2009-12-03 16:46:35 UTC (rev 11648)
@@ -45,10 +45,6 @@
'xorp_comm',
])
-
-#bgptoolpath = '$bindir'
-bgptoolpath = '$exec_prefix/bgp/tools'
-
### print_peers
ppeers_srcs = [
@@ -60,7 +56,7 @@
# don't install -for debug only
#env.Alias('install',
-# env.InstallProgram(bgptoolpath, ppeers))
+# env.InstallProgram(env['xorp_tooldir'], ppeers))
### print_routes
@@ -73,7 +69,7 @@
# don't install -for debug only
#env.Alias('install',
-# env.InstallProgram(bgptoolpath, proutes))
+# env.InstallProgram(env['xorp_tooldir'], proutes))
### xorpsh_print_peers
@@ -82,9 +78,9 @@
'xorpsh_print_peers.cc',
]
-xppeers = env.Program(target = 'xorpsh_print_peers', source = xppeers_srcs)
+xppeers = env.Program(target = 'bgp_print_peers', source = xppeers_srcs)
env.Alias('install',
- env.InstallProgram(bgptoolpath, xppeers))
+ env.InstallProgram(env['xorp_tooldir'], xppeers))
### xorpsh_print_routes
@@ -93,8 +89,7 @@
'xorpsh_print_routes.cc',
]
-xproutes = env.Program(target = 'xorpsh_print_routes', source = xproutes_srcs)
-env.Alias('install',
- env.InstallProgram(bgptoolpath, xproutes))
+xproutes = env.Program(target = 'bgp_print_routes', source = xproutes_srcs)
+env.Alias('install', env.InstallProgram(env['xorp_tooldir'], xproutes))
Default(xppeers, xproutes)
Modified: trunk/xorp/cli/SConscript
===================================================================
--- trunk/xorp/cli/SConscript 2009-12-03 15:05:32 UTC (rev 11647)
+++ trunk/xorp/cli/SConscript 2009-12-03 16:46:35 UTC (rev 11648)
@@ -70,7 +70,7 @@
libxorp_cli = env.SharedLibrary(target = 'libxorp_cli',
source = libxorp_cli_srcs)
env.Alias('install',
- env.InstallLibrary('$libdir', libxorp_cli))
+ env.InstallLibrary(env['xorp_libdir'], libxorp_cli))
else:
libxorp_cli = env.StaticLibrary(target = 'libxorp_cli',
source = libxorp_cli_srcs)
Modified: trunk/xorp/cli/libtecla/SConscript
===================================================================
--- trunk/xorp/cli/libtecla/SConscript 2009-12-03 15:05:32 UTC (rev 11647)
+++ trunk/xorp/cli/libtecla/SConscript 2009-12-03 16:46:35 UTC (rev 11648)
@@ -70,7 +70,7 @@
if is_shared:
libxorp_tecla = env.SharedLibrary('libxorp_tecla', libtecla_srcs)
env.Alias('install',
- env.InstallLibrary('$libdir', libxorp_tecla))
+ env.InstallLibrary(env['xorp_libdir'], libxorp_tecla))
else:
libxorp_tecla = env.StaticLibrary('libxorp_tecla', libtecla_srcs)
Modified: trunk/xorp/cli/tools/SConscript
===================================================================
--- trunk/xorp/cli/tools/SConscript 2009-12-03 15:05:32 UTC (rev 11647)
+++ trunk/xorp/cli/tools/SConscript 2009-12-03 16:46:35 UTC (rev 11648)
@@ -54,16 +54,9 @@
]
cligen = env.Program(target = 'cli_generic', source = cligensrcs)
+sendcli = env.Program(target = 'cli_send_processor_xrl', source = sendclisrcs)
-sendcli = env.Program(target = 'send_cli_processor_xrl', source = sendclisrcs)
+env.Alias('install', env.InstallProgram(env['xorp_tooldir'], cligen))
+env.Alias('install', env.InstallProgram(env['xorp_tooldir'], sendcli))
-#clitoolpath = '$bindir'
-clitoolpath = '$exec_prefix/cli/tools'
-
-env.Alias('install',
- env.InstallProgram(clitoolpath, cligen))
-
-env.Alias('install',
- env.InstallProgram(clitoolpath, sendcli))
-
Default(cligen, sendcli)
Modified: trunk/xorp/contrib/mld6igmp_lite/SConscript
===================================================================
--- trunk/xorp/contrib/mld6igmp_lite/SConscript 2009-12-03 15:05:32 UTC (rev 11647)
+++ trunk/xorp/contrib/mld6igmp_lite/SConscript 2009-12-03 16:46:35 UTC (rev 11648)
@@ -78,7 +78,7 @@
if is_shared:
libmld6igmplite = env.SharedLibrary(target = 'libmld6igmplite', source = libmld6igmplitesrcs, LIBS = '')
env.Alias('install',
- env.InstallLibrary('$libdir', libmld6igmplite))
+ env.InstallLibrary(env['xorp_libdir'], libmld6igmplite))
else:
libmld6igmplite = env.StaticLibrary(target = 'libmld6igmplite', source = libmld6igmplitesrcs, LIBS = '')
@@ -96,10 +96,10 @@
mldlite = env.Program(target = 'xorp_mld_lite', source = mldlitesrcs)
env.Alias('install',
- env.InstallProgram('$bindir', igmplite))
+ env.InstallProgram(env['xorp_moduledir'], igmplite))
env.Alias('install',
- env.InstallProgram('$bindir', mldlite))
+ env.InstallProgram(env['xorp_moduledir'], mldlite))
Default(libmld6igmplite, igmplite, mldlite)
Modified: trunk/xorp/contrib/olsr/SConscript
===================================================================
--- trunk/xorp/contrib/olsr/SConscript 2009-12-03 15:05:32 UTC (rev 11647)
+++ trunk/xorp/contrib/olsr/SConscript 2009-12-03 16:46:35 UTC (rev 11648)
@@ -91,7 +91,7 @@
if is_shared:
libolsr = env.SharedLibrary(target = 'libolsr', source = libolsrsrcs, LIBS = '')
env.Alias('install',
- env.InstallLibrary('$libdir', libolsr))
+ env.InstallLibrary(env['xorp_libdir'], libolsr))
else:
libolsr = env.StaticLibrary(target = 'libolsr', source = libolsrsrcs, LIBS = '')
@@ -107,7 +107,7 @@
if is_shared:
libolsrxrl = env.SharedLibrary(target = 'libolsrxrl', source = libolsrxrlsrcs, LIBS = '')
env.Alias('install',
- env.InstallLibrary('$libdir', libolsrxrl))
+ env.InstallLibrary(env['xorp_libdir'], libolsrxrl))
else:
libolsrxrl = env.StaticLibrary(target = 'libolsrxrl', source = libolsrxrlsrcs, LIBS = '')
@@ -121,7 +121,6 @@
# XXX not ready for prime time.
-env.Alias('install',
- env.InstallProgram('$bindir', olsr4))
+env.Alias('install', env.InstallProgram(env['xorp_moduledir'], olsr4))
Default(libolsr, libolsrxrl, olsr4)
Modified: trunk/xorp/etc/templates/SConscript
===================================================================
--- trunk/xorp/etc/templates/SConscript 2009-12-03 15:05:32 UTC (rev 11647)
+++ trunk/xorp/etc/templates/SConscript 2009-12-03 16:46:35 UTC (rev 11648)
@@ -22,9 +22,6 @@
e = env.Clone()
-#etctemplatepath = '$datadir'
-etctemplatepath = '$exec_prefix/etc/templates'
-
cmds = [
'bgp',
'fea',
@@ -73,6 +70,9 @@
'vrrp',
]
-e.Alias('install',
- [ e.InstallData(etctemplatepath, [c.__add__('.cmds') for c in cmds]),
- e.InstallData(etctemplatepath, [t.__add__('.tp') for t in tps]) ])
+e.Alias('install', [
+ e.InstallData(env['xorp_templatedir'],
+ [c.__add__('.cmds') for c in cmds]),
+ e.InstallData(env['xorp_templatedir'],
+ [t.__add__('.tp') for t in tps])
+])
Modified: trunk/xorp/fea/SConscript
===================================================================
--- trunk/xorp/fea/SConscript 2009-12-03 15:05:32 UTC (rev 11647)
+++ trunk/xorp/fea/SConscript 2009-12-03 16:46:35 UTC (rev 11648)
@@ -156,7 +156,7 @@
env.AddPostAction(libxorp_fea,
env.Symlink(obj.abspath, env['BUILDDIR'] + '/lib/' + str(obj)))
env.Alias('install',
- env.InstallLibrary('$libdir', libxorp_fea))
+ env.InstallLibrary(env['xorp_libdir'], libxorp_fea))
else:
# Use an intermediate static lib to deal with some dependencies.
libxfdp = env.StaticLibrary(target = 'libxorp_fea_data_plane_base',
@@ -190,8 +190,7 @@
fea = env.Program(target = 'xorp_fea', source = feasrcs)
-env.Alias('install',
- env.InstallProgram(feapath, fea))
+env.Alias('install', env.InstallProgram(env['xorp_moduledir'], fea))
#######################
@@ -206,17 +205,14 @@
]
feadummy = env.Program(target = 'xorp_fea_dummy', source = feadummysrcs)
+env.Alias('install', env.InstallProgram(env['xorp_moduledir'], feadummy))
-env.Alias('install',
- env.InstallProgram(feapath, feadummy))
-
#######################
-clickgen = 'xorp_fea_click_config_generator'
+# XXX conditional on click support, please.
+clickgen = 'fea_click_config_generator'
+env.Alias('install', env.InstallScript(env['xorp_tooldir'], clickgen))
-env.Alias('install',
- env.InstallScript(feapath, clickgen))
-
#######################
Default(libxorp_fea, fea, feadummy)
Modified: trunk/xorp/fea/data_plane/control_socket/SConscript
===================================================================
--- trunk/xorp/fea/data_plane/control_socket/SConscript 2009-12-03 15:05:32 UTC (rev 11647)
+++ trunk/xorp/fea/data_plane/control_socket/SConscript 2009-12-03 16:46:35 UTC (rev 11648)
@@ -43,8 +43,7 @@
if is_shared:
libxcs = env.SharedLibrary(target = 'libxorp_fea_control_socket',
source = sources)
- env.Alias('install',
- env.InstallLibrary('$libdir', libxcs))
+ env.Alias('install', env.InstallLibrary(env['xorp_libdir'], libxcs))
else:
libxcs = env.StaticLibrary(target = 'libxorp_fea_control_socket',
source = sources)
Modified: trunk/xorp/fea/data_plane/fibconfig/SConscript
===================================================================
--- trunk/xorp/fea/data_plane/fibconfig/SConscript 2009-12-03 15:05:32 UTC (rev 11647)
+++ trunk/xorp/fea/data_plane/fibconfig/SConscript 2009-12-03 16:46:35 UTC (rev 11648)
@@ -78,8 +78,7 @@
if is_shared:
libxfc = env.SharedLibrary(target = 'libxorp_fea_fibconfig',
source = sources)
- env.Alias('install',
- env.InstallLibrary('$libdir', libxfc))
+ env.Alias('install', env.InstallLibrary(env['xorp_libdir'], libxfc))
else:
libxfc = env.StaticLibrary(target = 'libxorp_fea_fibconfig',
source = sources)
Modified: trunk/xorp/fea/data_plane/firewall/SConscript
===================================================================
--- trunk/xorp/fea/data_plane/firewall/SConscript 2009-12-03 15:05:32 UTC (rev 11647)
+++ trunk/xorp/fea/data_plane/firewall/SConscript 2009-12-03 16:46:35 UTC (rev 11648)
@@ -44,8 +44,7 @@
if is_shared:
libxfw = env.SharedLibrary(target = 'libxorp_fea_firewall',
source = sources)
- env.Alias('install',
- env.InstallLibrary('$libdir', libxfw))
+ env.Alias('install', env.InstallLibrary(env['xorp_libdir'], libxfw))
else:
libxfw = env.StaticLibrary(target = 'libxorp_fea_firewall',
source = sources)
Modified: trunk/xorp/fea/data_plane/ifconfig/SConscript
===================================================================
--- trunk/xorp/fea/data_plane/ifconfig/SConscript 2009-12-03 15:05:32 UTC (rev 11647)
+++ trunk/xorp/fea/data_plane/ifconfig/SConscript 2009-12-03 16:46:35 UTC (rev 11648)
@@ -70,12 +70,12 @@
if is_shared:
libxifc = env.SharedLibrary(target = 'libxorp_fea_ifconfig',
source = sources)
+ # XXX missing RPATH.
else:
libxifc = env.StaticLibrary(target = 'libxorp_fea_ifconfig',
source = sources)
if is_shared:
- env.Alias('install',
- env.InstallLibrary('$libdir', libxifc))
+ env.Alias('install', env.InstallLibrary(env['xorp_libdir'], libxifc))
Default(libxifc)
Modified: trunk/xorp/fea/data_plane/io/SConscript
===================================================================
--- trunk/xorp/fea/data_plane/io/SConscript 2009-12-03 15:05:32 UTC (rev 11647)
+++ trunk/xorp/fea/data_plane/io/SConscript 2009-12-03 16:46:35 UTC (rev 11648)
@@ -41,8 +41,7 @@
if is_shared:
libxio = env.SharedLibrary(target = 'libxorp_fea_io', source = sources)
- env.Alias('install',
- env.InstallLibrary('$libdir', libxio))
+ env.Alias('install', env.InstallLibrary(env['xorp_libdir'], libxio))
else:
libxio = env.StaticLibrary(target = 'libxorp_fea_io', source = sources)
Modified: trunk/xorp/fea/data_plane/managers/SConscript
===================================================================
--- trunk/xorp/fea/data_plane/managers/SConscript 2009-12-03 15:05:32 UTC (rev 11647)
+++ trunk/xorp/fea/data_plane/managers/SConscript 2009-12-03 16:46:35 UTC (rev 11648)
@@ -46,7 +46,6 @@
source = sources)
if is_shared:
- env.Alias('install',
- env.InstallLibrary('$libdir', libxdpm))
+ env.Alias('install', env.InstallLibrary(env['xorp_libdir'], libxdpm))
Default(libxdpm)
Modified: trunk/xorp/fea/tools/SConscript
===================================================================
--- trunk/xorp/fea/tools/SConscript 2009-12-03 15:05:32 UTC (rev 11647)
+++ trunk/xorp/fea/tools/SConscript 2009-12-03 16:46:35 UTC (rev 11648)
@@ -53,12 +53,8 @@
'show_interfaces.cc'
]
-showif = env.Program(target = 'show_interfaces', source = showifsrcs)
+showif = env.Program(target = 'fea_show_interfaces', source = showifsrcs)
-#showifpath = '$bindir'
-showifpath = '$exec_prefix/fea/tools'
+env.Alias('install', env.InstallProgram(env['xorp_tooldir'], showif))
-env.Alias('install',
- env.InstallProgram(showifpath, showif))
-
Default(showif)
Modified: trunk/xorp/fib2mrib/SConscript
===================================================================
--- trunk/xorp/fib2mrib/SConscript 2009-12-03 15:05:32 UTC (rev 11647)
+++ trunk/xorp/fib2mrib/SConscript 2009-12-03 16:46:35 UTC (rev 11648)
@@ -88,14 +88,9 @@
fib2mrib = env.Program(target = 'xorp_fib2mrib', source = fib2mribsrcs)
-#fib2mrib_path = '$bindir'
-fib2mrib_path = '$exec_prefix/fib2mrib'
+env.Alias('install', env.InstallProgram(env['xorp_moduledir'], fib2mrib))
-env.Alias('install',
- env.InstallProgram(fib2mrib_path, fib2mrib))
-
if is_shared:
- env.Alias('install',
- env.InstallLibrary('$libdir', libxorp_fib2mrib))
+ env.Alias('install', env.InstallLibrary(env['xorp_libdir'], libxorp_fib2mrib))
Default(fib2mrib)
Modified: trunk/xorp/libcomm/SConscript
===================================================================
--- trunk/xorp/libcomm/SConscript 2009-12-03 15:05:32 UTC (rev 11647)
+++ trunk/xorp/libcomm/SConscript 2009-12-03 16:46:35 UTC (rev 11648)
@@ -47,7 +47,6 @@
libxorp_comm = env.StaticLibrary(target = 'libxorp_comm', source = sources)
if is_shared:
- env.Alias("install",
- env.InstallLibrary('$libdir', libxorp_comm))
+ env.Alias('install', env.InstallLibrary(env['xorp_libdir'], libxorp_comm))
Default(libxorp_comm)
Modified: trunk/xorp/libfeaclient/SConscript
===================================================================
--- trunk/xorp/libfeaclient/SConscript 2009-12-03 15:05:32 UTC (rev 11647)
+++ trunk/xorp/libfeaclient/SConscript 2009-12-03 16:46:35 UTC (rev 11648)
@@ -54,6 +54,6 @@
if is_shared:
env.Alias('install',
- env.InstallLibrary('$libdir', libxorp_fea_client))
+ env.InstallLibrary(env['xorp_libdir'], libxorp_fea_client))
Default(libxorp_fea_client)
Modified: trunk/xorp/libproto/SConscript
===================================================================
--- trunk/xorp/libproto/SConscript 2009-12-03 15:05:32 UTC (rev 11647)
+++ trunk/xorp/libproto/SConscript 2009-12-03 16:46:35 UTC (rev 11648)
@@ -53,6 +53,6 @@
if is_shared:
env.Alias("install",
- env.InstallLibrary('$libdir', libxorp_proto))
+ env.InstallLibrary(env['xorp_libdir'], libxorp_proto))
Default(libxorp_proto)
Modified: trunk/xorp/libxipc/SConscript
===================================================================
--- trunk/xorp/libxipc/SConscript 2009-12-03 15:05:32 UTC (rev 11647)
+++ trunk/xorp/libxipc/SConscript 2009-12-03 16:46:35 UTC (rev 11648)
@@ -112,7 +112,7 @@
env.AddPostAction(libxipc,
env.Symlink(obj.abspath, env['BUILDDIR'] + '/lib/' + str(obj)))
env.Alias('install',
- env.InstallLibrary('$libdir', libxipc))
+ env.InstallLibrary(env['xorp_libdir'], libxipc))
else:
libxipc = libxipc_env.StaticLibrary(target = 'libxorp_ipc',
source = libxipc_sources)
@@ -175,7 +175,7 @@
env.AddPostAction(libfinder,
env.Symlink(obj.abspath, env['BUILDDIR'] + '/lib/' + str(obj)))
env.Alias('install',
- env.InstallLibrary('$libdir', libfinder))
+ env.InstallLibrary(env['xorp_libdir'], libfinder))
else:
libfinder = libfinder_env.StaticLibrary(target = 'libxorp_finder',
source = libfinder_sources)
@@ -209,14 +209,7 @@
call_xrl = env.Program(target = 'call_xrl',
source = [ 'call_xrl.cc'])
-# new directory structure
-#env.Alias('install',
-# env.InstallProgram('$bindir', xorp_finder))
-# old directory structure
-env.Alias('install',
- env.InstallProgram('$exec_prefix/libxipc', xorp_finder))
+# XXX The finder and call_xrl binaries are now no longer installed
+# by default, as they are not used in deployment.
-env.Alias('install',
- env.InstallProgram('$bindir', call_xrl))
-
-Default(libxipc, libfinder, xorp_finder, call_xrl)
+Default(libxipc, libfinder)
Modified: trunk/xorp/libxorp/SConscript
===================================================================
--- trunk/xorp/libxorp/SConscript 2009-12-03 15:05:32 UTC (rev 11647)
+++ trunk/xorp/libxorp/SConscript 2009-12-03 16:46:35 UTC (rev 11648)
@@ -98,6 +98,6 @@
if is_shared:
env.Alias('install',
- env.InstallLibrary('$libdir', libxorp_core))
+ env.InstallLibrary(env['xorp_libdir'], libxorp_core))
Default(libxorp_core)
Modified: trunk/xorp/mld6igmp/SConscript
===================================================================
--- trunk/xorp/mld6igmp/SConscript 2009-12-03 15:05:32 UTC (rev 11647)
+++ trunk/xorp/mld6igmp/SConscript 2009-12-03 16:46:35 UTC (rev 11648)
@@ -76,34 +76,21 @@
libxorp_mld6igmp = env.SharedLibrary(target = 'libxorp_mld6igmp',
source = libxorp_mld6igmp_srcs,
LIBS = '')
+ # XXX missing RPATH
else:
libxorp_mld6igmp = env.StaticLibrary(target = 'libxorp_mld6igmp',
source = libxorp_mld6igmp_srcs,
LIBS = '')
-igmpsrcs = [
- 'xorp_igmp.cc',
- ]
-
+igmpsrcs = [ 'xorp_igmp.cc', ]
igmp = env.Program(target = 'xorp_igmp', source = igmpsrcs)
-mldsrcs = [
- 'xorp_mld.cc',
- ]
-
+mldsrcs = [ 'xorp_mld.cc', ]
mld = env.Program(target = 'xorp_mld', source = mldsrcs)
-#mldpath = '$bindir'
-mldpath = '$exec_prefix' + '/' + 'mld6igmp'
-
-env.Alias('install',
- env.InstallProgram(mldpath, igmp))
-
-env.Alias('install',
- env.InstallProgram(mldpath, mld))
-
+env.Alias('install', env.InstallProgram(env['xorp_moduledir'], igmp))
+env.Alias('install', env.InstallProgram(env['xorp_moduledir'], mld))
if is_shared:
- env.Alias('install',
- env.InstallLibrary('$libdir', libxorp_mld6igmp))
+ env.Alias('install', env.InstallLibrary(env['xorp_libdir'], libxorp_mld6igmp))
Default(igmp, mld)
Modified: trunk/xorp/mrt/SConscript
===================================================================
--- trunk/xorp/mrt/SConscript 2009-12-03 15:05:32 UTC (rev 11647)
+++ trunk/xorp/mrt/SConscript 2009-12-03 16:46:35 UTC (rev 11648)
@@ -44,7 +44,6 @@
libxorp_mrt = env.StaticLibrary(target = 'libxorp_mrt', source = sources)
if is_shared:
- env.Alias('install',
- env.InstallLibrary('$libdir', libxorp_mrt))
+ env.Alias('install', env.InstallLibrary(env['xorp_libdir'], libxorp_mrt))
Default(libxorp_mrt)
Modified: trunk/xorp/ospf/SConscript
===================================================================
--- trunk/xorp/ospf/SConscript 2009-12-03 15:05:32 UTC (rev 11647)
+++ trunk/xorp/ospf/SConscript 2009-12-03 16:46:35 UTC (rev 11648)
@@ -100,29 +100,15 @@
source = libxorp_ospf_srcs,
LIBS = '')
-ospfv2srcs = [
- 'xorp_ospfv2.cc',
- ]
-
+ospfv2srcs = [ 'xorp_ospfv2.cc', ]
ospfv2 = env.Program(target = 'xorp_ospfv2', source = ospfv2srcs)
-ospfv3srcs = [
- 'xorp_ospfv3.cc',
- ]
-
+ospfv3srcs = [ 'xorp_ospfv3.cc', ]
ospfv3 = env.Program(target = 'xorp_ospfv3', source = ospfv3srcs)
-#ospfpath = '$bindir'
-ospfpath = '$exec_prefix/ospf'
-
-env.Alias('install',
- env.InstallProgram(ospfpath, ospfv2))
-
-env.Alias('install',
- env.InstallProgram(ospfpath, ospfv3))
-
+env.Alias('install', env.InstallProgram(env['xorp_moduledir'], ospfv2))
+env.Alias('install', env.InstallProgram(env['xorp_moduledir'], ospfv3))
if is_shared:
- env.Alias('install',
- env.InstallLibrary('$libdir', libxorp_ospf))
+ env.Alias('install', env.InstallLibrary(env['xorp_libdir'], libxorp_ospf))
Default(ospfv2, ospfv3)
Modified: trunk/xorp/ospf/tools/SConscript
===================================================================
--- trunk/xorp/ospf/tools/SConscript 2009-12-03 15:05:32 UTC (rev 11647)
+++ trunk/xorp/ospf/tools/SConscript 2009-12-03 16:46:35 UTC (rev 11648)
@@ -69,22 +69,15 @@
'print_neighbours.cc'
]
-cleardb = env.Program(target = 'clear_database', source = cleardbsrcs)
+cleardb = env.Program(target = 'ospf_clear_database',
+ source = cleardbsrcs)
+printlsas = env.Program(target = 'ospf_print_lsas',
+ source = printlsassrcs)
+printneighbors = env.Program(target = 'ospf_print_neighbours',
+ source = printneighborssrcs)
-printlsas = env.Program(target = 'print_lsas', source = printlsassrcs)
+env.Alias('install', env.InstallProgram(env['xorp_tooldir'], cleardb))
+env.Alias('install', env.InstallProgram(env['xorp_tooldir'], printlsas))
+env.Alias('install', env.InstallProgram(env['xorp_tooldir'], printneighbors))
-printneighbors = env.Program(target = 'print_neighbours', source = printneighborssrcs)
-
-#ospftoolpath = '$bindir'
-ospftoolpath = '$exec_prefix/ospf/tools'
-
-env.Alias('install',
- env.InstallProgram(ospftoolpath, cleardb))
-
-env.Alias('install',
- env.InstallProgram(ospftoolpath, printlsas))
-
-env.Alias('install',
- env.InstallProgram(ospftoolpath, printneighbors))
-
Default(cleardb, printlsas, printneighbors)
Modified: trunk/xorp/pim/SConscript
===================================================================
--- trunk/xorp/pim/SConscript 2009-12-03 15:05:32 UTC (rev 11647)
+++ trunk/xorp/pim/SConscript 2009-12-03 16:46:35 UTC (rev 11648)
@@ -107,7 +107,7 @@
env.AddPostAction(libxorp_pim,
env.Symlink(obj.abspath, env['BUILDDIR'] + '/lib/' + str(obj)))
env.Alias('install',
- env.InstallLibrary('$libdir', libxorp_pim))
+ env.InstallLibrary(env['xorp_libdir'], libxorp_pim))
else:
libxorp_pim = env.StaticLibrary(target = 'libxorp_pim',
source = libxorp_pim_srcs, LIBS = '')
@@ -124,13 +124,8 @@
pim6 = env.Program(target = 'xorp_pimsm6', source = pim6srcs)
-pimpath = '$bindir'
-pimpath = '$exec_prefix/pim'
+env.Alias('install', env.InstallProgram(env['xorp_moduledir'], pim4))
-env.Alias('install',
- env.InstallProgram(pimpath, pim4))
+env.Alias('install', env.InstallProgram(env['xorp_moduledir'], pim6))
-env.Alias('install',
- env.InstallProgram(pimpath, pim6))
-
Default(pim4, pim6)
Modified: trunk/xorp/policy/SConscript
===================================================================
--- trunk/xorp/policy/SConscript 2009-12-03 15:05:32 UTC (rev 11647)
+++ trunk/xorp/policy/SConscript 2009-12-03 16:46:35 UTC (rev 11648)
@@ -101,7 +101,7 @@
for obj in libxorp_policy:
env.AddPostAction(libxorp_policy,
env.Symlink(obj.abspath, env['BUILDDIR'] + '/lib/' + str(obj)))
- env.Alias('install', env.InstallLibrary('$libdir', libxorp_policy))
+ env.Alias('install', env.InstallLibrary(env['xorp_libdir'], libxorp_policy))
else:
libxorp_policy = env.StaticLibrary(target = 'libxorp_policy',
source = libxorp_policy_srcs,
@@ -111,9 +111,6 @@
policysrcs = [ 'xorp_policy.cc', ]
policy = env.Program(target = 'xorp_policy', source = policysrcs)
-#pcpath = '$bindir'
-pcpath = '$exec_prefix/policy'
-env.Alias('install',
- env.InstallProgram(pcpath, policy))
+env.Alias('install', env.InstallProgram(env['xorp_moduledir'], policy))
Default(libxorp_policy, policy)
Modified: trunk/xorp/policy/backend/SConscript
===================================================================
--- trunk/xorp/policy/backend/SConscript 2009-12-03 15:05:32 UTC (rev 11647)
+++ trunk/xorp/policy/backend/SConscript 2009-12-03 16:46:35 UTC (rev 11648)
@@ -49,7 +49,7 @@
env.AddPostAction(libpbe,
env.Symlink(obj.abspath, env['BUILDDIR'] + '/lib/' + str(obj)))
env.Alias('install',
- env.InstallLibrary('$libdir', libpbe))
+ env.InstallLibrary(env['xorp_libdir'], libpbe))
else:
libpbe = env.StaticLibrary(target = 'libxorp_policy_backend',
source = libpbesrcs)
Modified: trunk/xorp/policy/common/SConscript
===================================================================
--- trunk/xorp/policy/common/SConscript 2009-12-03 15:05:32 UTC (rev 11647)
+++ trunk/xorp/policy/common/SConscript 2009-12-03 16:46:35 UTC (rev 11648)
@@ -49,7 +49,7 @@
for obj in libpcm:
env.AddPostAction(libpcm,
env.Symlink(obj.abspath, env['BUILDDIR'] + '/lib/' + str(obj)))
- env.Alias('install', env.InstallLibrary('$libdir', libpcm))
+ env.Alias('install', env.InstallLibrary(env['xorp_libdir'], libpcm))
else:
obj_aspath = env.StaticObject(target = 'aspath',
source = '../../bgp/aspath.cc')
Modified: trunk/xorp/rib/SConscript
===================================================================
--- trunk/xorp/rib/SConscript 2009-12-03 15:05:32 UTC (rev 11647)
+++ trunk/xorp/rib/SConscript 2009-12-03 16:46:35 UTC (rev 11648)
@@ -117,14 +117,9 @@
rib = env.Program(target = 'xorp_rib', source = ribsrcs)
-#ribpath = '$bindir'
-ribpath = '$exec_prefix/rib'
+env.Alias('install', env.InstallProgram(env['xorp_moduledir'], rib))
-env.Alias('install',
- env.InstallProgram(ribpath, rib))
-
if is_shared:
- env.Alias('install',
- env.InstallLibrary('$libdir', libxorp_rib))
+ env.Alias('install', env.InstallLibrary(env['xorp_libdir'], libxorp_rib))
Default(rib)
Modified: trunk/xorp/rib/tools/SConscript
===================================================================
--- trunk/xorp/rib/tools/SConscript 2009-12-03 15:05:32 UTC (rev 11647)
+++ trunk/xorp/rib/tools/SConscript 2009-12-03 16:46:35 UTC (rev 11648)
@@ -56,17 +56,10 @@
'show_routes.cc'
]
-shdist = env.Program(target = 'show_distances', source = shdistsrcs)
+shdist = env.Program(target = 'rib_show_distances', source = shdistsrcs)
+shrtes = env.Program(target = 'rib_show_routes', source = shrtessrcs)
-shrtes = env.Program(target = 'show_routes', source = shrtessrcs)
+env.Alias('install', env.InstallProgram(env['xorp_tooldir'], shdist))
+env.Alias('install', env.InstallProgram(env['xorp_tooldir'], shrtes))
-#ribtoolpath = '$bindir'
-ribtoolpath = '$exec_prefix/rib/tools'
-
-env.Alias('install',
- env.InstallProgram(ribtoolpath, shdist))
-
-env.Alias('install',
- env.InstallProgram(ribtoolpath, shrtes))
-
Default(shdist, shrtes)
Modified: trunk/xorp/rip/SConscript
===================================================================
--- trunk/xorp/rip/SConscript 2009-12-03 15:05:32 UTC (rev 11647)
+++ trunk/xorp/rip/SConscript 2009-12-03 16:46:35 UTC (rev 11648)
@@ -30,10 +30,6 @@
e = env.Clone()
is_shared = env.has_key('SHAREDLIBS')
-# XXX
-#rippath = '$bindir'
-rippath = '$exec_prefix/rip'
-
#
# NB: The same sources are used for RIP and RIPng. We use separate
# scons environments with different CPPDEFINES and SHOBJPREFIXES to
@@ -143,8 +139,8 @@
env.AddPostAction(libxorp_rip_xrl,
env.Symlink(obj.abspath, env['BUILDDIR'] + '/lib/' + str(obj)))
e.Alias('install',
- [ e.InstallLibrary('$libdir', libxorp_rip),
- e.InstallLibrary('$libdir', libxorp_rip_xrl) ])
+ [ e.InstallLibrary(env['xorp_libdir'], libxorp_rip),
+ e.InstallLibrary(env['xorp_libdir'], libxorp_rip_xrl) ])
else:
libxorp_rip = e.StaticLibrary(target = 'libxorp_rip',
source = libxorp_rip_srcs,
@@ -154,7 +150,7 @@
LIBS = '')
rip = e.Program(target = 'xorp_rip', source = ripsrcs)
-e.Alias('install', e.InstallProgram(rippath, rip))
+e.Alias('install', e.InstallProgram(env['xorp_moduledir'], rip))
#
# RIPng
@@ -221,8 +217,8 @@
env.AddPostAction(libxorp_ripngxrl,
env.Symlink(obj.abspath, env['BUILDDIR'] + '/lib/' + str(obj)))
e.Alias('install',
- [ e.InstallLibrary('$libdir', libxorp_ripng),
- e.InstallLibrary('$libdir', libxorp_ripngxrl) ])
+ [ e.InstallLibrary(env['xorp_libdir'], libxorp_ripng),
+ e.InstallLibrary(env['xorp_libdir'], libxorp_ripngxrl) ])
else:
libxorp_ripng = e.StaticLibrary(target = 'libxorp_ripng',
source = libxorp_rip_srcs,
@@ -232,6 +228,6 @@
LIBS = '')
ripng = e.Program(target = 'xorp_ripng', source = ripngsrcs)
-e.Alias('install', e.InstallProgram(rippath, ripng))
+e.Alias('install', e.InstallProgram(env['xorp_moduledir'], ripng))
Default(rip, ripng)
Modified: trunk/xorp/rip/tools/SConscript
===================================================================
--- trunk/xorp/rip/tools/SConscript 2009-12-03 15:05:32 UTC (rev 11647)
+++ trunk/xorp/rip/tools/SConscript 2009-12-03 16:46:35 UTC (rev 11648)
@@ -56,17 +56,10 @@
'common.cc'
]
-shpeer = env.Program(target = 'show_peer_stats', source = shpeersrcs)
+shpeer = env.Program(target = 'rip_show_peer_stats', source = shpeersrcs)
+shstats = env.Program(target = 'rip_show_stats', source = shstatssrcs)
-shstats = env.Program(target = 'show_stats', source = shstatssrcs)
+env.Alias('install', env.InstallProgram(env['xorp_tooldir'], shpeer))
+env.Alias('install', env.InstallProgram(env['xorp_tooldir'], shstats))
-#riptoolpath = '$bindir'
-riptoolpath = '$exec_prefix/rip/tools'
-
-env.Alias('install',
- env.InstallProgram(riptoolpath, shpeer))
-
-env.Alias('install',
- env.InstallProgram(riptoolpath, shstats))
-
Default(shpeer, shstats)
Modified: trunk/xorp/rtrmgr/SConscript
===================================================================
--- trunk/xorp/rtrmgr/SConscript 2009-12-03 15:05:32 UTC (rev 11647)
+++ trunk/xorp/rtrmgr/SConscript 2009-12-03 16:46:35 UTC (rev 11648)
@@ -152,7 +152,7 @@
rtrmgr = rtrmgr_env.Program(target = 'xorp_rtrmgr', source = rtrmgr_srcs)
env.Alias('install',
- env.InstallProgram('$bindir', rtrmgr))
+ env.InstallProgram(env['xorp_sbindir'], rtrmgr))
### xorpsh
@@ -183,7 +183,7 @@
xorpsh = xorpsh_env.Program(target = 'xorpsh', source = xorpsh_srcs)
env.Alias('install',
- env.InstallProgram('$bindir', xorpsh))
+ env.InstallProgram(env['xorp_sbindir'], xorpsh))
### profiler
@@ -206,7 +206,7 @@
source = profiler_srcs)
env.Alias('install',
- env.InstallProgram('$bindir', profiler))
+ env.InstallProgram(env['xorp_sbindir'], profiler))
###
Modified: trunk/xorp/static_routes/SConscript
===================================================================
--- trunk/xorp/static_routes/SConscript 2009-12-03 15:05:32 UTC (rev 11647)
+++ trunk/xorp/static_routes/SConscript 2009-12-03 16:46:35 UTC (rev 11648)
@@ -87,15 +87,10 @@
xorp_static_routes = env.Program(target = 'xorp_static_routes',
source = xorp_static_routes_srcs)
+env.Alias('install', env.InstallProgram(env['xorp_moduledir'], xorp_static_routes))
-#srpath = '$bindir'
-srpath = '$exec_prefix/static_routes'
-
-env.Alias('install',
- env.InstallProgram(srpath, xorp_static_routes))
-
if is_shared:
env.Alias('install',
- env.InstallLibrary('$libdir', libxorp_static_routes))
+ env.InstallLibrary(env['xorp_libdir'], libxorp_static_routes))
Default(xorp_static_routes)
Modified: trunk/xorp/vrrp/SConscript
===================================================================
--- trunk/xorp/vrrp/SConscript 2009-12-03 15:05:32 UTC (rev 11647)
+++ trunk/xorp/vrrp/SConscript 2009-12-03 16:46:35 UTC (rev 11648)
@@ -86,14 +86,8 @@
xorp_vrrp = env.Program(target = 'xorp_vrrp',
source = vrrpsources)
-#vrrppath = '$bindir'
-vrrppath = '$exec_prefix' + '/' + 'vrrp'
-
-env.Alias('install',
- env.InstallProgram(vrrppath, xorp_vrrp))
-
+env.Alias('install', env.InstallProgram(env['xorp_moduledir'], xorp_vrrp))
if is_shared:
- env.Alias('install',
- env.InstallLibrary('$libdir', libxorp_vrrp))
+ env.Alias('install', env.InstallLibrary(env['xorp_libdir'], libxorp_vrrp))
Default(xorp_vrrp)
Modified: trunk/xorp/xrl/interfaces/SConscript
===================================================================
--- trunk/xorp/xrl/interfaces/SConscript 2009-12-03 15:05:32 UTC (rev 11647)
+++ trunk/xorp/xrl/interfaces/SConscript 2009-12-03 16:46:35 UTC (rev 11648)
@@ -118,6 +118,6 @@
if base[:4] != "test":
if is_shared:
- env.Alias('install', env.InstallLibrary('$libdir', lib))
+ env.Alias('install', env.InstallLibrary(env['xorp_libdir'], lib))
Default(all_xif_libs)
Modified: trunk/xorp/xrl/targets/SConscript
===================================================================
--- trunk/xorp/xrl/targets/SConscript 2009-12-03 15:05:32 UTC (rev 11647)
+++ trunk/xorp/xrl/targets/SConscript 2009-12-03 16:46:35 UTC (rev 11648)
@@ -104,9 +104,9 @@
if base[:4] != "test":
if is_shared:
- env.Alias('install', env.InstallLibrary('$libdir', lib))
+ env.Alias('install', env.InstallLibrary(env['xorp_libdir'], lib))
if env['debug_xrldb']:
- env.Alias('install', env.InstallData(xrlspath, xrls))
+ env.Alias('install', env.InstallData(env['xorp_xrlsdir'], xrls))
return lib
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Xorp-cvs
mailing list