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

[bms_fbsd at users.sourceforge.net]

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

Log Message:
-----------
Backout 11674, this seems to break my build: the XMkdir() wrapper
complains about xorp_alias_libdir having NoneType.
This makes no sense, because it's defined.

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

Modified: trunk/xorp/SConstruct
===================================================================
--- trunk/xorp/SConstruct	2009-12-04 12:37:11 UTC (rev 11674)
+++ trunk/xorp/SConstruct	2009-12-04 14:26:50 UTC (rev 11675)
@@ -208,14 +208,6 @@
 SConsEnvironment.Chmod = SCons.Action.ActionFactory(os.chmod,
     lambda dest, mode: 'Chmod("%s", 0%o)' % (dest, mode))
 
-# XXX Temporary workaround. Ben Greear reports a problem with
-# Mkdir() on Linux when the directory already exists.
-def XMkdir(path):
-    if not os.access(path, os.F_OK):
-        os.makedirs(path)
-SConsEnvironment.XMkdir = SCons.Action.ActionFactory(XMkdir,
-    lambda path: 'XMkdir("%s")' % (path))
-
 def Symlink(src, link_name):
     try:
         os.unlink(link_name)
@@ -613,7 +605,7 @@
 	# $BUILDIR/lib will contain .so symlinks
 	#
 	xorp_alias_libdir = os.path.join(builddir, 'lib')
-	Execute(XMkdir(xorp_alias_libdir))
+	Execute(Mkdir(xorp_alias_libdir))
 	env['xorp_alias_libdir'] = xorp_alias_libdir
 	#
 	# Build a further alias for the benefit of entities which
@@ -622,7 +614,7 @@
 	# $BUILDIR/lib/xorp/lib will point to $BUILDIR/lib
 	#
 	xorp_alias_subdir = os.path.join(xorp_alias_libdir, 'xorp')
-	Execute(XMkdir(xorp_alias_subdir))
+	Execute(Mkdir(xorp_alias_subdir))
 	#
 	xorp_module_alias_libdir = os.path.join(xorp_alias_subdir, 'lib')
 	Execute(env.Symlink(xorp_alias_libdir, xorp_module_alias_libdir))


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