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

johntconklin at users.sourceforge.net johntconklin at users.sourceforge.net
Wed Sep 30 07:17:01 PDT 2009


Revision: 11559
          http://xorp.svn.sourceforge.net/xorp/?rev=11559&view=rev
Author:   johntconklin
Date:     2009-09-30 14:17:01 +0000 (Wed, 30 Sep 2009)

Log Message:
-----------
Check boolean value of env['strip'] in InstallProgram and 
InstallLibrary functions instead of just checking whether 
the 'strip' key is present in the environment. 
 
Remove the second check whether the 'STRIP' key is present, 
as is now set unconditionally. 

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

Modified: trunk/xorp/SConstruct
===================================================================
--- trunk/xorp/SConstruct	2009-09-29 13:49:42 UTC (rev 11558)
+++ trunk/xorp/SConstruct	2009-09-30 14:17:01 UTC (rev 11559)
@@ -153,7 +153,7 @@
     obj = env.Install(dest, files)
     for i in obj:
 	env.AddPostAction(i, env.Chmod(str(i), perm))
-	if env.has_key('strip') and env.has_key('STRIP'):
+	if env['strip']:
 	    env.AddPostAction(i, Action("$STRIP $TARGET"))
     return obj 
 SConsEnvironment.InstallProgram = InstallProgram
@@ -175,7 +175,7 @@
     obj = env.Install(dest, files)
     for i in obj:
 	env.AddPostAction(i, env.Chmod(str(i), perm))
-	if env.has_key('strip') and env.has_key('STRIP'):
+	if env['strip']:
 	    env.AddPostAction(i, Action("$STRIP --strip-unneeded $TARGET"))
     return obj
 SConsEnvironment.InstallLibrary = InstallLibrary


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