Skip to content

Commit 78588f2

Browse files
committed
Build : Add more SCons 'Depends' onto the python modules, they will attempt to link before IECorePython can have enough time to generate a lib to link to on multiple job threads.
1 parent eaa688b commit 78588f2

File tree

1 file changed

+9
-0
lines changed

1 file changed

+9
-0
lines changed

SConstruct

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1909,6 +1909,7 @@ if doConfigure :
19091909
)
19101910
imagePythonModule = imagePythonModuleEnv.SharedLibrary( "python/IECoreImage/_IECoreImage", imagePythonSources + imagePythonModuleSources )
19111911
imagePythonModuleEnv.Depends( imagePythonModule, imageLibrary )
1912+
imagePythonModuleEnv.Depends( imagePythonModule, corePythonLibrary )
19121913

19131914
# python module install
19141915
imagePythonModuleInstall = imagePythonModuleEnv.Install( "$INSTALL_PYTHON_DIR/IECoreImage", imagePythonScripts + imagePythonModule )
@@ -2271,6 +2272,7 @@ if env["WITH_GL"] and doConfigure :
22712272
)
22722273
glPythonModule = glPythonModuleEnv.SharedLibrary( "python/IECoreGL/_IECoreGL", glPythonSources )
22732274
glPythonModuleEnv.Depends( glPythonModule, glLibrary )
2275+
glPythonModuleEnv.Depends( glPythonModule, corePythonLibrary )
22742276

22752277
glPythonScripts = glob.glob( "python/IECoreGL/*.py" )
22762278
glPythonModuleInstall = glPythonModuleEnv.Install( "$INSTALL_PYTHON_DIR/IECoreGL", glPythonScripts + glPythonModule )
@@ -2464,6 +2466,7 @@ if doConfigure :
24642466
)
24652467
mayaPythonModule = mayaPythonModuleEnv.SharedLibrary( "python/IECoreMaya/_IECoreMaya", mayaPythonSources )
24662468
mayaPythonModuleEnv.Depends( mayaPythonModule, mayaLibrary )
2469+
mayaPythonModuleEnv.Depends( mayaPythonModule, corePythonLibrary )
24672470

24682471
mayaPythonModuleInstall = mayaPythonModuleEnv.Install( "$INSTALL_PYTHON_DIR/IECoreMaya", mayaPythonScripts + mayaPythonModule )
24692472
mayaPythonModuleEnv.AddPostAction( "$INSTALL_PYTHON_DIR/IECoreMaya", lambda target, source, env : makeSymLinks( mayaPythonModuleEnv, mayaPythonModuleEnv["INSTALL_PYTHON_DIR"] ) )
@@ -2677,6 +2680,7 @@ if doConfigure :
26772680
nukePythonModuleEnv.Alias( "install", nukePythonModuleInstall )
26782681
nukePythonModuleEnv.Alias( "installNuke", nukePythonModuleInstall )
26792682
nukePythonModuleEnv.Depends( nukePythonModule, corePythonModule )
2683+
nukePythonModuleEnv.Depends( nukePythonModule, corePythonLibrary )
26802684

26812685
if coreEnv["INSTALL_CORENUKE_POST_COMMAND"]!="" :
26822686
# this is the only way we could find to get a post action to run for an alias
@@ -2913,6 +2917,7 @@ if doConfigure :
29132917
)
29142918
houdiniPythonModule = houdiniPythonModuleEnv.SharedLibrary( "python/IECoreHoudini/_IECoreHoudini", houdiniPythonSources )
29152919
houdiniPythonModuleEnv.Depends( houdiniPythonModule, houdiniLib )
2920+
houdiniPythonModuleEnv.Depends( houdiniPythonModule, corePythonLibrary )
29162921
houdiniPythonModuleInstall = houdiniPythonModuleEnv.Install( "$INSTALL_PYTHON_DIR/IECoreHoudini", houdiniPythonScripts + houdiniPythonModule )
29172922
houdiniPythonModuleEnv.AddPostAction( "$INSTALL_PYTHON_DIR/IECoreHoudini", lambda target, source, env : makeSymLinks( houdiniPythonModuleEnv, houdiniPythonModuleEnv["INSTALL_PYTHON_DIR"] ) )
29182923
houdiniPythonModuleEnv.Alias( "install", houdiniPythonModuleInstall )
@@ -3107,6 +3112,7 @@ if doConfigure :
31073112
)
31083113
arnoldPythonModule = arnoldPythonModuleEnv.SharedLibrary( "contrib/IECoreArnold/python/IECoreArnold/_IECoreArnold", arnoldPythonSources )
31093114
arnoldPythonModuleEnv.Depends( arnoldPythonModule, arnoldLibrary )
3115+
arnoldPythonModuleEnv.Depends( arnoldPythonModule, corePythonLibrary )
31103116

31113117
arnoldPythonModuleInstall = arnoldPythonModuleEnv.Install( "$INSTALL_ARNOLDPYTHON_DIR/IECoreArnold", arnoldPythonScripts + arnoldPythonModule )
31123118
arnoldPythonModuleEnv.AddPostAction( "$INSTALL_ARNOLDPYTHON_DIR/IECoreArnold", lambda target, source, env : makeSymLinks( arnoldPythonModuleEnv, arnoldPythonModuleEnv["INSTALL_ARNOLDPYTHON_DIR"] ) )
@@ -3276,6 +3282,7 @@ if doConfigure :
32763282
)
32773283
usdPythonModule = usdPythonModuleEnv.SharedLibrary( "contrib/IECoreUSD/python/IECoreUSD/_IECoreUSD", usdPythonSources )
32783284
usdPythonModuleEnv.Depends( usdPythonModule, usdLibrary )
3285+
usdPythonModuleEnv.Depends( usdPythonModule, corePythonLibrary )
32793286

32803287
usdPythonModuleInstall = usdPythonModuleEnv.Install( "$INSTALL_PYTHON_DIR/IECoreUSD", usdPythonScripts + usdPythonModule )
32813288
usdPythonModuleEnv.AddPostAction( "$INSTALL_PYTHON_DIR/IECoreUSD", lambda target, source, env : makeSymLinks( usdPythonModuleEnv, usdPythonModuleEnv["INSTALL_PYTHON_DIR"] ) )
@@ -3425,6 +3432,7 @@ if doConfigure :
34253432
alembicPythonModule = alembicPythonModuleEnv.SharedLibrary( "contrib/IECoreAlembic/python/IECoreAlembic/_IECoreAlembic", alembicPythonSources )
34263433
alembicPythonModuleEnv.Depends( alembicPythonModule, alembicLibrary )
34273434
alembicPythonModuleEnv.Depends( alembicPythonModule, scenePythonModule )
3435+
alembicPythonModuleEnv.Depends( alembicPythonModule, corePythonLibrary )
34283436

34293437
alembicPythonModuleInstall = alembicPythonModuleEnv.Install( "$INSTALL_PYTHON_DIR/IECoreAlembic", alembicPythonScripts + alembicPythonModule )
34303438
alembicPythonModuleEnv.AddPostAction( "$INSTALL_PYTHON_DIR/IECoreAlembic", lambda target, source, env : makeSymLinks( alembicPythonModuleEnv, alembicPythonModuleEnv["INSTALL_PYTHON_DIR"] ) )
@@ -3573,6 +3581,7 @@ if doConfigure :
35733581
)
35743582
appleseedPythonModule = appleseedPythonModuleEnv.SharedLibrary( "contrib/IECoreAppleseed/python/IECoreAppleseed/_IECoreAppleseed", appleseedPythonSources )
35753583
appleseedPythonModuleEnv.Depends( appleseedPythonModule, appleseedLibrary )
3584+
appleseedPythonModuleEnv.Depends( appleseedPythonModule, corePythonLibrary )
35763585

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

0 commit comments

Comments
 (0)