On 09/28/2009 02:22 AM, Bruce Simpson wrote:
Hi Ben,
Thanks for the patch. Can't take it just yet, though.
Looks like you've run into some of the issues with dropping 3rd party
code in in general. It might be an idea to conditionalize the relative
paths (../..) in the SConscripts, so OLSR can be moved elsewhere in the
tree later on.
This is sort of what we're getting at -- the XRL stub build needs to be
told that stubs must be generated for the 3rd party protocol, and right
now, that's centralized.
We should have a better story for this later on, but for now, I need to
stay focused on the task at hand. Thanks for looking into this.
Just in case it helps, here is a follow-on patch that fixes the install
target and templates for OLSR. With these applied, I compiled, installed
and (lightly) tested OLSR. Seems to be working fine.
Pushed to my xorp.ct git repository as well.
Thanks,
Ben
--
Ben Greear <[email protected]>
Candela Technologies Inc http://www.candelatech.com
diff --git a/contrib/olsr/tools/SConscript b/contrib/olsr/tools/SConscript
index 76a7068..4a4ac89 100644
--- a/contrib/olsr/tools/SConscript
+++ b/contrib/olsr/tools/SConscript
@@ -62,11 +62,11 @@ printdb = env.Program(target = 'print_databases', source =
printdbsrcs)
olsrtoolpath = '$exec_prefix/contrib/olsr/tools'
-env.Alias('install',
- env.InstallProgram(olsrtoolpath, cleardb))
+#env.Alias('install',
+# env.InstallProgram(olsrtoolpath, cleardb))
-env.Alias('install',
- env.InstallProgram(olsrtoolpath, printdb))
+#env.Alias('install',
+# env.InstallProgram(olsrtoolpath, printdb))
# This won't compile, can't find olsr4_xif.hh file, not sure what is supposed
to
# create it --Ben
diff --git a/etc/templates/SConscript b/etc/templates/SConscript
index 579a684..a01c6fe 100644
--- a/etc/templates/SConscript
+++ b/etc/templates/SConscript
@@ -34,7 +34,6 @@ cmds = [
'mfea6',
'misc',
'mld',
- #'olsr4', #notyet
'ospfv2',
'ospfv3',
'pim',
@@ -73,6 +72,11 @@ tps = [
'vrrp',
]
+if env['WITH_OLSR']:
+ cmds.append('olsr4')
+ tps.append('olsr4')
+
+
e.Alias('install',
[ e.InstallData(etctemplatepath, [c.__add__('.cmds') for c in cmds]),
e.InstallData(etctemplatepath, [t.__add__('.tp') for t in tps]) ])
_______________________________________________
Xorp-hackers mailing list
[email protected]
http://mailman.ICSI.Berkeley.EDU/mailman/listinfo/xorp-hackers
