Skip to content

Commit

Permalink
Revert "Build : Add more SCons Depends onto the python modules" and C…
Browse files Browse the repository at this point in the history 
…hanges
  • Loading branch information
@ivanimanishi
ivanimanishi committed May 10, 2022
1 parent e84a762 commit 4cb69f0
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 34 deletions.
10 changes: 0 additions & 10 deletions Changes
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,3 @@
10.4.0.0ax (relative to 10.4.0.0a3)
==========

> Note : Changes marked with "(RB-10.3)" don't need to be mentioned in the release notes for the final release version of `10.4.0.0`. They are all inherited from `RB-10.3`.

Build
-----

- SConstruct : Fixed dependencies to avoid build errors when using a large number of threads (#1185)

10.4.0.0a3 (relative to 10.4.0.0a2)
==========

Expand Down
39 changes: 15 additions & 24 deletions SConstruct
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1764,8 +1764,8 @@ coreEnv.Alias( "installCore", pythonHeaderInstall )
corePythonModuleEnv.Append( LIBS = os.path.basename( coreEnv.subst( "$INSTALL_LIB_NAME" ) ) )
corePythonModuleEnv.Append( LIBS = os.path.basename( corePythonEnv.subst( "$INSTALL_PYTHONLIB_NAME" ) ) )
corePythonModule = corePythonModuleEnv.SharedLibrary( "python/IECore/_IECore", corePythonModuleSources )
corePythonModuleEnv.Depends( corePythonModule, coreLibraryInstall )
corePythonModuleEnv.Depends( corePythonModule, corePythonLibraryInstall )
corePythonModuleEnv.Depends( corePythonModule, coreLibrary )
corePythonModuleEnv.Depends( corePythonModule, corePythonLibrary )

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

# python module install
imagePythonModuleInstall = imagePythonModuleEnv.Install( "$INSTALL_PYTHON_DIR/IECoreImage", imagePythonScripts + imagePythonModule )
Expand Down Expand Up @@ -1987,9 +1986,9 @@ if doConfigure :
# python module
scenePythonModuleEnv.Append( LIBS = os.path.basename( sceneEnv.subst( "$INSTALL_LIB_NAME" ) ) )
scenePythonModule = scenePythonModuleEnv.SharedLibrary( "python/IECoreScene/_IECoreScene", scenePythonModuleSources )
scenePythonModuleEnv.Depends( scenePythonModule, coreLibraryInstall )
scenePythonModuleEnv.Depends( scenePythonModule, corePythonLibraryInstall )
scenePythonModuleEnv.Depends( scenePythonModule, sceneLibraryInstall )
scenePythonModuleEnv.Depends( scenePythonModule, coreLibrary )
scenePythonModuleEnv.Depends( scenePythonModule, corePythonLibrary )
scenePythonModuleEnv.Depends( scenePythonModule, sceneLibrary )

scenePythonModuleInstall = scenePythonModuleEnv.Install( "$INSTALL_PYTHON_DIR/IECoreScene", scenePythonScripts + scenePythonModule )
scenePythonModuleEnv.AddPostAction( "$INSTALL_PYTHON_DIR/IECoreScene", lambda target, source, env : makeSymLinks( scenePythonModuleEnv, scenePythonModuleEnv["INSTALL_PYTHON_DIR"] ) )
Expand Down Expand Up @@ -2087,8 +2086,7 @@ if doConfigure :
]
)
vdbPythonModule = vdbPythonModuleEnv.SharedLibrary( "python/IECoreVDB/_IECoreVDB", vdbPythonModuleSources )
vdbPythonModuleEnv.Depends( vdbPythonModule, vdbLibraryInstall )
vdbPythonModuleEnv.Depends( vdbPythonModule, corePythonLibraryInstall )
vdbPythonModuleEnv.Depends( vdbPythonModule, vdbLibrary )

vdbPythonModuleInstall = vdbPythonModuleEnv.Install( "$INSTALL_PYTHON_DIR/IECoreVDB", vdbPythonScripts + vdbPythonModule )
vdbPythonModuleEnv.AddPostAction( "$INSTALL_PYTHON_DIR/IECoreVDB", lambda target, source, env : makeSymLinks( vdbPythonModuleEnv, vdbPythonModuleEnv["INSTALL_PYTHON_DIR"] ) )
Expand Down Expand Up @@ -2275,8 +2273,7 @@ if env["WITH_GL"] and doConfigure :
]
)
glPythonModule = glPythonModuleEnv.SharedLibrary( "python/IECoreGL/_IECoreGL", glPythonSources )
glPythonModuleEnv.Depends( glPythonModule, glLibraryInstall )
glPythonModuleEnv.Depends( glPythonModule, corePythonLibraryInstall )
glPythonModuleEnv.Depends( glPythonModule, glLibrary )

glPythonScripts = glob.glob( "python/IECoreGL/*.py" )
glPythonModuleInstall = glPythonModuleEnv.Install( "$INSTALL_PYTHON_DIR/IECoreGL", glPythonScripts + glPythonModule )
Expand Down Expand Up @@ -2472,8 +2469,7 @@ if doConfigure :
]
)
mayaPythonModule = mayaPythonModuleEnv.SharedLibrary( "python/IECoreMaya/_IECoreMaya", mayaPythonSources )
mayaPythonModuleEnv.Depends( mayaPythonModule, mayaLibraryInstall )
mayaPythonModuleEnv.Depends( mayaPythonModule, corePythonLibraryInstall )
mayaPythonModuleEnv.Depends( mayaPythonModule, mayaLibrary )

mayaPythonModuleInstall = mayaPythonModuleEnv.Install( "$INSTALL_PYTHON_DIR/IECoreMaya", mayaPythonScripts + mayaPythonModule )
mayaPythonModuleEnv.AddPostAction( "$INSTALL_PYTHON_DIR/IECoreMaya", lambda target, source, env : makeSymLinks( mayaPythonModuleEnv, mayaPythonModuleEnv["INSTALL_PYTHON_DIR"] ) )
Expand Down Expand Up @@ -2688,8 +2684,7 @@ if doConfigure :
nukePythonModuleEnv.AddPostAction( "$INSTALL_NUKEPYTHON_DIR/IECoreNuke", lambda target, source, env : makeSymLinks( nukePythonModuleEnv, nukePythonModuleEnv["INSTALL_NUKEPYTHON_DIR"] ) )
nukePythonModuleEnv.Alias( "install", nukePythonModuleInstall )
nukePythonModuleEnv.Alias( "installNuke", nukePythonModuleInstall )
nukePythonModuleEnv.Depends( nukePythonModule, corePythonModuleInstall )
nukePythonModuleEnv.Depends( nukePythonModule, corePythonLibraryInstall )
nukePythonModuleEnv.Depends( nukePythonModule, corePythonModule )

if coreEnv["INSTALL_CORENUKE_POST_COMMAND"]!="" :
# this is the only way we could find to get a post action to run for an alias
Expand Down Expand Up @@ -2918,8 +2913,7 @@ if doConfigure :
]
)
houdiniPythonModule = houdiniPythonModuleEnv.SharedLibrary( "python/IECoreHoudini/_IECoreHoudini", houdiniPythonSources )
houdiniPythonModuleEnv.Depends( houdiniPythonModule, houdiniLibInstall )
houdiniPythonModuleEnv.Depends( houdiniPythonModule, corePythonLibraryInstall )
houdiniPythonModuleEnv.Depends( houdiniPythonModule, houdiniLib )
houdiniPythonModuleInstall = houdiniPythonModuleEnv.Install( "$INSTALL_PYTHON_DIR/IECoreHoudini", houdiniPythonScripts + houdiniPythonModule )
houdiniPythonModuleEnv.AddPostAction( "$INSTALL_PYTHON_DIR/IECoreHoudini", lambda target, source, env : makeSymLinks( houdiniPythonModuleEnv, houdiniPythonModuleEnv["INSTALL_PYTHON_DIR"] ) )
houdiniPythonModuleEnv.Alias( "install", houdiniPythonModuleInstall )
Expand Down Expand Up @@ -3120,8 +3114,7 @@ if doConfigure :
]
)
usdPythonModule = usdPythonModuleEnv.SharedLibrary( "contrib/IECoreUSD/python/IECoreUSD/_IECoreUSD", usdPythonSources )
usdPythonModuleEnv.Depends( usdPythonModule, usdLibraryInstall )
usdPythonModuleEnv.Depends( usdPythonModule, corePythonLibraryInstall )
usdPythonModuleEnv.Depends( usdPythonModule, usdLibrary )

usdPythonModuleInstall = usdPythonModuleEnv.Install( "$INSTALL_PYTHON_DIR/IECoreUSD", usdPythonScripts + usdPythonModule )
usdPythonModuleEnv.AddPostAction( "$INSTALL_PYTHON_DIR/IECoreUSD", lambda target, source, env : makeSymLinks( usdPythonModuleEnv, usdPythonModuleEnv["INSTALL_PYTHON_DIR"] ) )
Expand Down Expand Up @@ -3254,9 +3247,8 @@ if doConfigure :
]
)
alembicPythonModule = alembicPythonModuleEnv.SharedLibrary( "contrib/IECoreAlembic/python/IECoreAlembic/_IECoreAlembic", alembicPythonSources )
alembicPythonModuleEnv.Depends( alembicPythonModule, alembicLibraryInstall )
alembicPythonModuleEnv.Depends( alembicPythonModule, scenePythonModuleInstall )
alembicPythonModuleEnv.Depends( alembicPythonModule, corePythonLibraryInstall )
alembicPythonModuleEnv.Depends( alembicPythonModule, alembicLibrary )
alembicPythonModuleEnv.Depends( alembicPythonModule, scenePythonModule )

alembicPythonModuleInstall = alembicPythonModuleEnv.Install( "$INSTALL_PYTHON_DIR/IECoreAlembic", alembicPythonScripts + alembicPythonModule )
alembicPythonModuleEnv.AddPostAction( "$INSTALL_PYTHON_DIR/IECoreAlembic", lambda target, source, env : makeSymLinks( alembicPythonModuleEnv, alembicPythonModuleEnv["INSTALL_PYTHON_DIR"] ) )
Expand Down Expand Up @@ -3391,8 +3383,7 @@ if doConfigure :
]
)
appleseedPythonModule = appleseedPythonModuleEnv.SharedLibrary( "contrib/IECoreAppleseed/python/IECoreAppleseed/_IECoreAppleseed", appleseedPythonSources )
appleseedPythonModuleEnv.Depends( appleseedPythonModule, appleseedLibraryInstall )
appleseedPythonModuleEnv.Depends( appleseedPythonModule, corePythonLibraryInstall )
appleseedPythonModuleEnv.Depends( appleseedPythonModule, appleseedLibrary )

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

0 comments on commit 4cb69f0

Please sign in to comment.