Remove deprecated Katana plugin from repository

The Katana USD plugins are now available in the Foundry-supported GitHub repository at: https://github.com/TheFoundryVisionmongers/KatanaUsdPlugins (Internal change: 2048451)
imageworks · Mar 12, 2020 · b36c955 · b36c955
1 parent 9633a3b
commit b36c955
Show file tree

Hide file tree

Showing 154 changed files with 9 additions and 24,554 deletions.
diff --git a/BUILDING.md b/BUILDING.md
@@ -107,7 +107,6 @@ Support for OpenGL can optionally be disabled by specifying the cmake flag
 that depend on GL, including:
 - usdview
 - Hydra GL imaging
-- Katana app plugins
 
 ##### OSL (OpenShadingLanguage)
 
@@ -216,6 +215,9 @@ These plugins are not built by default and must be enabled via the instructions
 The USD Maya plugins can be found in the Autodesk-supported repo available
 [here](https://github.com/Autodesk/maya-usd).
 
+The USD Katana plugins can be found in the Foundry-supported repo available
+[here](https://github.com/TheFoundryVisionmongers/KatanaUsdPlugins).
+
 ##### Alembic Plugin
 
 Enable the [Alembic](https://github.com/alembic/alembic) plugin in the build
@@ -240,21 +242,6 @@ support requires the following dependencies:
 
 For further information see the documentation on the Alembic plugin [here](http://openusd.org/docs/Alembic-USD-Plugin.html).
 
-##### Katana Plugin
-
-Enable the Katana plugin in the build by specifying the cmake flag 
-```PXR_BUILD_KATANA_PLUGIN=TRUE``` when invoking cmake. 
-
-The additional dependencies that must be supplied when invoking cmake are:
-
-| Dependency Name       | Description                           |
-| --------------        | -----------------------------------   |
-| KATANA_API_LOCATION   | The root path to a Katana SDK install.|
-
-See [3rd Party Library and Application Versions](VERSIONS.md) for version information.
-
-For further information see our additional documentation on the Katana plugins [here](http://openusd.org/docs/Katana-USD-Plugins.html).
-
 ##### MaterialX Plugin
 
 Enable the [MaterialX](https://github.com/materialx/materialx) plugin in the 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -55,10 +55,6 @@ pxr_toplevel_prologue()
 add_subdirectory(pxr)
 add_subdirectory(extras)
 
-if (${PXR_BUILD_KATANA_PLUGIN})
-    add_subdirectory(third_party/katana)
-endif()
-
 if (${PXR_BUILD_PRMAN_PLUGIN})
     add_subdirectory(third_party/renderman-${RENDERMAN_VERSION_MAJOR})
 endif()

diff --git a/VERSIONS.md b/VERSIONS.md
@@ -32,7 +32,6 @@ Our test machines have the following software versions installed
 | Alembic       | 1.7.1        | 1.7.1        | 1.7.1        |
 | OpenEXR       | 2.2.0        | 2.2.0        | 2.2.0        |
 | Maya          | 2016.5       | 2017         | 2016 Ext 2   |
-| Katana        | 3.0v6        |              |              |
 | MaterialX     | 1.36.0       | 1.36.0       | 1.36.0       |
 | Jinja2        | 2.0          | 2.0          | 2.0          |
 | Flex          | 2.5.39       | 2.5.35       |              |

diff --git a/build_scripts/build_usd.py b/build_scripts/build_usd.py
@@ -624,10 +624,10 @@ def InstallBoost(context, force, buildArgs):
         if context.buildPython:
             b2_settings.append("--with-python")
 
-        if context.buildKatana or context.buildOIIO:
+        if context.buildOIIO:
             b2_settings.append("--with-date_time")
 
-        if context.buildKatana or context.buildOIIO or context.enableOpenVDB:
+        if context.buildOIIO or context.enableOpenVDB:
             b2_settings.append("--with-system")
             b2_settings.append("--with-thread")
 
@@ -1326,14 +1326,6 @@ def InstallUSD(context, force, buildArgs):
         else:
             extraArgs.append('-DPXR_BUILD_MATERIALX_PLUGIN=OFF')
 
-        if context.buildKatana:
-            if context.katanaApiLocation:
-                extraArgs.append('-DKATANA_API_LOCATION="{apiLocation}"'
-                                 .format(apiLocation=context.katanaApiLocation))
-            extraArgs.append('-DPXR_BUILD_KATANA_PLUGIN=ON')
-        else:
-            extraArgs.append('-DPXR_BUILD_KATANA_PLUGIN=OFF')
-
         if Windows():
             # Increase the precompiled header buffer limit.
             extraArgs.append('-DCMAKE_CXX_FLAGS="/Zm150"')
@@ -1570,16 +1562,6 @@ def InstallUSD(context, force, buildArgs):
 subgroup.add_argument("--no-materialx", dest="build_materialx", action="store_false",
                       help="Do not build MaterialX plugin for USD (default)")
 
-group = parser.add_argument_group(title="Katana Plugin Options")
-subgroup = group.add_mutually_exclusive_group()
-subgroup.add_argument("--katana", dest="build_katana", action="store_true", 
-                      default=False,
-                      help="Build Katana plugin for USD")
-subgroup.add_argument("--no-katana", dest="build_katana", action="store_false",
-                      help="Do not build Katana plugin for USD (default)")
-group.add_argument("--katana-api-location", type=str,
-                   help="Directory where the Katana SDK is installed.")
-
 args = parser.parse_args()
 
 class InstallContext:
@@ -1688,11 +1670,6 @@ def __init__(self, args):
         # - MaterialX Plugin
         self.buildMaterialX = args.build_materialx
 
-        # - Katana Plugin
-        self.buildKatana = args.build_katana
-        self.katanaApiLocation = (os.path.abspath(args.katana_api_location)
-                                  if args.katana_api_location else None)
-
     def GetBuildArguments(self, dep):
         return self.buildArgs.get(dep.name.lower(), [])
 
@@ -1786,14 +1763,6 @@ def ForceBuildDependency(self, dep):
         PrintError("Cannot build usdview when Python support is disabled.")
         sys.exit(1)
 
-# Error out if we try to build any third party plugins with python disabled.
-if not context.buildPython:
-    pythonPluginErrorMsg = (
-        "%s plugin cannot be built when python support is disabled")
-    if context.buildKatana:
-        PrintError(pythonPluginErrorMsg % "Katana")
-        sys.exit(1)
-
 # Determine whether we're running in Maya's version of Python. When building
 # against Maya's Python, there are some additional restrictions on what we're
 # able to build.
@@ -1816,13 +1785,6 @@ def ForceBuildDependency(self, dep):
                    "usdview.")
         sys.exit(1)
 
-    # We should not attempt to build the plugins for any other DCCs if we're
-    # building against Maya's version of Python.
-    if any([context.buildKatana]):
-        PrintError("Cannot build plugins for other DCCs when building against "
-                   "Maya's version of Python.")
-        sys.exit(1)
-
 dependenciesToBuild = []
 for dep in requiredDependencies:
     if context.ForceBuildDependency(dep) or not dep.Exists(context):
@@ -1928,7 +1890,6 @@ def ForceBuildDependency(self, dep):
       HDF5 support:             {enableHDF5}
     Draco Plugin                {buildDraco}
     MaterialX Plugin            {buildMaterialX}
-    Katana Plugin               {buildKatana}
 
   Dependencies                  {dependencies}"""
 
@@ -1976,8 +1937,7 @@ def FormatBuildArguments(buildArgs):
     buildAlembic=("On" if context.buildAlembic else "Off"),
     buildDraco=("On" if context.buildDraco else "Off"),
     buildMaterialX=("On" if context.buildMaterialX else "Off"),
-    enableHDF5=("On" if context.enableHDF5 else "Off"),
-    buildKatana=("On" if context.buildKatana else "Off"))
+    enableHDF5=("On" if context.enableHDF5 else "Off"))
 
 Print(summaryMsg)
 
@@ -2052,10 +2012,6 @@ def FormatBuildArguments(buildArgs):
     {requiredInPath}
 """.format(requiredInPath="\n    ".join(sorted(requiredInPath))))
 
-if context.buildKatana:
-    Print("See documentation at http://openusd.org/docs/Katana-USD-Plugins.html "
-          "for setting up the Katana plugin.\n")
-
 if context.buildPrman:
     Print("See documentation at http://openusd.org/docs/RenderMan-USD-Imaging-Plugin.html "
           "for setting up the RenderMan plugin.\n")
diff --git a/cmake/defaults/Options.cmake b/cmake/defaults/Options.cmake
@@ -32,7 +32,6 @@ option(PXR_BUILD_OPENIMAGEIO_PLUGIN "Build OpenImageIO plugin" OFF)
 option(PXR_BUILD_OPENCOLORIO_PLUGIN "Build OpenColorIO plugin" OFF)
 option(PXR_BUILD_USD_IMAGING "Build USD imaging components" ON)
 option(PXR_BUILD_USDVIEW "Build usdview" ON)
-option(PXR_BUILD_KATANA_PLUGIN "Build usd katana plugin" OFF)
 option(PXR_BUILD_ALEMBIC_PLUGIN "Build the Alembic plugin for USD" OFF)
 option(PXR_BUILD_DRACO_PLUGIN "Build the Draco plugin for USD" OFF)
 option(PXR_BUILD_PRMAN_PLUGIN "Build the PRMan imaging plugin" OFF)
@@ -151,25 +150,6 @@ if (${PXR_BUILD_EMBREE_PLUGIN})
     endif()
 endif()
 
-if (${PXR_BUILD_KATANA_PLUGIN})
-    if (NOT ${PXR_ENABLE_PYTHON_SUPPORT})
-        message(STATUS 
-            "Setting PXR_BUILD_KATANA_PLUGIN=OFF because "
-            "PXR_ENABLE_PYTHON_SUPPORT=OFF")
-        set(PXR_BUILD_KATANA_PLUGIN "OFF" CACHE BOOL "" FORCE)
-    elseif (NOT ${PXR_ENABLE_GL_SUPPORT})
-        message(STATUS 
-            "Setting PXR_BUILD_KATANA_PLUGIN=OFF because "
-            "PXR_ENABLE_GL_SUPPORT=OFF")
-        set(PXR_BUILD_KATANA_PLUGIN "OFF" CACHE BOOL "" FORCE)
-    elseif (NOT ${PXR_BUILD_USD_IMAGING})
-        message(STATUS 
-            "Setting PXR_BUILD_KATANA_PLUGIN=OFF because "
-            "PXR_BUILD_USD_IMAGING=OFF")
-        set(PXR_BUILD_KATANA_PLUGIN "OFF" CACHE BOOL "" FORCE)
-    endif()
-endif()
-
 if (${PXR_BUILD_PRMAN_PLUGIN})
     if (NOT ${PXR_BUILD_IMAGING})
         message(STATUS

diff --git a/cmake/defaults/Packages.cmake b/cmake/defaults/Packages.cmake
@@ -145,15 +145,6 @@ endif()
 
 # Third Party Plugin Package Requirements
 # ----------------------------------------------
-if (PXR_BUILD_KATANA_PLUGIN)
-    find_package(KatanaAPI REQUIRED)
-    find_package(Boost
-        COMPONENTS
-        thread
-        REQUIRED
-        )
-endif()
-
 if (PXR_BUILD_PRMAN_PLUGIN)
     find_package(Renderman REQUIRED)
 endif()

diff --git a/cmake/macros/Public.cmake b/cmake/macros/Public.cmake
@@ -168,7 +168,6 @@ endfunction()
 function(pxr_library NAME)
     set(options
         DISABLE_PRECOMPILED_HEADERS
-        KATANA_PLUGIN
     )
     set(oneValueArgs
         TYPE
@@ -253,12 +252,6 @@ function(pxr_library NAME)
 
         set(prefix "")
         set(suffix ${CMAKE_SHARED_LIBRARY_SUFFIX})
-
-        # Katana plugins install into a specific sub directory structure.
-        # In particular, shared objects install into plugin/Libs
-        if(args_KATANA_PLUGIN)
-            set(subdir "Libs")
-        endif()
     else()
         # If the caller didn't specify the library type then choose the
         # type now.
@@ -827,32 +820,6 @@ function(pxr_add_extra_plugins PLUGIN_AREAS)
     set(PXR_EXTRA_PLUGINS "${PXR_EXTRA_PLUGINS}" CACHE INTERNAL "${help}")
 endfunction() # pxr_setup_third_plugins
 
-function(pxr_katana_nodetypes NODE_TYPES)
-    set(installDir ${PXR_INSTALL_SUBDIR}/plugin/Plugins/NodeTypes)
-
-    set(pyFiles "")
-    set(importLines "")
-
-    foreach (nodeType ${NODE_TYPES})
-        list(APPEND pyFiles ${nodeType}.py)
-        set(importLines "import ${nodeType}\n")
-    endforeach()
-
-    install(
-        PROGRAMS ${pyFiles}
-        DESTINATION ${installDir}
-    )
-
-    # Install a __init__.py that imports all the known node types
-    file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/generated_NodeTypes_init.py"
-         "${importLines}")
-    install(
-        FILES "${CMAKE_CURRENT_BINARY_DIR}/generated_NodeTypes_init.py"
-        DESTINATION "${installDir}"
-        RENAME "__init__.py"
-    )
-endfunction() # pxr_katana_nodetypes
-
 function(pxr_toplevel_prologue)
     # Generate a namespace declaration header, pxr.h, at the top level of
     # pxr at configuration time.

diff --git a/cmake/macros/generateDocs.py b/cmake/macros/generateDocs.py
@@ -26,7 +26,7 @@
 import sys, os, argparse, shutil, subprocess, tempfile, platform, stat
 
 # This finds all modules in the source area. For example, it will find ar,
-# usdGeom, etc. in the pxr source area, or usdKatana, etc. in the third_party
+# usdGeom, etc. in the pxr source area, or prman etc. in the third_party
 # source area.
 def _getModules(sourceRoot):
     modules = []