Updated the helptable path to use an env variable

The newly defined env variable is MAYAUSD_LIB_LOCATION which points to the 'lib' path.
Autodesk · Aug 10, 2023 · 44801a5 · 44801a5
1 parent 82012c9
commit 44801a5
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/lib/mayaUsd/resources/scripts/mayaUsdUtils.py b/lib/mayaUsd/resources/scripts/mayaUsdUtils.py
@@ -220,10 +220,9 @@ def showHelpMayaUSD(contentId):
 
     try:
         # Finding the path to helpTableMayaUSD file.
-        dirName = cmds.pluginInfo('mayaUsdPlugin', q=True, p=True)
-        dirName = os.path.dirname(dirName) + "/../../../lib/helpTable/" + "helpTableMayaUSD"
+        helpTablePath = os.path.join(os.environ['MAYAUSD_LIB_LOCATION'], 'helpTable/helpTableMayaUSD');
         # Setting the default helpTable to helpTableMayaUSD
-        cmds.showHelp(dirName, helpTable=True)
+        cmds.showHelp(helpTablePath, helpTable=True)
         # Showing the help content
         cmds.showHelp(contentId)
     finally:

diff --git a/modules/mayaUSD.mod.template b/modules/mayaUSD.mod.template
@@ -21,6 +21,7 @@ ${PXR_OVERRIDE_PLUGINPATH_NAME}+:=lib/usd
 MAYAUSD_VERSION=${MAYAUSD_VERSION}
 PXR_MTLX_STDLIB_SEARCH_PATHS+:=libraries
 ${MAYAUSD_GTEST_PATH}
+MAYAUSD_LIB_LOCATION:=lib
 
 + MayaUSD ${MAYAUSD_VERSION} ${CMAKE_INSTALL_PREFIX}/plugin/adsk
 plug-ins: plugin
diff --git a/modules/mayaUSD_Win.mod.template b/modules/mayaUSD_Win.mod.template
@@ -29,6 +29,7 @@ ${PXR_OVERRIDE_PLUGINPATH_NAME}+:=lib/usd
 MAYAUSD_VERSION=${MAYAUSD_VERSION}
 PXR_MTLX_STDLIB_SEARCH_PATHS+:=libraries
 ${MAYAUSD_GTEST_PATH}
+MAYAUSD_LIB_LOCATION:=lib
 
 + MayaUSD ${MAYAUSD_VERSION} ${CMAKE_INSTALL_PREFIX}/plugin/adsk
 plug-ins: plugin