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

Restore the organization of the schema installed files #1653

Merged
merged 4 commits into from
Sep 6, 2023
Merged

Restore the organization of the schema installed files #1653

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6a1a8cb
restore the organization schema installed file
cpichard Sep 6, 2023
efc60fc
update changelog
cpichard Sep 6, 2023
170177e
remove empty line
cpichard Sep 6, 2023
6eef06e
also add generatedSchema.usda in usdArnold/resources/usdArnold in the…
cpichard Sep 6, 2023
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
- [usd#1613](https://github.com/Autodesk/arnold-usd/issues/1613) - Invisible Hydra primitives should ignore arnold visibility
- [usd#1641](https://github.com/Autodesk/arnold-usd/issues/1641) - Ensure nodes created by the render delegate have the correct parent procedural.
- [usd#1648](https://github.com/Autodesk/arnold-usd/issues/1648) - Fix an issue where the schemas were generated only once every 2 attempts.
- [usd#1652](https://github.com/Autodesk/arnold-usd/issues/1652) - Restore the schema installed files organisation.

## [7.2.3.2] - 2023-08-30

Expand Down
3 changes: 2 additions & 1 deletion SConstruct
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -747,7 +747,8 @@ if SCENEDELEGATE:
# This follows the standard layout of USD plugins / libraries.
if SCHEMAS:
INSTALL_SCHEMAS = env.Install(os.path.join(PREFIX_SCHEMAS), ['plugInfo.json'])
INSTALL_SCHEMAS += env.Install(os.path.join(PREFIX_SCHEMAS, 'usdArnold', 'resources', 'usdArnold'), [SCHEMAS[0]])
INSTALL_SCHEMAS += env.Install(os.path.join(PREFIX_SCHEMAS, 'usdArnold', 'resources' ), [SCHEMAS[0], SCHEMAS[1]])
INSTALL_SCHEMAS += env.Install(os.path.join(PREFIX_SCHEMAS, 'usdArnold', 'resources', 'usdArnold'), [SCHEMAS[0], SCHEMAS[2]])
env.Alias('schemas-install', INSTALL_SCHEMAS)

if DOCS:
Expand Down
3 changes: 3 additions & 0 deletions schemas/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,9 @@ add_custom_target(schemas ALL
install(FILES "${SCHEMAS_SOURCE_OUT}/generatedSchema.usda"
DESTINATION "${PREFIX_SCHEMA}/usdArnold/resources")

install(FILES "${SCHEMAS_SOURCE_OUT}/generatedSchema.usda"
DESTINATION "${PREFIX_SCHEMA}/usdArnold/resources/usdArnold")

install(FILES "${SCHEMAS_USDA}"
DESTINATION "${PREFIX_SCHEMA}/usdArnold/resources/usdArnold")

Expand Down
4 changes: 3 additions & 1 deletion schemas/SConscript
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,5 +117,7 @@ myenv.Append(BUILDERS = {'GenerateSchema' : builder})

plugInfo = os.path.join(schemasBuildFolder, 'plugInfo.json')

myenv.Depends(plugInfo, generatedSchema)

GENERATE_SCHEMA = myenv.GenerateSchema(generatedSchema, schemaFile)
Return(['GENERATE_SCHEMA', 'plugInfo'])
Return(['GENERATE_SCHEMA', 'plugInfo', 'schemaFile'])