Build : Ensure gaffer wrapper exists before calling usdGenSchema
#5838
Conversation
SConstruct
Outdated
| @@ -1879,6 +1880,7 @@ for libraryName, libraryDef in libraries.items() : | |||
| schemaSource, | |||
| buildSchema | |||
| ) | |||
| env.Depends( generatedSchema, "additionalFiles" ) | |||
There was a problem hiding this comment.
I think we also depend on the env app and the Gaffer module being installed, neither of which are captured by additionalFiles. But maybe we don't even need to use gaffer env to run usdGenSchema? It looks like commandEnv already has LD_LIBRARY_PATH etc set, so maybe we can just call usdGenSchema directly, without any extra dependencies?
There was a problem hiding this comment.
Good idea! commandEnv has almost everything we need, though it's missing $BUILD_DIR/python in the PYTHONPATH and without it usdGenSchema can't find pxr.
I pushed a fixup in cfd44d8 calling usdGenSchema directly from a new env with pxr on PYTHONPATH, though maybe it's worth updating commandEnv directly for any other future use-cases?
There was a problem hiding this comment.
Yeah, I think you're right - we might as well get commandEnv set up fully rather than make another env.
There was a problem hiding this comment.
Cool, I've done the commandEnv update and squashed it in.
murraystevenson
force-pushed
the
arnoldSchemaBuildFix
branch
from
3c4afd7
to
cfd44d8
Compare
This is a little simpler than using `gaffer env usdGenSchema` and solves an issue where the `gaffer` wrapper didn't exist when calling `gaffer env usdGenSchema` from a clean build.
murraystevenson
force-pushed
the
arnoldSchemaBuildFix
branch
from
cfd44d8
to
efd17ee
Compare
Noticed this while running a clean build where GafferArnold was being built at the same time. The Arnold schema was attempting to generate via
gaffer env usdGenSchemabefore thegafferwrapper was installed.Not an issue on CI as we build Gaffer first and then the various GafferArnolds...