pxr-plug-dev 25.8__tar.gz → 26.8__tar.gz

{pxr_plug_dev-25.8 → pxr_plug_dev-26.8}/.gitignore

@@ -47,6 +47,9 @@ build/
 # CMake
 cmake-build-*/
 
+# Conan
+CMakeUserPresets.json
+
 # Python byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]
@@ -82,10 +85,10 @@ wheelhouse/
 .benchmarks/
 
 # Environments
-.env
-.venv
-env/
-venv/
-ENV/
-env.bak/
-venv.bak/
+/.env
+/.venv
+/env/
+/venv/
+/ENV/
+/env.bak/
+/venv.bak/

{pxr_plug_dev-25.8 → pxr_plug_dev-26.8}/CMakeLists.txt

@@ -1,18 +1,14 @@
-cmake_minimum_required(VERSION 3.23...4.1)
+cmake_minimum_required(VERSION 3.23...4.2)
 
 # Default build type value.
 set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Choose the build type")
 
 project(pxr-plug
-    VERSION 0.25.8
+    VERSION 0.26.8
     HOMEPAGE_URL "https://github.com/untwine/pxr-plug"
     LANGUAGES C CXX
 )
 
-if (NOT "${CMAKE_CXX_STANDARD}")
-    set(CMAKE_CXX_STANDARD 17 CACHE STRING "Default C++ standard")
-endif()
-
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 
@@ -48,16 +44,16 @@ if (WIN32)
     set(CMAKE_CXX_FLAGS "/wd4003 ${CMAKE_CXX_FLAGS}")
 endif()
 
-find_package(pxr-arch 0.25.8 REQUIRED)
-find_package(pxr-tf 0.25.8 REQUIRED)
-find_package(pxr-js 0.25.8 REQUIRED)
-find_package(pxr-trace 0.25.8 REQUIRED)
-find_package(pxr-work 0.25.8 REQUIRED)
+find_package(pxr-arch 0.26.8 EXACT REQUIRED)
+find_package(pxr-tf 0.26.8 EXACT REQUIRED)
+find_package(pxr-js 0.26.8 EXACT REQUIRED)
+find_package(pxr-trace 0.26.8 EXACT REQUIRED)
+find_package(pxr-work 0.26.8 EXACT REQUIRED)
 find_package(TBB 2017.0 REQUIRED)
 
 if(BUILD_PYTHON_BINDINGS)
     add_compile_definitions(PXR_PYTHON_SUPPORT_ENABLED=1)
-    find_package(pxr-boost 0.25.8 REQUIRED)
+    find_package(pxr-boost 0.26.8 EXACT REQUIRED)
 
     if (NOT CMAKE_INSTALL_PYTHON_LIBDIR)
         set(py_version "${Python_VERSION_MAJOR}.${Python_VERSION_MINOR}")
@@ -76,7 +72,7 @@ if (BUILD_TESTS)
     find_package(Pytest)
 
     # Pxr-Gf is used within the tests
-    find_package(pxr-gf 0.25.8 REQUIRED)
+    find_package(pxr-gf 0.26.8 EXACT REQUIRED)
 
     enable_testing()
     add_subdirectory(test)

pxr_plug_dev-26.8/NOTICE.txt

@@ -0,0 +1,12 @@
+Universal Scene Description
+Copyright 2016 Pixar
+
+All rights reserved.
+
+This product includes software developed at:
+
+Pixar (http://www.pixar.com/).
+
+This repository is a modified, standalone redistribution of the 'plug'
+library from Pixar's OpenUSD, restructured for independent building and
+packaging. See the git history for details of the changes made.

{pxr_plug_dev-25.8 → pxr_plug_dev-26.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pxr-plug-dev
-Version: 25.8
+Version: 26.8
 Summary: C++ headers and CMake config for developing with pxr-plug
 Keywords: pixar,open-usd,dev
 License-File: LICENSE.txt
@@ -12,19 +12,19 @@ Classifier: Operating System :: MacOS :: MacOS X
 Classifier: Operating System :: Microsoft :: Windows :: Windows 10
 Project-URL: Repository, https://github.com/untwine/pxr-plug
 Requires-Python: >=3.8
-Requires-Dist: pxr-arch-dev==25.8.*
-Requires-Dist: pxr-tf-dev==25.8.*
-Requires-Dist: pxr-js-dev==25.8.*
-Requires-Dist: pxr-trace-dev==25.8.*
-Requires-Dist: pxr-work-dev==25.8.*
-Requires-Dist: pxr-boost-dev==25.8.*
-Requires-Dist: pxr-tbb-dev==2022.2.0.*
+Requires-Dist: pxr-arch-dev==26.8.*
+Requires-Dist: pxr-tf-dev==26.8.*
+Requires-Dist: pxr-js-dev==26.8.*
+Requires-Dist: pxr-trace-dev==26.8.*
+Requires-Dist: pxr-work-dev==26.8.*
+Requires-Dist: pxr-boost-dev==26.8.*
+Requires-Dist: pxr-tbb-dev==2023.1.0.*
 Description-Content-Type: text/markdown
 
 # Pixar Plug
 
 [![PyPi version](https://img.shields.io/pypi/v/pxr-plug.svg?logo=pypi&label=PyPI&logoColor=gold)](https://pypi.python.org/pypi/pxr-plug)
-[![CMake](https://img.shields.io/badge/CMake-3.23...4.1-blue.svg?logo=CMake&logoColor=blue)](https://cmake.org)
+[![CMake](https://img.shields.io/badge/CMake-3.23...4.2-blue.svg?logo=CMake&logoColor=blue)](https://cmake.org)
 [![Linux](https://github.com/untwine/pxr-plug/actions/workflows/linux.yml/badge.svg?branch=main)](https://github.com/untwine/pxr-plug/actions/workflows/linux.yml)
 [![MacOs](https://github.com/untwine/pxr-plug/actions/workflows/macos.yml/badge.svg?branch=main)](https://github.com/untwine/pxr-plug/actions/workflows/macos.yml)
 [![Windows](https://github.com/untwine/pxr-plug/actions/workflows/windows.yml/badge.svg?branch=main)](https://github.com/untwine/pxr-plug/actions/workflows/windows.yml)
@@ -40,4 +40,4 @@ It is regularly rebased over the "release" branch of the original
 [repository](https://github.com/PixarAnimationStudios/OpenUSD) to provide
 explicit divergence information from the latest updates and is currently
 synchronized with
-[v25.08](https://github.com/PixarAnimationStudios/OpenUSD/releases/tag/v25.08).
+[v26.08](https://github.com/PixarAnimationStudios/OpenUSD/releases/tag/v26.08).

{pxr_plug_dev-25.8 → pxr_plug_dev-26.8}/README.md

@@ -1,7 +1,7 @@
 # Pixar Plug
 
 [![PyPi version](https://img.shields.io/pypi/v/pxr-plug.svg?logo=pypi&label=PyPI&logoColor=gold)](https://pypi.python.org/pypi/pxr-plug)
-[![CMake](https://img.shields.io/badge/CMake-3.23...4.1-blue.svg?logo=CMake&logoColor=blue)](https://cmake.org)
+[![CMake](https://img.shields.io/badge/CMake-3.23...4.2-blue.svg?logo=CMake&logoColor=blue)](https://cmake.org)
 [![Linux](https://github.com/untwine/pxr-plug/actions/workflows/linux.yml/badge.svg?branch=main)](https://github.com/untwine/pxr-plug/actions/workflows/linux.yml)
 [![MacOs](https://github.com/untwine/pxr-plug/actions/workflows/macos.yml/badge.svg?branch=main)](https://github.com/untwine/pxr-plug/actions/workflows/macos.yml)
 [![Windows](https://github.com/untwine/pxr-plug/actions/workflows/windows.yml/badge.svg?branch=main)](https://github.com/untwine/pxr-plug/actions/workflows/windows.yml)
@@ -17,4 +17,4 @@ It is regularly rebased over the "release" branch of the original
 [repository](https://github.com/PixarAnimationStudios/OpenUSD) to provide
 explicit divergence information from the latest updates and is currently
 synchronized with
-[v25.08](https://github.com/PixarAnimationStudios/OpenUSD/releases/tag/v25.08).
+[v26.08](https://github.com/PixarAnimationStudios/OpenUSD/releases/tag/v26.08).

pxr_plug_dev-26.8/cmake/pxr-plug-config.cmake.in

@@ -0,0 +1,17 @@
+include(CMakeFindDependencyMacro)
+
+@PACKAGE_INIT@
+
+find_dependency(pxr-arch 0.26.8 EXACT REQUIRED)
+find_dependency(pxr-tf 0.26.8 EXACT REQUIRED)
+find_dependency(pxr-js 0.26.8 EXACT REQUIRED)
+find_dependency(pxr-trace 0.26.8 EXACT REQUIRED)
+find_dependency(pxr-work 0.26.8 EXACT REQUIRED)
+find_dependency(TBB 2017.0 REQUIRED)
+
+set(_with_py_bindings "@BUILD_PYTHON_BINDINGS@")
+if(_with_py_bindings)
+    find_dependency(pxr-boost 0.26.8 EXACT REQUIRED)
+endif()
+
+include(${CMAKE_CURRENT_LIST_DIR}/pxr-plug-targets.cmake)

pxr_plug_dev-26.8/conanfile.py

@@ -0,0 +1,107 @@
+import os
+import sys
+
+from conan import ConanFile
+from conan.errors import ConanInvalidConfiguration
+from conan.tools.cmake import CMake, CMakeDeps, CMakeToolchain, cmake_layout
+from conan.tools.files import copy
+
+
+class PxrPlugConan(ConanFile):
+    name = "pxr-plug"
+    version = "26.8"
+    package_type = "library"
+    license = "LicenseRef-TOST-1.0"
+    homepage = "https://github.com/untwine/pxr-plug"
+    url = "https://github.com/untwine/pxr-plug"
+    description = "Plugin Framework used in OpenUSD"
+    topics = ("pixar", "open-usd")
+
+    settings = "os", "compiler", "build_type", "arch"
+    options = {
+        "shared": [True, False],
+        "fPIC": [True, False],
+        "build_tests": [True, False],
+        "precompiled_headers": [True, False],
+        "python_version": ["ANY", None],
+    }
+    default_options = {
+        "shared": True,
+        "fPIC": True,
+        "build_tests": False,
+        "precompiled_headers": False,
+        "python_version": None,
+    }
+
+    exports_sources = "CMakeLists.txt", "cmake/*", "src/*", "LICENSE.txt", "NOTICE.txt"
+
+    def config_options(self):
+        if self.settings.os == "Windows":
+            del self.options.fPIC
+
+    def configure(self):
+        if self.options.shared:
+            self.options.rm_safe("fPIC")
+        if self.options.python_version:
+            self.options["pxr-tf"].python_version = self.options.python_version
+            self.options["pxr-trace"].python_version = self.options.python_version
+            self.options["pxr-work"].python_version = self.options.python_version
+            self.options["pxr-boost"].python_version = self.options.python_version
+            if self.options.build_tests:
+                self.options["pxr-gf"].python_version = self.options.python_version
+
+    def requirements(self):
+        self.requires("pxr-arch/26.8")
+        self.requires("pxr-tf/26.8")
+        self.requires("pxr-js/26.8")
+        self.requires("pxr-trace/26.8")
+        self.requires("pxr-work/26.8")
+        self.requires("onetbb/2023.1.0")
+        if self.options.python_version:
+            self.requires("pxr-boost/26.8")
+
+    def build_requirements(self):
+        if self.options.build_tests:
+            self.test_requires("pxr-gf/26.8")
+
+    def validate(self):
+        if self.options.python_version:
+            actual = f"{sys.version_info.major}.{sys.version_info.minor}"
+            if str(self.options.python_version) != actual:
+                raise ConanInvalidConfiguration(
+                    f"python_version={self.options.python_version} requested, "
+                    f"but Conan is running under Python {actual}."
+                )
+
+    def layout(self):
+        cmake_layout(self)
+
+    def generate(self):
+        tc = CMakeToolchain(self)
+        tc.variables["BUILD_TESTS"] = bool(self.options.build_tests)
+        tc.variables["BUILD_PYTHON_BINDINGS"] = bool(self.options.python_version)
+        tc.variables["ENABLE_PRECOMPILED_HEADERS"] = bool(self.options.precompiled_headers)
+        if self.options.python_version:
+            tc.variables["Python_EXECUTABLE"] = sys.executable.replace("\\", "/")
+        tc.generate()
+        deps = CMakeDeps(self)
+        deps.generate()
+
+    def build(self):
+        cmake = CMake(self)
+        cmake.configure()
+        cmake.build()
+
+    def package(self):
+        copy(self, "LICENSE.txt", self.source_folder,
+             os.path.join(self.package_folder, "licenses"))
+        copy(self, "NOTICE.txt", self.source_folder,
+             os.path.join(self.package_folder, "licenses"))
+        cmake = CMake(self)
+        cmake.install()
+
+    def package_info(self):
+        self.cpp_info.set_property("cmake_find_mode", "none")
+        self.cpp_info.set_property("system_package_version", "0.26.8")
+        self.cpp_info.builddirs = ["share/cmake/pxr-plug"]
+        self.cpp_info.libs = ["PxrPlug"]

{pxr_plug_dev-25.8 → pxr_plug_dev-26.8}/pyproject-dev.toml

@@ -1,19 +1,19 @@
 [build-system]
 requires = [
     "scikit-build-core",
-    "pxr-arch-dev==25.8.*",
-    "pxr-tf-dev==25.8.*",
-    "pxr-js-dev==25.8.*",
-    "pxr-trace-dev==25.8.*",
-    "pxr-work-dev==25.8.*",
-    "pxr-boost-dev==25.8.*",
-    "pxr-tbb-dev==2022.2.0.*"
+    "pxr-arch-dev==26.8.*",
+    "pxr-tf-dev==26.8.*",
+    "pxr-js-dev==26.8.*",
+    "pxr-trace-dev==26.8.*",
+    "pxr-work-dev==26.8.*",
+    "pxr-boost-dev==26.8.*",
+    "pxr-tbb-dev==2023.1.0.*"
 ]
 build-backend = "scikit_build_core.build"
 
 [project]
 name = "pxr-plug-dev"
-version = "25.8"
+version = "26.8"
 description = "C++ headers and CMake config for developing with pxr-plug"
 readme = "README.md"
 requires-python = ">=3.8"
@@ -27,25 +27,26 @@ classifiers = [
     "Operating System :: Microsoft :: Windows :: Windows 10",
 ]
 dependencies = [
-    "pxr-arch-dev==25.8.*",
-    "pxr-tf-dev==25.8.*",
-    "pxr-js-dev==25.8.*",
-    "pxr-trace-dev==25.8.*",
-    "pxr-work-dev==25.8.*",
-    "pxr-boost-dev==25.8.*",
-    "pxr-tbb-dev==2022.2.0.*"
+    "pxr-arch-dev==26.8.*",
+    "pxr-tf-dev==26.8.*",
+    "pxr-js-dev==26.8.*",
+    "pxr-trace-dev==26.8.*",
+    "pxr-work-dev==26.8.*",
+    "pxr-boost-dev==26.8.*",
+    "pxr-tbb-dev==2023.1.0.*"
 ]
 
 [project.urls]
 Repository = "https://github.com/untwine/pxr-plug"
 
 [tool.scikit-build]
-cmake.version = ">=3.23,<4.2"
+cmake.version = ">=3.23,<4.3"
 cmake.args = [
     "-DBUILD_TESTS=OFF",
     "-DBUILD_SHARED_LIBS=ON",
     "-DBUILD_PYTHON_BINDINGS=ON",
     "-DCMAKE_INSTALL_LIBDIR=pxr-plug/lib",
+    "-DCMAKE_INSTALL_BINDIR=pxr-plug/lib",
     "-DCMAKE_INSTALL_INCLUDEDIR=pxr-plug/include",
     "-DCMAKE_INSTALL_DATAROOTDIR=pxr-plug",
     "-DCMAKE_INSTALL_PYTHON_LIBDIR=pxr-plug/lib/python",

{pxr_plug_dev-25.8 → pxr_plug_dev-26.8}/pyproject.toml

@@ -1,19 +1,19 @@
 [build-system]
 requires = [
     "scikit-build-core",
-    "pxr-arch-dev==25.8.*",
-    "pxr-tf-dev==25.8.*",
-    "pxr-js-dev==25.8.*",
-    "pxr-trace-dev==25.8.*",
-    "pxr-work-dev==25.8.*",
-    "pxr-boost-dev==25.8.*",
-    "pxr-tbb-dev==2022.2.0.*"
+    "pxr-arch-dev==26.8.*",
+    "pxr-tf-dev==26.8.*",
+    "pxr-js-dev==26.8.*",
+    "pxr-trace-dev==26.8.*",
+    "pxr-work-dev==26.8.*",
+    "pxr-boost-dev==26.8.*",
+    "pxr-tbb-dev==2023.1.0.*"
 ]
 build-backend = "scikit_build_core.build"
 
 [project]
 name = "pxr-plug-dev"
-version = "25.8"
+version = "26.8"
 description = "C++ headers and CMake config for developing with pxr-plug"
 readme = "README.md"
 requires-python = ">=3.8"
@@ -27,25 +27,26 @@ classifiers = [
     "Operating System :: Microsoft :: Windows :: Windows 10",
 ]
 dependencies = [
-    "pxr-arch-dev==25.8.*",
-    "pxr-tf-dev==25.8.*",
-    "pxr-js-dev==25.8.*",
-    "pxr-trace-dev==25.8.*",
-    "pxr-work-dev==25.8.*",
-    "pxr-boost-dev==25.8.*",
-    "pxr-tbb-dev==2022.2.0.*"
+    "pxr-arch-dev==26.8.*",
+    "pxr-tf-dev==26.8.*",
+    "pxr-js-dev==26.8.*",
+    "pxr-trace-dev==26.8.*",
+    "pxr-work-dev==26.8.*",
+    "pxr-boost-dev==26.8.*",
+    "pxr-tbb-dev==2023.1.0.*"
 ]
 
 [project.urls]
 Repository = "https://github.com/untwine/pxr-plug"
 
 [tool.scikit-build]
-cmake.version = ">=3.23,<4.2"
+cmake.version = ">=3.23,<4.3"
 cmake.args = [
     "-DBUILD_TESTS=OFF",
     "-DBUILD_SHARED_LIBS=ON",
     "-DBUILD_PYTHON_BINDINGS=ON",
     "-DCMAKE_INSTALL_LIBDIR=pxr-plug/lib",
+    "-DCMAKE_INSTALL_BINDIR=pxr-plug/lib",
     "-DCMAKE_INSTALL_INCLUDEDIR=pxr-plug/include",
     "-DCMAKE_INSTALL_DATAROOTDIR=pxr-plug",
     "-DCMAKE_INSTALL_PYTHON_LIBDIR=pxr-plug/lib/python",

{pxr_plug_dev-25.8 → pxr_plug_dev-26.8}/src/CMakeLists.txt

@@ -22,6 +22,10 @@ target_include_directories(plug
         $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
 )
 
+# Compile features can only raise the effective standard, so this can't be
+# undercut by a toolchain file that pre-sets CMAKE_CXX_STANDARD lower.
+target_compile_features(plug PUBLIC cxx_std_17)
+
 target_link_libraries(plug
     PUBLIC
         pxr::arch
@@ -32,6 +36,10 @@ target_link_libraries(plug
         TBB::tbb
 )
 
+if(NOT WIN32 AND NOT SKBUILD)
+    set_target_properties(plug PROPERTIES INSTALL_RPATH_USE_LINK_PATH TRUE)
+endif()
+
 if(BUILD_PYTHON_BINDINGS)
     target_sources(plug
         PRIVATE
@@ -97,7 +105,7 @@ target_sources(plug
 install(
     TARGETS plug EXPORT ${PROJECT_NAME}
     FILE_SET public_headers
-    RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
     ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
 )

{pxr_plug_dev-25.8 → pxr_plug_dev-26.8}/src/pxr/plug/api.h

@@ -1,12 +1,11 @@
+//
 // Copyright 2016 Pixar
 //
 // Licensed under the terms set forth in the LICENSE.txt file available at
 // https://openusd.org/license.
 //
-// Modified by Jeremy Retailleau.
-
-#ifndef PXR_PLUG_API_H
-#define PXR_PLUG_API_H
+#ifndef PXR_BASE_PLUG_API_H
+#define PXR_BASE_PLUG_API_H
 
 #include <pxr/arch/export.h>
 

{pxr_plug_dev-25.8 → pxr_plug_dev-26.8}/src/pxr/plug/debugCodes.cpp

@@ -1,12 +1,11 @@
+//
 // Copyright 2016 Pixar
 //
 // Licensed under the terms set forth in the LICENSE.txt file available at
 // https://openusd.org/license.
 //
-// Modified by Jeremy Retailleau.
-
-#include "pxr/plug/pxr.h"
-#include "pxr/plug/debugCodes.h"
+#include <pxr/plug/pxr.h>
+#include <pxr/plug/debugCodes.h>
 #include <pxr/tf/debug.h>
 #include <pxr/tf/registryManager.h>
 

{pxr_plug_dev-25.8 → pxr_plug_dev-26.8}/src/pxr/plug/debugCodes.h

@@ -1,14 +1,13 @@
+//
 // Copyright 2016 Pixar
 //
 // Licensed under the terms set forth in the LICENSE.txt file available at
 // https://openusd.org/license.
 //
-// Modified by Jeremy Retailleau.
-
-#ifndef PXR_PLUG_DEBUG_CODES_H
-#define PXR_PLUG_DEBUG_CODES_H
+#ifndef PXR_BASE_PLUG_DEBUG_CODES_H
+#define PXR_BASE_PLUG_DEBUG_CODES_H
 
-#include "pxr/plug/pxr.h"
+#include <pxr/plug/pxr.h>
 #include <pxr/tf/debug.h>
 
 PLUG_NAMESPACE_OPEN_SCOPE
@@ -24,4 +23,4 @@ TF_DEBUG_CODES(
 
 PLUG_NAMESPACE_CLOSE_SCOPE
 
-#endif // PXR_PLUG_DEBUG_CODES_H
+#endif // PXR_BASE_PLUG_DEBUG_CODES_H

{pxr_plug_dev-25.8 → pxr_plug_dev-26.8}/src/pxr/plug/info.cpp

@@ -1,13 +1,13 @@
+//
 // Copyright 2016 Pixar
 //
 // Licensed under the terms set forth in the LICENSE.txt file available at
 // https://openusd.org/license.
 //
-// Modified by Jeremy Retailleau.
 
-#include "pxr/plug/pxr.h"
-#include "pxr/plug/info.h"
-#include "pxr/plug/debugCodes.h"
+#include <pxr/plug/pxr.h>
+#include <pxr/plug/info.h>
+#include <pxr/plug/debugCodes.h>
 #include <pxr/js/json.h>
 #include <pxr/tf/diagnostic.h>
 #include <pxr/tf/fileUtils.h>

{pxr_plug_dev-25.8 → pxr_plug_dev-26.8}/src/pxr/plug/info.h

@@ -1,14 +1,13 @@
+//
 // Copyright 2016 Pixar
 //
 // Licensed under the terms set forth in the LICENSE.txt file available at
 // https://openusd.org/license.
 //
-// Modified by Jeremy Retailleau.
-
-#ifndef PXR_PLUG_INFO_H
-#define PXR_PLUG_INFO_H
+#ifndef PXR_BASE_PLUG_INFO_H
+#define PXR_BASE_PLUG_INFO_H
 
-#include "pxr/plug/pxr.h"
+#include <pxr/plug/pxr.h>
 #include <pxr/arch/attributes.h>
 #include <pxr/js/value.h>
 
@@ -91,4 +90,4 @@ void Plug_SetPaths(const std::vector<std::string>&,
 
 PLUG_NAMESPACE_CLOSE_SCOPE
 
-#endif // PXR_PLUG_INFO_H
+#endif // PXR_BASE_PLUG_INFO_H

{pxr_plug_dev-25.8 → pxr_plug_dev-26.8}/src/pxr/plug/initConfig.cpp

@@ -1,12 +1,12 @@
+//
 // Copyright 2016 Pixar
 //
 // Licensed under the terms set forth in the LICENSE.txt file available at
 // https://openusd.org/license.
 //
-// Modified by Jeremy Retailleau.
 
-#include "pxr/plug/pxr.h"
-#include "pxr/plug/info.h"
+#include <pxr/plug/pxr.h>
+#include <pxr/plug/info.h>
 #include <pxr/tf/diagnosticLite.h>
 #include <pxr/tf/getenv.h>
 #include <pxr/tf/pathUtils.h>
@@ -43,13 +43,18 @@ _AppendPathList(
         // Anchor all relative paths to the shared library path.
         const bool isLibraryRelativePath = TfIsRelativePath(path);
         if (isLibraryRelativePath) {
-            std::string fullPath = TfStringCatPaths(sharedLibPath, path);
-            // Re-add trailing slash if necessary
-            // (https://github.com/PixarAnimationStudios/OpenUSD/issues/3679)
-            if (TfStringEndsWith(path, "/") && !TfStringEndsWith(fullPath, "/")) {
-                fullPath += "/";
+            std::string libraryRelativePath = 
+                TfStringCatPaths(sharedLibPath, path);
+            // TfStringCatPaths will strip a trailing '/' character in path 
+            // via ArchNormPath. This can cause the library relative path
+            // to be treated as a file path downstream. Here we detect that case
+            // and add the trailing '/' back if necessary. Note: trailing '\' is
+            // converted to '/' on Windows.
+            if (path.back() == '/') {
+                libraryRelativePath += path.back();
             }
-            result->push_back(fullPath);
+            
+            result->push_back(libraryRelativePath);
         }
         else {
             result->push_back(path);

{pxr_plug_dev-25.8 → pxr_plug_dev-26.8}/src/pxr/plug/interfaceFactory.cpp

@@ -1,10 +1,9 @@
+//
 // Copyright 2016 Pixar
 //
 // Licensed under the terms set forth in the LICENSE.txt file available at
 // https://openusd.org/license.
 //
-// Modified by Jeremy Retailleau.
-
 /// \file interfaceFactory.cpp
 
-#include "pxr/plug/interfaceFactory.h"
+#include <pxr/plug/interfaceFactory.h>

{pxr_plug_dev-25.8 → pxr_plug_dev-26.8}/src/pxr/plug/interfaceFactory.h

@@ -1,16 +1,15 @@
+//
 // Copyright 2016 Pixar
 //
 // Licensed under the terms set forth in the LICENSE.txt file available at
 // https://openusd.org/license.
 //
-// Modified by Jeremy Retailleau.
-
-#ifndef PXR_PLUG_INTERFACE_FACTORY_H
-#define PXR_PLUG_INTERFACE_FACTORY_H
+#ifndef PXR_BASE_PLUG_INTERFACE_FACTORY_H
+#define PXR_BASE_PLUG_INTERFACE_FACTORY_H
 
 /// \file plug/interfaceFactory.h
 
-#include "pxr/plug/pxr.h"
+#include <pxr/plug/pxr.h>
 #include <pxr/tf/type.h>
 
 PLUG_NAMESPACE_OPEN_SCOPE
@@ -58,4 +57,4 @@ TF_REGISTRY_FUNCTION(TfType)                                                \
 
 PLUG_NAMESPACE_CLOSE_SCOPE
 
-#endif // PXR_PLUG_INTERFACE_FACTORY_H
+#endif // PXR_BASE_PLUG_INTERFACE_FACTORY_H

{pxr_plug_dev-25.8 → pxr_plug_dev-26.8}/src/pxr/plug/moduleDeps.cpp

@@ -3,10 +3,9 @@
 // Licensed under the terms set forth in the LICENSE.txt file available at
 // https://openusd.org/license.
 //
-// Modified by Jeremy Retailleau.
 ////////////////////////////////////////////////////////////////////////
 
-#include "pxr/plug/pxr.h"
+#include <pxr/plug/pxr.h>
 #include <pxr/tf/registryManager.h>
 #include <pxr/tf/scriptModuleLoader.h>
 #include <pxr/tf/token.h>
@@ -22,7 +21,8 @@ TF_REGISTRY_FUNCTION(TfScriptModuleLoader) {
         TfToken("tf"),
         TfToken("js"),
         TfToken("trace"),
-        TfToken("work")
+        TfToken("work"),
+        TfToken("boost-python"),
     };
     TfScriptModuleLoader::GetInstance().
         RegisterLibrary(TfToken("plug"), TfToken("pxr.Plug"), reqs);

{pxr_plug_dev-25.8 → pxr_plug_dev-26.8}/src/pxr/plug/notice.cpp

@@ -1,12 +1,12 @@
+//
 // Copyright 2016 Pixar
 //
 // Licensed under the terms set forth in the LICENSE.txt file available at
 // https://openusd.org/license.
 //
-// Modified by Jeremy Retailleau.
 
-#include "pxr/plug/pxr.h"
-#include "pxr/plug/notice.h"
+#include <pxr/plug/pxr.h>
+#include <pxr/plug/notice.h>
 #include <pxr/tf/type.h>
 #include <pxr/tf/registryManager.h>
 

{pxr_plug_dev-25.8 → pxr_plug_dev-26.8}/src/pxr/plug/notice.h

@@ -1,15 +1,14 @@
+//
 // Copyright 2016 Pixar
 //
 // Licensed under the terms set forth in the LICENSE.txt file available at
 // https://openusd.org/license.
 //
-// Modified by Jeremy Retailleau.
-
-#ifndef PXR_PLUG_NOTICE_H
-#define PXR_PLUG_NOTICE_H
+#ifndef PXR_BASE_PLUG_NOTICE_H
+#define PXR_BASE_PLUG_NOTICE_H
 
-#include "pxr/plug/pxr.h"
-#include "pxr/plug/api.h"
+#include <pxr/plug/pxr.h>
+#include <pxr/plug/api.h>
 #include <pxr/tf/declarePtrs.h>
 #include <pxr/tf/notice.h>
 
@@ -50,4 +49,4 @@ private:
 
 PLUG_NAMESPACE_CLOSE_SCOPE
 
-#endif // PXR_PLUG_NOTICE_H
+#endif // PXR_BASE_PLUG_NOTICE_H

{pxr_plug_dev-25.8 → pxr_plug_dev-26.8}/src/pxr/plug/pch.h

@@ -1,12 +1,14 @@
+//
 // Copyright 2017 Pixar
 //
 // Licensed under the terms set forth in the LICENSE.txt file available at
 // https://openusd.org/license.
 //
-// Modified by Jeremy Retailleau.
+// WARNING: THIS FILE IS GENERATED.  DO NOT EDIT.
+//
 
 #define TF_MAX_ARITY 7
-#include "pxr/plug/pxr.h"
+#include <pxr/plug/pxr.h>
 #include <pxr/arch/defines.h>
 #if defined(ARCH_OS_DARWIN)
 #include <glob.h>
@@ -14,7 +16,6 @@
 #include <sys/mount.h>
 #include <sys/param.h>
 #include <unistd.h>
-#include <mach/mach_time.h>
 #endif
 #if defined(ARCH_OS_LINUX)
 #include <glob.h>
@@ -22,7 +23,6 @@
 #include <sys/param.h>
 #include <sys/statfs.h>
 #include <unistd.h>
-#include <x86intrin.h>
 #endif
 #if defined(ARCH_OS_WINDOWS)
 #ifndef WIN32_LEAN_AND_MEAN
@@ -32,12 +32,12 @@
 #include <Windows.h>
 #include <intrin.h>
 #include <io.h>
-#include <stringapiset.h>
 #endif
 #include <algorithm>
 #include <any>
 #include <array>
 #include <atomic>
+#include <chrono>
 #include <cinttypes>
 #include <cmath>
 #include <complex>
@@ -82,13 +82,17 @@
 #include <unordered_map>
 #include <unordered_set>
 #include <utility>
+#include <variant>
 #include <vector>
 #include <tbb/blocked_range.h>
 #include <tbb/cache_aligned_allocator.h>
 #include <tbb/concurrent_vector.h>
 #include <tbb/enumerable_thread_specific.h>
+#include <tbb/parallel_for.h>
+#include <tbb/parallel_for_each.h>
+#include <tbb/parallel_reduce.h>
+#include <tbb/parallel_sort.h>
 #include <tbb/spin_mutex.h>
-#include <tbb/spin_rw_mutex.h>
 #include <tbb/task.h>
 #include <tbb/task_arena.h>
 #include <tbb/task_group.h>

{pxr_plug_dev-25.8 → pxr_plug_dev-26.8}/src/pxr/plug/plugin.cpp

@@ -1,14 +1,14 @@
+//
 // Copyright 2016 Pixar
 //
 // Licensed under the terms set forth in the LICENSE.txt file available at
 // https://openusd.org/license.
 //
-// Modified by Jeremy Retailleau.
 
-#include "pxr/plug/pxr.h"
-#include "pxr/plug/plugin.h"
-#include "pxr/plug/debugCodes.h"
-#include "pxr/plug/info.h"
+#include <pxr/plug/pxr.h>
+#include <pxr/plug/plugin.h>
+#include <pxr/plug/debugCodes.h>
+#include <pxr/plug/info.h>
 
 #include <pxr/arch/threads.h>
 #include <pxr/arch/library.h>
@@ -323,6 +323,10 @@ PlugPlugin::_LoadWithDependents(_SeenPlugins *seenPlugins)
 bool
 PlugPlugin::Load()
 {
+    if (_isLoaded) {
+        return true;
+    }
+
     static std::recursive_mutex loadMutex;
 
     bool result = false;

{pxr_plug_dev-25.8 → pxr_plug_dev-26.8}/src/pxr/plug/plugin.h

@@ -1,15 +1,14 @@
+//
 // Copyright 2016 Pixar
 //
 // Licensed under the terms set forth in the LICENSE.txt file available at
 // https://openusd.org/license.
 //
-// Modified by Jeremy Retailleau.
-
-#ifndef PXR_PLUG_PLUGIN_H
-#define PXR_PLUG_PLUGIN_H
+#ifndef PXR_BASE_PLUG_PLUGIN_H
+#define PXR_BASE_PLUG_PLUGIN_H
 
-#include "pxr/plug/pxr.h"
-#include "pxr/plug/api.h"
+#include <pxr/plug/pxr.h>
+#include <pxr/plug/api.h>
 
 #include <pxr/js/types.h>
 #include <pxr/tf/declarePtrs.h>
@@ -189,4 +188,4 @@ PlugFindPluginResource(const PlugPluginPtr& plugin,
 
 PLUG_NAMESPACE_CLOSE_SCOPE
 
-#endif // PXR_PLUG_PLUGIN_H
+#endif // PXR_BASE_PLUG_PLUGIN_H

{pxr_plug_dev-25.8 → pxr_plug_dev-26.8}/src/pxr/plug/pxr.h.in

@@ -3,11 +3,20 @@
 // Licensed under the terms set forth in the LICENSE.txt file available at
 // https://openusd.org/license.
 //
-// Modified by Jeremy Retailleau.
 
 #ifndef PXR_PLUG_H
 #define PXR_PLUG_H
 
+#include <pxr/arch/pxr.h>
+#include <pxr/tf/pxr.h>
+#include <pxr/js/pxr.h>
+#include <pxr/trace/pxr.h>
+#include <pxr/work/pxr.h>
+
+#ifdef PXR_PYTHON_SUPPORT_ENABLED
+#include <pxr/boost/python/common.hpp>
+#endif
+
 #define PLUG_MAJOR_VERSION @PROJECT_VERSION_MAJOR@
 #define PLUG_MINOR_VERSION @PROJECT_VERSION_MINOR@
 #define PLUG_PATCH_VERSION @PROJECT_VERSION_PATCH@
@@ -16,18 +25,31 @@
                     + PLUG_MINOR_VERSION * 100   \
                     + PLUG_PATCH_VERSION)
 
-#define PLUG_NS pxr
+#define PXR_NS pxr
 #define PLUG_INTERNAL_NS pxrInternal_v@PROJECT_VERSION_MAJOR@_@PROJECT_VERSION_MINOR@_@PROJECT_VERSION_PATCH@__pxrReserved__
-#define PLUG_NS_GLOBAL ::PLUG_NS
+#define PXR_NS_GLOBAL ::PXR_NS
 
 namespace PLUG_INTERNAL_NS { }
 
-namespace PLUG_NS {
+namespace PXR_NS {
     using namespace PLUG_INTERNAL_NS;
 }
 
+// Import direct dependencies into plug's internal namespace.
+// This keeps resolution correct if package versions ever drift.
+namespace PLUG_INTERNAL_NS {
+    using namespace ARCH_INTERNAL_NS;
+    using namespace TF_INTERNAL_NS;
+    using namespace JS_INTERNAL_NS;
+    using namespace TRACE_INTERNAL_NS;
+    using namespace WORK_INTERNAL_NS;
+#ifdef PXR_PYTHON_SUPPORT_ENABLED
+    using namespace BOOST_INTERNAL_NS;
+#endif
+}
+
 #define PLUG_NAMESPACE_OPEN_SCOPE   namespace PLUG_INTERNAL_NS {
 #define PLUG_NAMESPACE_CLOSE_SCOPE  }
-#define PLUG_NAMESPACE_USING_DIRECTIVE using namespace PLUG_NS;
+#define PLUG_NAMESPACE_USING_DIRECTIVE using namespace PXR_NS;
 
 #endif // PXR_PLUG_H

{pxr_plug_dev-25.8 → pxr_plug_dev-26.8}/src/pxr/plug/registry.cpp

@@ -1,17 +1,17 @@
+//
 // Copyright 2016 Pixar
 //
 // Licensed under the terms set forth in the LICENSE.txt file available at
 // https://openusd.org/license.
 //
-// Modified by Jeremy Retailleau.
 
-#include "pxr/plug/pxr.h"
-#include "pxr/plug/registry.h"
+#include <pxr/plug/pxr.h>
+#include <pxr/plug/registry.h>
 
-#include "pxr/plug/debugCodes.h"
-#include "pxr/plug/notice.h"
-#include "pxr/plug/info.h"
-#include "pxr/plug/plugin.h"
+#include <pxr/plug/debugCodes.h>
+#include <pxr/plug/notice.h>
+#include <pxr/plug/info.h>
+#include <pxr/plug/plugin.h>
 
 #include <pxr/arch/attributes.h>
 #include <pxr/tf/diagnostic.h>
@@ -161,7 +161,7 @@ PlugPluginPtr
 PlugRegistry::GetPluginForType(TfType t) const
 {
     if (t.IsUnknown()) {
-        TF_CODING_ERROR("Unknown base type");
+        TF_CODING_ERROR("Unknown type");
         return TfNullPtr;
     }
     return PlugPlugin::_GetPluginForType(t);
@@ -261,6 +261,51 @@ Plug_SetPaths(const std::vector<std::string>& paths,
     pathsInfo.pathsAreOrdered = pathsAreOrdered;
 }
 
+
+PlugPluginPtr
+PlugRegistry::DemandPluginForType(TfType t) const
+{
+    auto issueError = [&]() {
+        std::string msg;
+        PathsInfo &info = Plug_GetPathsInfo();
+        msg += TfStringPrintf(
+            "Failed to find the plugInfo.json file that declares the "
+            "plugin for %s.\n",
+            t.IsUnknown() ? "unknown type" : t.GetTypeName().c_str());
+        msg += "Check the plugin search path configuration and run with "
+            "TF_DEBUG=PLUG_INFO_SEARCH to debug.\n";
+        if (info.paths.empty()) {
+            msg += "No plugin search paths.\n";
+        }
+        else {
+            msg += "Plugin search paths:\n";
+            for (std::string const &dirName: info.paths) {
+                msg += TfStringPrintf("    %s\n", dirName.c_str());
+            }
+        }
+        if (!info.debugMessages.empty()) {
+            msg += "Plugin debug info:\n";
+            for (std::string const &debugMsg: info.debugMessages) {
+                // These already have newlines appended, oddly.
+                msg += TfStringPrintf("    %s", debugMsg.c_str());
+            }
+        }
+        TF_FATAL_ERROR("%s", msg.c_str());
+    };
+    
+    if (t.IsUnknown()) {
+        issueError();
+    }
+    else if (PlugPluginPtr plugin = PlugPlugin::_GetPluginForType(t)) {
+        return plugin;
+    }
+    else {
+        issueError();
+    }
+    return TfNullPtr;
+}
+
+
 // This is here so plugin.cpp doesn't have to include info.h or registry.h.
 void
 PlugPlugin::_RegisterAllPlugins()

{pxr_plug_dev-25.8 → pxr_plug_dev-26.8}/src/pxr/plug/registry.h

@@ -1,15 +1,14 @@
+//
 // Copyright 2016 Pixar
 //
 // Licensed under the terms set forth in the LICENSE.txt file available at
 // https://openusd.org/license.
 //
-// Modified by Jeremy Retailleau.
-
-#ifndef PXR_PLUG_REGISTRY_H
-#define PXR_PLUG_REGISTRY_H
+#ifndef PXR_BASE_PLUG_REGISTRY_H
+#define PXR_BASE_PLUG_REGISTRY_H
 
-#include "pxr/plug/pxr.h"
-#include "pxr/plug/api.h"
+#include <pxr/plug/pxr.h>
+#include <pxr/plug/api.h>
 
 #include <pxr/js/value.h>
 #include <pxr/tf/declarePtrs.h>
@@ -413,6 +412,16 @@ public:
     PLUG_API
     PlugPluginPtr GetPluginForType(TfType t) const;
 
+    /// Return the plug-in for the given type, or issue a fatal error with
+    /// diagnostic information and terminate the program if the plug-in is not
+    /// found.
+    ///
+    /// This is meant for use in cases where it should be guaranteed that \p t's
+    /// plugin is present (e.g. it is part of the calling code's library) and it
+    /// impossible to continue without the plugin.
+    PLUG_API
+    PlugPluginPtr DemandPluginForType(TfType t) const;
+
     /// Returns all registered plug-ins.  Note that additional plugins may be
     /// registered during program runtime.  \sa \ref Plug_Discovery
     PLUG_API
@@ -465,8 +474,6 @@ private:
     std::mutex _mutex;
 };
 
-PLUG_API_TEMPLATE_CLASS(TfSingleton<PlugRegistry>);
-
 PLUG_NAMESPACE_CLOSE_SCOPE
 
-#endif // PXR_PLUG_REGISTRY_H
+#endif // PXR_BASE_PLUG_REGISTRY_H

{pxr_plug_dev-25.8 → pxr_plug_dev-26.8}/src/pxr/plug/staticInterface.cpp

@@ -1,17 +1,16 @@
+//
 // Copyright 2016 Pixar
 //
 // Licensed under the terms set forth in the LICENSE.txt file available at
 // https://openusd.org/license.
 //
-// Modified by Jeremy Retailleau.
-
 /// \file staticInterface.cpp
 
-#include "pxr/plug/pxr.h"
-#include "pxr/plug/staticInterface.h"
-#include "pxr/plug/interfaceFactory.h"
-#include "pxr/plug/plugin.h"
-#include "pxr/plug/registry.h"
+#include <pxr/plug/pxr.h>
+#include <pxr/plug/staticInterface.h>
+#include <pxr/plug/interfaceFactory.h>
+#include <pxr/plug/plugin.h>
+#include <pxr/plug/registry.h>
 #include <pxr/tf/diagnostic.h>
 #include <pxr/tf/scoped.h>
 #include <mutex>

{pxr_plug_dev-25.8 → pxr_plug_dev-26.8}/src/pxr/plug/staticInterface.h

@@ -1,17 +1,16 @@
+//
 // Copyright 2016 Pixar
 //
 // Licensed under the terms set forth in the LICENSE.txt file available at
 // https://openusd.org/license.
 //
-// Modified by Jeremy Retailleau.
-
-#ifndef PXR_PLUG_STATIC_INTERFACE_H
-#define PXR_PLUG_STATIC_INTERFACE_H
+#ifndef PXR_BASE_PLUG_STATIC_INTERFACE_H
+#define PXR_BASE_PLUG_STATIC_INTERFACE_H
 
 /// \file plug/staticInterface.h
 
-#include "pxr/plug/pxr.h"
-#include "pxr/plug/api.h"
+#include <pxr/plug/pxr.h>
+#include <pxr/plug/api.h>
 
 #include <atomic>
 #include <type_traits>
@@ -57,7 +56,7 @@ protected:
 /// Typical usage is:
 /// \code
 /// #include "path/to/SomePlugin.h"
-/// #include "pxr/plug/staticInterface.h"
+/// #include <pxr/plug/staticInterface.h>
 ///
 /// static PlugStaticInterface<SomePluginInterface> ptr;
 ///
@@ -113,7 +112,7 @@ protected:
 /// \c PLUG_REGISTER_INTERFACE_SINGLETON_TYPE:
 /// \code
 /// #include "path/to/SomePlugin.h"
-/// #include "pxr/plug/interfaceFactory.h"
+/// #include <pxr/plug/interfaceFactory.h>
 /// #include <iostream>
 /// class SomePluginImplementation : public SomePluginInterface {
 /// public:
@@ -201,4 +200,4 @@ private:
 
 PLUG_NAMESPACE_CLOSE_SCOPE
 
-#endif // PXR_PLUG_STATIC_INTERFACE_H
+#endif // PXR_BASE_PLUG_STATIC_INTERFACE_H

{pxr_plug_dev-25.8 → pxr_plug_dev-26.8}/src/pxr/plug/thisPlugin.h

@@ -1,15 +1,14 @@
+//
 // Copyright 2016 Pixar
 //
 // Licensed under the terms set forth in the LICENSE.txt file available at
 // https://openusd.org/license.
 //
-// Modified by Jeremy Retailleau.
-
-#ifndef PXR_PLUG_THIS_PLUGIN_H
-#define PXR_PLUG_THIS_PLUGIN_H
+#ifndef PXR_BASE_PLUG_THIS_PLUGIN_H
+#define PXR_BASE_PLUG_THIS_PLUGIN_H
 
-#include "pxr/plug/pxr.h"
-#include "pxr/plug/registry.h"
+#include <pxr/plug/pxr.h>
+#include <pxr/plug/registry.h>
 #include <pxr/tf/preprocessorUtilsLite.h>
 
 PLUG_NAMESPACE_OPEN_SCOPE
@@ -32,4 +31,4 @@ PLUG_NAMESPACE_OPEN_SCOPE
 
 PLUG_NAMESPACE_CLOSE_SCOPE
 
-#endif // PXR_PLUG_THIS_PLUGIN_H
+#endif // PXR_BASE_PLUG_THIS_PLUGIN_H

{pxr_plug_dev-25.8 → pxr_plug_dev-26.8}/src/python/CMakeLists.txt

@@ -27,15 +27,25 @@ target_link_libraries(pyPlug
         pxr::boost-python
 )
 
-if(SKBUILD AND NOT WIN32)
+if(NOT WIN32)
     set(_rpath_prefix "$ORIGIN")
     if(APPLE)
         set(_rpath_prefix "@loader_path")
     endif()
-    set_target_properties(pyPlug
-        PROPERTIES
-            INSTALL_RPATH "${_rpath_prefix}/../.libs"
-            INSTALL_RPATH_USE_LINK_PATH TRUE
+
+    if(SKBUILD)
+        set(_pyPlug_rpath "${_rpath_prefix}/../.libs")
+    else()
+        file(RELATIVE_PATH _pyPlug_libdir_rel
+            "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_PYTHON_LIBDIR}/pxr/Plug"
+            "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}"
+        )
+        set(_pyPlug_rpath "${_rpath_prefix}/${_pyPlug_libdir_rel}")
+    endif()
+
+    set_target_properties(pyPlug PROPERTIES
+        INSTALL_RPATH "${_pyPlug_rpath}"
+        INSTALL_RPATH_USE_LINK_PATH TRUE
     )
 endif()
 

{pxr_plug_dev-25.8 → pxr_plug_dev-26.8}/src/python/__init__.py

@@ -1,10 +1,9 @@
+#
 # Copyright 2016 Pixar
 #
 # Licensed under the terms set forth in the LICENSE.txt file available at
 # https://openusd.org/license.
 #
-# Modified by Jeremy Retailleau.
-
 """
 This package defines facilities for dealing with plugins.
 """

{pxr_plug_dev-25.8 → pxr_plug_dev-26.8}/src/python/module.cpp

@@ -1,9 +1,9 @@
+//
 // Copyright 2016 Pixar
 //
 // Licensed under the terms set forth in the LICENSE.txt file available at
 // https://openusd.org/license.
 //
-// Modified by Jeremy Retailleau.
 
 #include <pxr/plug/pxr.h>
 #include <pxr/tf/pyModule.h>

{pxr_plug_dev-25.8 → pxr_plug_dev-26.8}/src/python/wrapNotice.cpp

@@ -1,9 +1,9 @@
+//
 // Copyright 2016 Pixar
 //
 // Licensed under the terms set forth in the LICENSE.txt file available at
 // https://openusd.org/license.
 //
-// Modified by Jeremy Retailleau.
 
 #include <pxr/plug/pxr.h>
 #include <pxr/plug/notice.h>

{pxr_plug_dev-25.8 → pxr_plug_dev-26.8}/src/python/wrapPlugin.cpp

@@ -1,9 +1,9 @@
+//
 // Copyright 2016 Pixar
 //
 // Licensed under the terms set forth in the LICENSE.txt file available at
 // https://openusd.org/license.
 //
-// Modified by Jeremy Retailleau.
 
 #include <pxr/plug/pxr.h>
 #include <pxr/plug/plugin.h>

{pxr_plug_dev-25.8 → pxr_plug_dev-26.8}/src/python/wrapRegistry.cpp

@@ -1,9 +1,9 @@
+//
 // Copyright 2016 Pixar
 //
 // Licensed under the terms set forth in the LICENSE.txt file available at
 // https://openusd.org/license.
 //
-// Modified by Jeremy Retailleau.
 
 #include <pxr/plug/pxr.h>
 #include <pxr/plug/registry.h>

pxr_plug_dev-25.8/NOTICE.txt

@@ -1,8 +0,0 @@
-Universal Scene Description
-Copyright 2016 Pixar
-
-All rights reserved.
-
-This product includes software developed at:
-
-Pixar (http://www.pixar.com/).

pxr_plug_dev-25.8/cmake/pxr-plug-config.cmake.in

@@ -1,17 +0,0 @@
-include(CMakeFindDependencyMacro)
-
-@PACKAGE_INIT@
-
-find_dependency(pxr-arch 0.25.8 REQUIRED)
-find_dependency(pxr-tf 0.25.8 REQUIRED)
-find_dependency(pxr-js 0.25.8 REQUIRED)
-find_dependency(pxr-trace 0.25.8 REQUIRED)
-find_dependency(pxr-work 0.25.8 REQUIRED)
-find_dependency(TBB 2017.0 REQUIRED)
-
-set(_with_py_bindings "@BUILD_PYTHON_BINDINGS@")
-if(_with_py_bindings)
-    find_dependency(pxr-boost 0.25.8 REQUIRED)
-endif()
-
-include(${CMAKE_CURRENT_LIST_DIR}/pxr-plug-targets.cmake)