Merge pull request #3 from ababak/dev

Add support for Maya 2026

Author: ababak

.gitignore

@@ -25,6 +25,9 @@ venv*
 # Installer logs
 pip-log.txt
 
+# NOX
+.nox
+
 # Unit test / coverage reports
 .coverage
 .tox

Dockerfile

@@ -3,9 +3,9 @@
 # Andriy Babak <ababak@gmail.com>
 #
 # Build the docker image:
-# docker build --rm -t ababak/cgcpp:1.7 .
-# docker run --rm -v "$(pwd):c:/source:ro" -r "$(pwd)/out:c:/out" ababak/cgcpp:1.7
-# docker run --rm -v "$(pwd -W):c:/source:ro" -v "$(pwd -W)/out:c:/out" ababak/cgcpp:1.7
+# docker build --rm -t ababak/cgcpp:1.8 .
+# docker run --rm -v "$(pwd):c:/source:ro" -r "$(pwd)/out:c:/out" ababak/cgcpp:1.8
+# docker run --rm -v "$(pwd -W):c:/source:ro" -v "$(pwd -W)/out:c:/out" ababak/cgcpp:1.8
 # See README.md for details
 
 FROM ababak/boost:latest as base

README.md

@@ -8,7 +8,7 @@ A universal solution for common needs in C++ in computer graphics software.
 - Python 3.10, Boost 1.80.0 on Windows
 - Python 3.11, Boost 1.82.0 on Windows
 - Python 3.12, Boost 1.85.0 on Windows
-- Autodesk Maya 2023-2025 on Windows *(Python 3.9 and Boost 1.76.0 in Maya 2023, Python 3.10 and Boost 1.80.0 in Maya 2024, Python 3.11 and Boost 1.82.0 in Maya 2025)*
+- Autodesk Maya 2023-2025 on Windows *(Python 3.9 and Boost 1.76.0 in Maya 2023, Python 3.10 and Boost 1.80.0 in Maya 2024, Python 3.11 and Boost 1.82.0 in Maya 2025, Python 3.11 and Boost 1.85.0 in Maya 2026)*
 - SideFX Houdini 19.5-20.5 on Windows *(Python 3.9 and Boost 1.76.0 in Houdini 19.5, Python 3.10 and Boost 1.80.0 in Houdini 20.0, Python 3.11 and Boost 1.82.0 in Houdini 20.5)*
 
 Support for other platforms and other DCC applications may come later.

build_plugin.py

@@ -0,0 +1,92 @@
+"""
+(c) Andriy Babak 2025
+
+date: 02/04/2025
+modified: 02/04/2025 13:19:52
+
+Author: Andriy Babak
+e-mail: ababak@gmail.com
+------------------------------
+description: cgcpp
+------------------------------
+"""
+
+# /// script
+# dependencies = [
+#     "setuptools",
+#     "toml",
+# ]
+# ///
+
+import argparse
+import os
+import shutil
+import subprocess
+import sys
+from pathlib import Path
+
+import toml
+
+
+def get_version() -> str:
+    """Read package version from the pyproject.toml file."""
+    with open("pyproject.toml", encoding="utf-8") as fd:
+        pyproject = toml.load(fd)
+    return pyproject["project"]["version"]
+
+
+def get_build_name():
+    """Parse the package and retreive the build name."""
+    name = Path.cwd().name
+    version = get_version()
+    build_name = f"{name}-{version}"
+    return build_name
+
+
+def process():
+    """Run the build step."""
+    parser = argparse.ArgumentParser()
+    parser.add_argument(
+        "-r",
+        "--rebuild",
+        help="Rebuild the resources archive",
+        action="store_true",
+    )
+    args = parser.parse_args()
+    build_plugin(rebuild=args.rebuild)
+
+
+def build_plugin(rebuild: bool = False) -> Path:
+    """Run the build step."""
+    root_path = Path(__file__).parent
+    build_path = root_path / "build"
+    build_name = get_build_name()
+    archive_name = f"{build_name}.zip"
+    staging_path = build_path / build_name
+    plugin_zip_path = build_path / archive_name
+    if plugin_zip_path.is_file() and not rebuild:
+        print(f"Archive already exists: {plugin_zip_path}")
+        return plugin_zip_path
+
+    # Clean staging path
+    print(f'Preparing to stage: "{build_name}"')
+    shutil.rmtree(staging_path, ignore_errors=True)
+    print(f'Building: "{build_name}"')
+    subprocess.check_call(
+        [sys.executable, "-m", "pip", "install", ".", "--target", staging_path]
+    )
+    # Generate plugin zip
+    print(f'Archiving: "{build_name}"')
+    plugin_zip_path = Path(
+        shutil.make_archive(
+            base_name=os.path.join(build_path, build_name),
+            format="zip",
+            root_dir=staging_path,
+        )
+    )
+    print(f'Archive created: "{plugin_zip_path}"')
+    return plugin_zip_path
+
+
+if __name__ == "__main__":
+    raise SystemExit(process())

cmake/build_functions.cmake

@@ -13,21 +13,26 @@
 function(build_maya_module MAYA_VERSION PROJECT_BUILD_TYPE)
     find_package (Maya REQUIRED)
     set (CMAKE_BUILD_TYPE "${PROJECT_BUILD_TYPE}" CACHE INTERNAL "" FORCE)
-    if (MAYA_VERSION VERSION_LESS 2024)
+    if (MAYA_VERSION VERSION_EQUAL 2023)
         set(PYTHON_REQUESTED_VERSION 3.9)
         set(Python_ROOT_DIR "C:/Python39")
         set(BOOST_REQUESTED_VERSION 1.76.0)
         set(BOOST_ROOT "C:/local/boost_1_76_0")
-    elseif (MAYA_VERSION VERSION_LESS 2025)
+    elseif (MAYA_VERSION VERSION_EQUAL 2024)
         set(PYTHON_REQUESTED_VERSION 3.10)
         set(Python_ROOT_DIR "C:/Python310")
         set(BOOST_REQUESTED_VERSION 1.80.0)
         set(BOOST_ROOT "C:/local/boost_1_80_0")
-    elseif (MAYA_VERSION VERSION_LESS 2026)
+    elseif (MAYA_VERSION VERSION_EQUAL 2025)
         set(PYTHON_REQUESTED_VERSION 3.11)
         set(Python_ROOT_DIR "C:/Python311")
         set(BOOST_REQUESTED_VERSION 1.82.0)
         set(BOOST_ROOT "C:/local/boost_1_82_0")
+    elseif (MAYA_VERSION VERSION_EQUAL 2026)
+        set(PYTHON_REQUESTED_VERSION 3.11)
+        set(Python_ROOT_DIR "C:/Python311")
+        set(BOOST_REQUESTED_VERSION 1.85.0)
+        set(BOOST_ROOT "C:/local/boost_1_85_0")
     else ()
         message( FATAL_ERROR "Unsupported Maya version: ${MAYA_VERSION}" )
     endif ()
@@ -74,16 +79,21 @@ function(build_houdini_module HOUDINI_VERSION PROJECT_BUILD_TYPE)
     # specifying this path.
     list(APPEND CMAKE_PREFIX_PATH "${HFS}/toolkit/cmake")
     find_package (Houdini REQUIRED)
-    if (Houdini_VERSION VERSION_LESS 20.0)
+    if (Houdini_VERSION VERSION_EQUAL 19.5)
         set(PYTHON_REQUESTED_VERSION 3.9)
         set(Python_ROOT_DIR "C:/Python39")
         set(BOOST_REQUESTED_VERSION 1.76.0)
         set(BOOST_ROOT "C:/local/boost_1_76_0")
-    elseif (Houdini_VERSION VERSION_LESS 20.5)
+    elseif (Houdini_VERSION VERSION_EQUAL 20.0)
         set(PYTHON_REQUESTED_VERSION 3.10)
         set(Python_ROOT_DIR "C:/Python310")
         set(BOOST_REQUESTED_VERSION 1.80.0)
         set(BOOST_ROOT "C:/local/boost_1_80_0")
+    elseif (Houdini_VERSION VERSION_EQUAL 20.5)
+        set(PYTHON_REQUESTED_VERSION 3.11)
+        set(Python_ROOT_DIR "C:/Python311")
+        set(BOOST_REQUESTED_VERSION 1.82.0)
+        set(BOOST_ROOT "C:/local/boost_1_82_0")
     else ()
         message( FATAL_ERROR "Unsupported Houdini version: ${HOUDINI_VERSION}" )
     endif ()

noxfile.py

@@ -0,0 +1,25 @@
+"""
+(c) Andriy Babak 2025
+
+date: 02/04/2025
+modified: 02/04/2025 13:14:21
+
+Author: Andriy Babak
+e-mail: ababak@gmail.com
+------------------------------
+description: cgcpp
+------------------------------
+"""
+
+import nox
+
+
+@nox.session(default=False)
+def tests(session):
+    session.install("pytest")
+    session.run("pytest")
+
+
+@nox.session
+def build_plugin(session):
+    session.install_and_run_script("build_plugin.py", *session.posargs)

package.json

@@ -0,0 +1,19 @@
+[project]
+dependencies = []
+name = "cgcpp"
+version = "1.8.0"
+description = "CG C++ Support module"
+authors = [{ name = "Andriy Babak", email = "ababak@gmail.com" }]
+license = "Apache-2.0"
+readme = { file = "README.md", content-type = "text/markdown" }
+
+[project.urls]
+Homepage = "https://github.com/ababak/cgcpp"
+Repository = "https://github.com/ababak/cgcpp.git"
+
+[build-system]
+requires = ["setuptools", "toml"]
+build-backend = "setuptools.build_meta"
+
+[tool.setuptools.packages.find]
+where = ["source/"]