Skip to content

Commit 4cb69f0

Browse files
ivanimanishiivanimanishi
committed
Revert "Build : Add more SCons Depends onto the python modules" and Changes
1 parent e84a762 commit 4cb69f0

File tree

2 files changed

+15
-34
lines changed

2 files changed

+15
-34
lines changed

‎Changes‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,3 @@
1-
10.4.0.0ax (relative to 10.4.0.0a3)
2-
==========
3-
4-
> 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`.
5-
6-
Build
7-
-----
8-
9-
- SConstruct : Fixed dependencies to avoid build errors when using a large number of threads (#1185)
10-
111
10.4.0.0a3 (relative to 10.4.0.0a2)
122
==========
133

‎SConstruct‎

Lines changed: 15 additions & 24 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, coreLibraryInstall )
1768-
corePythonModuleEnv.Depends( corePythonModule, corePythonLibraryInstall )
1767+
corePythonModuleEnv.Depends( corePythonModule, coreLibrary )
1768+
corePythonModuleEnv.Depends( corePythonModule, corePythonLibrary )
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,8 +1912,7 @@ if doConfigure :
19121912
]
19131913
)
19141914
imagePythonModule = imagePythonModuleEnv.SharedLibrary( "python/IECoreImage/_IECoreImage", imagePythonSources + imagePythonModuleSources )
1915-
imagePythonModuleEnv.Depends( imagePythonModule, imageLibraryInstall )
1916-
imagePythonModuleEnv.Depends( imagePythonModule, corePythonLibraryInstall )
1915+
imagePythonModuleEnv.Depends( imagePythonModule, imageLibrary )
19171916

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

19941993
scenePythonModuleInstall = scenePythonModuleEnv.Install( "$INSTALL_PYTHON_DIR/IECoreScene", scenePythonScripts + scenePythonModule )
19951994
scenePythonModuleEnv.AddPostAction( "$INSTALL_PYTHON_DIR/IECoreScene", lambda target, source, env : makeSymLinks( scenePythonModuleEnv, scenePythonModuleEnv["INSTALL_PYTHON_DIR"] ) )
@@ -2087,8 +2086,7 @@ if doConfigure :
20872086
]
20882087
)
20892088
vdbPythonModule = vdbPythonModuleEnv.SharedLibrary( "python/IECoreVDB/_IECoreVDB", vdbPythonModuleSources )
2090-
vdbPythonModuleEnv.Depends( vdbPythonModule, vdbLibraryInstall )
2091-
vdbPythonModuleEnv.Depends( vdbPythonModule, corePythonLibraryInstall )
2089+
vdbPythonModuleEnv.Depends( vdbPythonModule, vdbLibrary )
20922090

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

22812278
glPythonScripts = glob.glob( "python/IECoreGL/*.py" )
22822279
glPythonModuleInstall = glPythonModuleEnv.Install( "$INSTALL_PYTHON_DIR/IECoreGL", glPythonScripts + glPythonModule )
@@ -2472,8 +2469,7 @@ if doConfigure :
24722469
]
24732470
)
24742471
mayaPythonModule = mayaPythonModuleEnv.SharedLibrary( "python/IECoreMaya/_IECoreMaya", mayaPythonSources )
2475-
mayaPythonModuleEnv.Depends( mayaPythonModule, mayaLibraryInstall )
2476-
mayaPythonModuleEnv.Depends( mayaPythonModule, corePythonLibraryInstall )
2472+
mayaPythonModuleEnv.Depends( mayaPythonModule, mayaLibrary )
24772473

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

26942689
if coreEnv["INSTALL_CORENUKE_POST_COMMAND"]!="" :
26952690
# this is the only way we could find to get a post action to run for an alias
@@ -2918,8 +2913,7 @@ if doConfigure :
29182913
]
29192914
)
29202915
houdiniPythonModule = houdiniPythonModuleEnv.SharedLibrary( "python/IECoreHoudini/_IECoreHoudini", houdiniPythonSources )
2921-
houdiniPythonModuleEnv.Depends( houdiniPythonModule, houdiniLibInstall )
2922-
houdiniPythonModuleEnv.Depends( houdiniPythonModule, corePythonLibraryInstall )
2916+
houdiniPythonModuleEnv.Depends( houdiniPythonModule, houdiniLib )
29232917
houdiniPythonModuleInstall = houdiniPythonModuleEnv.Install( "$INSTALL_PYTHON_DIR/IECoreHoudini", houdiniPythonScripts + houdiniPythonModule )
29242918
houdiniPythonModuleEnv.AddPostAction( "$INSTALL_PYTHON_DIR/IECoreHoudini", lambda target, source, env : makeSymLinks( houdiniPythonModuleEnv, houdiniPythonModuleEnv["INSTALL_PYTHON_DIR"] ) )
29252919
houdiniPythonModuleEnv.Alias( "install", houdiniPythonModuleInstall )
@@ -3120,8 +3114,7 @@ if doConfigure :
31203114
]
31213115
)
31223116
usdPythonModule = usdPythonModuleEnv.SharedLibrary( "contrib/IECoreUSD/python/IECoreUSD/_IECoreUSD", usdPythonSources )
3123-
usdPythonModuleEnv.Depends( usdPythonModule, usdLibraryInstall )
3124-
usdPythonModuleEnv.Depends( usdPythonModule, corePythonLibraryInstall )
3117+
usdPythonModuleEnv.Depends( usdPythonModule, usdLibrary )
31253118

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

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

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

0 commit comments

Comments
 (0)