Revision: 11653
http://xorp.svn.sourceforge.net/xorp/?rev=11653&view=rev
Author: bms_fbsd
Date: 2009-12-03 17:04:58 +0000 (Thu, 03 Dec 2009)
Log Message:
-----------
Minor variable renaming.
Modified Paths:
--------------
trunk/xorp/SConstruct
trunk/xorp/rtrmgr/SConscript
trunk/xorp/site_scons/site_tools/clntgen.py
trunk/xorp/site_scons/site_tools/tgtgen.py
Modified: trunk/xorp/SConstruct
===================================================================
--- trunk/xorp/SConstruct 2009-12-03 17:01:03 UTC (rev 11652)
+++ trunk/xorp/SConstruct 2009-12-03 17:04:58 UTC (rev 11653)
@@ -291,13 +291,8 @@
env['xorp_templatedir'] = env['datadir'] + '/templates'
env['xorp_tooldir'] = env['libdir'] + '/xorp/bin' # tools/*
env['xorp_xrlsdir'] = env['datadir'] + '/xorp/xrls' # *.xrls
+env['xorp_sourcedir'] = sourcedir # rtrmgr/util.cc and xif need this
-# XXX needed by scons xrl idl wrappers
-# ...and rtrmgr/util.cc
-# XXX Push this down...
-env['XORP_SOURCEDIR'] = sourcedir
-env['XORP_BUILDDIR'] = builddir
-
# turnoff bgp, olsr for now.
# XXX bgp is always built, olsr never built.
env['WITH_BGP'] = ARGUMENTS.get('enable-bgp', False)
Modified: trunk/xorp/rtrmgr/SConscript
===================================================================
--- trunk/xorp/rtrmgr/SConscript 2009-12-03 17:01:03 UTC (rev 11652)
+++ trunk/xorp/rtrmgr/SConscript 2009-12-03 17:04:58 UTC (rev 11653)
@@ -110,8 +110,8 @@
# Pushdown for static paths in util.cc.
xorp_paths = {
"XORP_INSTALL_ROOT" : '\\"' + str(env['prefix']) + '\\"',
- "XORP_BUILD_ROOT" : '\\"' + str(env['XORP_BUILDDIR']) + '\\"',
- "XORP_SRC_ROOT" : '\\"' + str(env['XORP_SOURCEDIR']) + '\\"',
+ "XORP_BUILD_ROOT" : '\\"' + str(env['BUILDDIR']) + '\\"',
+ "XORP_SRC_ROOT" : '\\"' + str(env['xorp_sourcedir']) + '\\"',
}
util_cc_env = env.Clone()
Modified: trunk/xorp/site_scons/site_tools/clntgen.py
===================================================================
--- trunk/xorp/site_scons/site_tools/clntgen.py 2009-12-03 17:01:03 UTC (rev
11652)
+++ trunk/xorp/site_scons/site_tools/clntgen.py 2009-12-03 17:04:58 UTC (rev
11653)
@@ -20,7 +20,7 @@
"""Add Builder for XRL interfaces to the Environment ..."""
env['BUILDERS']['CLNTGEN'] = clntgen_builder
- env['CLNTGEN'] = "$XORP_SOURCEDIR/xrl/scripts/clnt-gen"
+ env['CLNTGEN'] = "$xorp_sourcedir/xrl/scripts/clnt-gen"
def exists(env):
return True
Modified: trunk/xorp/site_scons/site_tools/tgtgen.py
===================================================================
--- trunk/xorp/site_scons/site_tools/tgtgen.py 2009-12-03 17:01:03 UTC (rev
11652)
+++ trunk/xorp/site_scons/site_tools/tgtgen.py 2009-12-03 17:04:58 UTC (rev
11653)
@@ -29,7 +29,7 @@
env['BUILDERS']['TGTGEN'] = tgtgen_builder
- env['TGTGEN'] = "$XORP_SOURCEDIR/xrl/scripts/tgt-gen"
+ env['TGTGEN'] = "$xorp_sourcedir/xrl/scripts/tgt-gen"
env['TGTGEN_CPPPATH'] = []
env['_TGTGEN_INCFLAGS'] = '$( ${_concat(INCPREFIX, TGTGEN_CPPPATH,
INCSUFFIX, __env__, RDirs, TARGET, SOURCE)} $)'
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
Xorp-cvs mailing list
[email protected]
http://mailman.ICSI.Berkeley.EDU/mailman/listinfo/xorp-cvs
