Skip to content

Commit f3f793a

Browse files
ivanimanishiivanimanishi
authored
Merge pull request #1185 from boberfly/corePythonModule_depends_fix
Build : Add more SCons 'Depends' onto the python modules
2 parents da8e1b5 + b983f3e commit f3f793a

File tree

1 file changed

+24
-15
lines changed

1 file changed

+24
-15
lines changed

‎SConstruct‎

Lines changed: 24 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1764,8 +1764,8 @@ coreEnv.Alias( "installCore", pythonHeaderInstall )
17641764
corePythonModuleEnv.Append( LIBS = os.path.basename( coreEnv.subst( "$INSTALL_LIB_NAME" ) ) )
17651765
corePythonModuleEnv.Append( LIBS = os.path.basename( corePythonEnv.subst( "$INSTALL_PYTHONLIB_NAME" ) ) )
17661766
corePythonModule = corePythonModuleEnv.SharedLibrary( "python/IECore/_IECore", corePythonModuleSources )
1767-
corePythonModuleEnv.Depends( corePythonModule, coreLibrary )
1768-
corePythonModuleEnv.Depends( corePythonModule, corePythonLibrary )
1767+
corePythonModuleEnv.Depends( corePythonModule, coreLibraryInstall )
1768+
corePythonModuleEnv.Depends( corePythonModule, corePythonLibraryInstall )
17691769

17701770
corePythonModuleInstall = corePythonModuleEnv.Install( "$INSTALL_PYTHON_DIR/IECore", corePythonScripts + corePythonModule )
17711771
corePythonModuleEnv.AddPostAction( "$INSTALL_PYTHON_DIR/IECore", lambda target, source, env : makeSymLinks( corePythonEnv, corePythonEnv["INSTALL_PYTHON_DIR"] ) )
@@ -1912,7 +1912,8 @@ if doConfigure :
19121912
]
19131913
)
19141914
imagePythonModule = imagePythonModuleEnv.SharedLibrary( "python/IECoreImage/_IECoreImage", imagePythonSources + imagePythonModuleSources )
1915-
imagePythonModuleEnv.Depends( imagePythonModule, imageLibrary )
1915+
imagePythonModuleEnv.Depends( imagePythonModule, imageLibraryInstall )
1916+
imagePythonModuleEnv.Depends( imagePythonModule, corePythonLibraryInstall )
19161917

19171918
# python module install
19181919
imagePythonModuleInstall = imagePythonModuleEnv.Install( "$INSTALL_PYTHON_DIR/IECoreImage", imagePythonScripts + imagePythonModule )
@@ -1986,9 +1987,9 @@ if doConfigure :
19861987
# python module
19871988
scenePythonModuleEnv.Append( LIBS = os.path.basename( sceneEnv.subst( "$INSTALL_LIB_NAME" ) ) )
19881989
scenePythonModule = scenePythonModuleEnv.SharedLibrary( "python/IECoreScene/_IECoreScene", scenePythonModuleSources )
1989-
scenePythonModuleEnv.Depends( scenePythonModule, coreLibrary )
1990-
scenePythonModuleEnv.Depends( scenePythonModule, corePythonLibrary )
1991-
scenePythonModuleEnv.Depends( scenePythonModule, sceneLibrary )
1990+
scenePythonModuleEnv.Depends( scenePythonModule, coreLibraryInstall )
1991+
scenePythonModuleEnv.Depends( scenePythonModule, corePythonLibraryInstall )
1992+
scenePythonModuleEnv.Depends( scenePythonModule, sceneLibraryInstall )
19921993

19931994
scenePythonModuleInstall = scenePythonModuleEnv.Install( "$INSTALL_PYTHON_DIR/IECoreScene", scenePythonScripts + scenePythonModule )
19941995
scenePythonModuleEnv.AddPostAction( "$INSTALL_PYTHON_DIR/IECoreScene", lambda target, source, env : makeSymLinks( scenePythonModuleEnv, scenePythonModuleEnv["INSTALL_PYTHON_DIR"] ) )
@@ -2086,7 +2087,8 @@ if doConfigure :
20862087
]
20872088
)
20882089
vdbPythonModule = vdbPythonModuleEnv.SharedLibrary( "python/IECoreVDB/_IECoreVDB", vdbPythonModuleSources )
2089-
vdbPythonModuleEnv.Depends( vdbPythonModule, vdbLibrary )
2090+
vdbPythonModuleEnv.Depends( vdbPythonModule, vdbLibraryInstall )
2091+
vdbPythonModuleEnv.Depends( vdbPythonModule, corePythonLibraryInstall )
20902092

20912093
vdbPythonModuleInstall = vdbPythonModuleEnv.Install( "$INSTALL_PYTHON_DIR/IECoreVDB", vdbPythonScripts + vdbPythonModule )
20922094
vdbPythonModuleEnv.AddPostAction( "$INSTALL_PYTHON_DIR/IECoreVDB", lambda target, source, env : makeSymLinks( vdbPythonModuleEnv, vdbPythonModuleEnv["INSTALL_PYTHON_DIR"] ) )
@@ -2273,7 +2275,8 @@ if env["WITH_GL"] and doConfigure :
22732275
]
22742276
)
22752277
glPythonModule = glPythonModuleEnv.SharedLibrary( "python/IECoreGL/_IECoreGL", glPythonSources )
2276-
glPythonModuleEnv.Depends( glPythonModule, glLibrary )
2278+
glPythonModuleEnv.Depends( glPythonModule, glLibraryInstall )
2279+
glPythonModuleEnv.Depends( glPythonModule, corePythonLibraryInstall )
22772280

22782281
glPythonScripts = glob.glob( "python/IECoreGL/*.py" )
22792282
glPythonModuleInstall = glPythonModuleEnv.Install( "$INSTALL_PYTHON_DIR/IECoreGL", glPythonScripts + glPythonModule )
@@ -2469,7 +2472,8 @@ if doConfigure :
24692472
]
24702473
)
24712474
mayaPythonModule = mayaPythonModuleEnv.SharedLibrary( "python/IECoreMaya/_IECoreMaya", mayaPythonSources )
2472-
mayaPythonModuleEnv.Depends( mayaPythonModule, mayaLibrary )
2475+
mayaPythonModuleEnv.Depends( mayaPythonModule, mayaLibraryInstall )
2476+
mayaPythonModuleEnv.Depends( mayaPythonModule, corePythonLibraryInstall )
24732477

24742478
mayaPythonModuleInstall = mayaPythonModuleEnv.Install( "$INSTALL_PYTHON_DIR/IECoreMaya", mayaPythonScripts + mayaPythonModule )
24752479
mayaPythonModuleEnv.AddPostAction( "$INSTALL_PYTHON_DIR/IECoreMaya", lambda target, source, env : makeSymLinks( mayaPythonModuleEnv, mayaPythonModuleEnv["INSTALL_PYTHON_DIR"] ) )
@@ -2684,7 +2688,8 @@ if doConfigure :
26842688
nukePythonModuleEnv.AddPostAction( "$INSTALL_NUKEPYTHON_DIR/IECoreNuke", lambda target, source, env : makeSymLinks( nukePythonModuleEnv, nukePythonModuleEnv["INSTALL_NUKEPYTHON_DIR"] ) )
26852689
nukePythonModuleEnv.Alias( "install", nukePythonModuleInstall )
26862690
nukePythonModuleEnv.Alias( "installNuke", nukePythonModuleInstall )
2687-
nukePythonModuleEnv.Depends( nukePythonModule, corePythonModule )
2691+
nukePythonModuleEnv.Depends( nukePythonModule, corePythonModuleInstall )
2692+
nukePythonModuleEnv.Depends( nukePythonModule, corePythonLibraryInstall )
26882693

26892694
if coreEnv["INSTALL_CORENUKE_POST_COMMAND"]!="" :
26902695
# this is the only way we could find to get a post action to run for an alias
@@ -2913,7 +2918,8 @@ if doConfigure :
29132918
]
29142919
)
29152920
houdiniPythonModule = houdiniPythonModuleEnv.SharedLibrary( "python/IECoreHoudini/_IECoreHoudini", houdiniPythonSources )
2916-
houdiniPythonModuleEnv.Depends( houdiniPythonModule, houdiniLib )
2921+
houdiniPythonModuleEnv.Depends( houdiniPythonModule, houdiniLibInstall )
2922+
houdiniPythonModuleEnv.Depends( houdiniPythonModule, corePythonLibraryInstall )
29172923
houdiniPythonModuleInstall = houdiniPythonModuleEnv.Install( "$INSTALL_PYTHON_DIR/IECoreHoudini", houdiniPythonScripts + houdiniPythonModule )
29182924
houdiniPythonModuleEnv.AddPostAction( "$INSTALL_PYTHON_DIR/IECoreHoudini", lambda target, source, env : makeSymLinks( houdiniPythonModuleEnv, houdiniPythonModuleEnv["INSTALL_PYTHON_DIR"] ) )
29192925
houdiniPythonModuleEnv.Alias( "install", houdiniPythonModuleInstall )
@@ -3114,7 +3120,8 @@ if doConfigure :
31143120
]
31153121
)
31163122
usdPythonModule = usdPythonModuleEnv.SharedLibrary( "contrib/IECoreUSD/python/IECoreUSD/_IECoreUSD", usdPythonSources )
3117-
usdPythonModuleEnv.Depends( usdPythonModule, usdLibrary )
3123+
usdPythonModuleEnv.Depends( usdPythonModule, usdLibraryInstall )
3124+
usdPythonModuleEnv.Depends( usdPythonModule, corePythonLibraryInstall )
31183125

31193126
usdPythonModuleInstall = usdPythonModuleEnv.Install( "$INSTALL_PYTHON_DIR/IECoreUSD", usdPythonScripts + usdPythonModule )
31203127
usdPythonModuleEnv.AddPostAction( "$INSTALL_PYTHON_DIR/IECoreUSD", lambda target, source, env : makeSymLinks( usdPythonModuleEnv, usdPythonModuleEnv["INSTALL_PYTHON_DIR"] ) )
@@ -3247,8 +3254,9 @@ if doConfigure :
32473254
]
32483255
)
32493256
alembicPythonModule = alembicPythonModuleEnv.SharedLibrary( "contrib/IECoreAlembic/python/IECoreAlembic/_IECoreAlembic", alembicPythonSources )
3250-
alembicPythonModuleEnv.Depends( alembicPythonModule, alembicLibrary )
3251-
alembicPythonModuleEnv.Depends( alembicPythonModule, scenePythonModule )
3257+
alembicPythonModuleEnv.Depends( alembicPythonModule, alembicLibraryInstall )
3258+
alembicPythonModuleEnv.Depends( alembicPythonModule, scenePythonModuleInstall )
3259+
alembicPythonModuleEnv.Depends( alembicPythonModule, corePythonLibraryInstall )
32523260

32533261
alembicPythonModuleInstall = alembicPythonModuleEnv.Install( "$INSTALL_PYTHON_DIR/IECoreAlembic", alembicPythonScripts + alembicPythonModule )
32543262
alembicPythonModuleEnv.AddPostAction( "$INSTALL_PYTHON_DIR/IECoreAlembic", lambda target, source, env : makeSymLinks( alembicPythonModuleEnv, alembicPythonModuleEnv["INSTALL_PYTHON_DIR"] ) )
@@ -3383,7 +3391,8 @@ if doConfigure :
33833391
]
33843392
)
33853393
appleseedPythonModule = appleseedPythonModuleEnv.SharedLibrary( "contrib/IECoreAppleseed/python/IECoreAppleseed/_IECoreAppleseed", appleseedPythonSources )
3386-
appleseedPythonModuleEnv.Depends( appleseedPythonModule, appleseedLibrary )
3394+
appleseedPythonModuleEnv.Depends( appleseedPythonModule, appleseedLibraryInstall )
3395+
appleseedPythonModuleEnv.Depends( appleseedPythonModule, corePythonLibraryInstall )
33873396

33883397
appleseedPythonModuleInstall = appleseedPythonModuleEnv.Install( "$INSTALL_PYTHON_DIR/IECoreAppleseed", appleseedPythonScripts + appleseedPythonModule )
33893398
appleseedPythonModuleEnv.AddPostAction( "$INSTALL_PYTHON_DIR/IECoreAppleseed", lambda target, source, env : makeSymLinks( appleseedPythonModuleEnv, appleseedPythonModuleEnv["INSTALL_PYTHON_DIR"] ) )

0 commit comments

Comments
 (0)