[cortex-vfx] r4608 committed - fix for stub installs, which weret installing symlinks correctly. add ...

[corte...@googlecode.com]

Revision: 4608
Author: andrewk.imageengine
Date: Mon Feb 27 10:19:58 2012
Log: fix for stub installs, which weret installing symlinks correctly.
add installStubs alias for future ease of debugging
http://code.google.com/p/cortex-vfx/source/detail?r=4608

Modified:
/trunk/SConstruct

=======================================
--- /trunk/SConstruct Thu Jan 26 16:06:52 2012
+++ /trunk/SConstruct Mon Feb 27 10:19:58 2012
@@ -1423,14 +1423,19 @@
corePythonModuleEnv.Alias( "installCore", corePythonModuleInstall )

# stubs
-for classes, installPath in ( (
env["INSTALL_IECORE_OPS"], "$INSTALL_IECORE_OP_PATH" ), (
env["INSTALL_IECORE_PROCEDURALS"], "$INSTALL_IECORE_PROCEDURAL_PATH" ) ) :
+for classes, installPath in ( (
env['INSTALL_IECORE_OPS'], "$INSTALL_IECORE_OP_PATH" ), (
env["INSTALL_IECORE_PROCEDURALS"], "$INSTALL_IECORE_PROCEDURAL_PATH" ) ) :
for cls in classes :
stubName = os.path.basename( cls[1] )
stubEnv = corePythonModuleEnv.Clone( IECORE_NAME=os.path.join( cls[1],
stubName ) )
stubInstall = stubEnv.Command( installPath, None, 'echo "from %s
import %s as %s" > $TARGET' % ( cls[0].rpartition( "." )[0],
cls[0].rpartition( "." )[-1], stubName ) )
- stubEnv.AddPostAction( stubInstall, lambda target, source, env :
makeSymLinks( env, installPath ) )
+ # this switch is to avoid an issue with the lamda post actions baking
args incorrectly.
+ if installPath == "$INSTALL_IECORE_OP_PATH" :
+ stubEnv.AddPostAction( stubInstall, lambda target, source, env :
makeSymLinks( env, env["INSTALL_IECORE_OP_PATH"] ) )
+ elif installPath == "$INSTALL_IECORE_PROCEDURAL_PATH" :
+ stubEnv.AddPostAction( stubInstall, lambda target, source, env :
makeSymLinks( env, env["INSTALL_IECORE_PROCEDURAL_PATH"] ) )
stubEnv.Alias( "install", stubInstall )
stubEnv.Alias( "installCore", stubInstall )
+ stubEnv.Alias( "installStubs", stubInstall )

Default( coreLibrary, corePythonLibrary, corePythonModule )