Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Build : Ensure gaffer wrapper exists before calling usdGenSchema #5838

Merged
merged 1 commit into from
May 3, 2024
Merged

Build : Ensure gaffer wrapper exists before calling usdGenSchema #5838

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions Changes.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,11 @@ API

- SceneAlgo : Added mechanism for scoping render adaptors to specific clients and/or renderers.

Build
-----

- Fixed issue where `gaffer` wrapper may not exist when calling `usdGenSchema` from a clean build.

1.4.2.0 (relative to 1.4.1.0)
=======

Expand Down
8 changes: 3 additions & 5 deletions SConstruct
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -764,7 +764,7 @@ elif commandEnv["PLATFORM"] == "win32" :
else:
commandEnv["ENV"]["LD_LIBRARY_PATH"] = commandEnv.subst( ":".join( [ "$BUILD_DIR/lib" ] + split( commandEnv["LOCATE_DEPENDENCY_LIBPATH"] ) ) )

commandEnv["ENV"]["PYTHONPATH"] = commandEnv.subst( os.path.pathsep.join( split( commandEnv["LOCATE_DEPENDENCY_PYTHONPATH"] ) ) )
commandEnv["ENV"]["PYTHONPATH"] = commandEnv.subst( os.path.pathsep.join( [ "$BUILD_DIR/python" ] + split( commandEnv["LOCATE_DEPENDENCY_PYTHONPATH"] ) ) )

# SIP on MacOS prevents DYLD_LIBRARY_PATH being passed down so we make sure
# we also pass through to gaffer the other base vars it uses to populate paths
Expand Down Expand Up @@ -1861,12 +1861,10 @@ for libraryName, libraryDef in libraries.items() :

subprocess.check_call(
[
shutil.which( "gaffer.cmd" if sys.platform == "win32" else "gaffer", path = env["ENV"]["PATH"] ),
"env",
"usdGenSchema.cmd" if sys.platform == "win32" else "usdGenSchema",
shutil.which( "usdGenSchema.cmd" if sys.platform == "win32" else "usdGenSchema", path = commandEnv["ENV"]["PATH"] ),
str( source[0] ), targetDir
],
env = env["ENV"]
env = commandEnv["ENV"]
)

schemaSource = os.path.join( "usdSchemas", libraryName + ".usda" )
Expand Down
Loading