Restore the organization of the schema installed files (#1653)

* restore the organization schema installed file * update changelog * remove empty line * also add generatedSchema.usda in usdArnold/resources/usdArnold in the cmake build
Autodesk · Sep 6, 2023 · 0f42095 · 0f42095
1 parent 4848d6a
commit 0f42095
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -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
 

diff --git a/SConstruct b/SConstruct
@@ -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:

diff --git a/schemas/CMakeLists.txt b/schemas/CMakeLists.txt
@@ -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")
 

diff --git a/schemas/SConscript b/schemas/SConscript
@@ -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'])