[Xorp-cvs] SF.net SVN: xorp:[11683] trunk/xorp/SConstruct

[bms_fbsd at users.sourceforge.net]

Revision: 11683
          http://xorp.svn.sourceforge.net/xorp/?rev=11683&view=rev
Author:   bms_fbsd
Date:     2009-12-04 18:50:55 +0000 (Fri, 04 Dec 2009)

Log Message:
-----------
Hook up relpath to the SConstruct, so we can monkey-patch os.path.relpath()
for Python versions older than 2.6.
Drop Python requirement back to 2.3.

Tested by:	Ben Greear

Modified Paths:
--------------
    trunk/xorp/SConstruct

Modified: trunk/xorp/SConstruct
===================================================================
--- trunk/xorp/SConstruct	2009-12-04 18:07:53 UTC (rev 11682)
+++ trunk/xorp/SConstruct	2009-12-04 18:50:55 UTC (rev 11683)
@@ -21,6 +21,8 @@
 # TODO Fix default include/lib paths, pass in from environment.
 # TODO Merge scons-unfamiliar syntactic sugar from YHC's sconsfiles.
 
+import relpath
+
 gnutoolwarning = """
 WARNING: The GNU %s was not detected on your system.
 Some combinations of linker or compiler flags, specific to building XORP,
@@ -29,7 +31,7 @@
 
 # The XRL tgt-gen and clnt-gen scripts use Python 2.3+'s optparse
 # class. However, os.path.relpath() requires Python 2.6.
-EnsurePythonVersion(2, 6)
+EnsurePythonVersion(2, 3)
 
 # SCons 0.98.4 is the earliest release that we have tested.  Earlier
 # ones may work.  If so, please submit a Trac issue so the check can


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.