CMake use mono (USDU-160) (#241)

Fixes USD.NET OSX issues
Building USD.NET with custom Mono is now available but optional. Default is still to use the version provided by Unity

Author: judubu

CMakeLists.txt

@@ -15,6 +15,8 @@ project(usd-unity-sdk)
 set(BUILD_USD_NET FALSE CACHE BOOL "Build USD.NET.dll and USD.NET.Unity.dll")
 set(BUILD_USDCS TRUE CACHE BOOL "Build USD C# bindings")
 set(BUILD_TESTS FALSE CACHE BOOL "Build USD.NET tests")
+set(PYTHON_VERSION "3.6" CACHE STRING "Python version to use")
+set(USE_CUSTOM_MONO FALSE CACHE BOOL "Use a standalon version of mono. If false, use the Mono version provided by Unity.")
 
 message("${PXR_USD_LOCATION_PYTHON_BUILD}")
 if (NOT PXR_USD_LOCATION_PYTHON_BUILD)
@@ -25,10 +27,16 @@ set(USD_PKG_DIR ${CMAKE_SOURCE_DIR}/package/com.unity.formats.usd)
 set(USD_PLUGINS_DIR ${USD_PKG_DIR}/Runtime/Plugins)
 
 find_package(USD REQUIRED)
-find_package(PythonInterp 3.6 REQUIRED COMPONENTS Interpreter)
+find_package(PythonInterp ${PYTHON_VERSION} REQUIRED COMPONENTS Interpreter)
 message("Python exec ${Python3_FOUND}   ${Python3_EXECUTABLE} ${Python3_INTERPRETER_ID}")
-if (BUILD_USD_NET)
-    find_package(Unity REQUIRED)
+
+if (BUILD_USD_NET OR BUILD_TESTS)
+    if (USE_CUSTOM_MONO)
+        # Unity Mono is currently 5.11 (custom) so standalonee mono should be close
+        find_package(Mono REQUIRED)
+    else ()
+        find_package(Unity REQUIRED)
+    endif()
 endif()
 
 add_subdirectory(src)

bin/add_MonoPInvokeCallback_attribute.py

@@ -23,7 +23,6 @@
                       "CreateString("]
 
 def decorate(line):
-    print("decorating: {0}".format(line))
     leading_spaces = len(line) - len(line.lstrip(' '))
     decorated = ["{0}{1}".format(" "*leading_spaces, d) for d in DECORATORS]
     decorated.append(line)
@@ -36,12 +35,14 @@ def main():
     cwd = os.path.abspath(os.path.dirname(__file__))
     filein_path = os.path.join(cwd, build_path, "UsdCsPINVOKE.cs")
     fileout_path = os.path.join(cwd, build_path, "UsdCsPINVOKE.cs.out")
+    prev_line = ""
     with open(filein_path, "r") as filein, open(fileout_path, "w") as fileout:
         for line in filein:
-            if any(methods in line for methods in METHODS_TO_DECORATE):
+            if DECORATORS[1] not in prev_line and any(methods in line for methods in METHODS_TO_DECORATE):
                 fileout.write(decorate(line))
             else:
                 fileout.write(line)
+            prev_line = line
     os.replace(fileout_path, filein_path)
 
 if __name__ == "__main__":

bin/build.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python -B
+#!/usr/bin/env python3 -B
 from builtins import FileNotFoundError
 
 import logging
@@ -78,11 +78,13 @@ def download_usd_binaries(usd_version, python_version=PYTHON_VERSION, output_dir
     parser.add_argument("--download", dest="download_usd_binaries", action="store_true", default=False,
                         help="Download USD binaries from Unity's Stevedore internal repository. "
                         "Refer to BUILDING.md for command used to build the libraries")
-    parser.add_argument("--target", dest="cmake_target", action="store_const", const="clean", default="install",
+    parser.add_argument("--clean", dest="cmake_target", action="store_const", const="clean", default="install",
                         help="Call cmake with the clean target.")
-    parser.add_argument("--component", dest="component", choices=["usdcs", "usdnet"], default="usdcs")
+    parser.add_argument("--component", dest="component", choices=["usdcs", "usdnet", "tests"], default="usdcs")
     parser.add_argument("-v", "--verbose", action="store_true", default=False,
                         help="Set the CMake verbose flag.")
+    parser.add_argument("--use_custom_mono", action="store_true", default=False,
+                        help="Use a custom mono version. Default is to use the mono compiler provided by Unity.")
 
     args = parser.parse_args()
 
@@ -118,6 +120,8 @@ def download_usd_binaries(usd_version, python_version=PYTHON_VERSION, output_dir
         build_dir += "_usdcs"
     elif args.component == "usdnet":
         build_dir += "_usdnet"
+    elif args.component == "tests":
+        build_dir += "_tests"
     if not os.path.exists(build_dir):
         os.mkdir(build_dir)
 
@@ -127,13 +131,16 @@ def download_usd_binaries(usd_version, python_version=PYTHON_VERSION, output_dir
                           "-DUNITY_VERSION={} ",
                           "-DBUILD_USDCS={} ",
                           "-DBUILD_USD_NET={} ",
+                          "-DBUILD_TESTS={} ",
                           "-DCMAKE_BUILD_TYPE=RelWithDebInfo",
-                          "-DCMAKE_MODULE_PATH=./cmake/modules "]).format(build_dir, usd_no_python_dir_path,
+                          "-DCMAKE_MODULE_PATH=./cmake/modules",
+                          "-DUSE_CUSTOM_MONO={} "]).format(build_dir, usd_no_python_dir_path,
                                                                           usd_python_dir_path,
                                                                           args.unity_version,
                                                                           args.component == "usdcs",
                                                                           args.component == "usdnet",
-                                                                          args.unity_version)
+                                                                          args.component == "tests",
+                                                                          args.use_custom_mono)
 
     if args.verbose:
         cmake_cmd += "-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON "

cmake/ilm_static_lib.patch

@@ -46,11 +46,7 @@ FILE(GLOB usd_kind ${CMAKE_BINARY_DIR}/generated/Kind*.cs)
 FILE(INSTALL ${usd_kind} DESTINATION ${CMAKE_SOURCE_DIR}/../src/USD.NET/generated/pxr/usd/kind)
 LIST(APPEND SWIG_FILES pxr/usd/kind/*.cs)
 
-FILE(GLOB usd__ndr ${CMAKE_BINARY_DIR}/generated/_Ndr*.cs)
-FILE(INSTALL ${usd__ndr} DESTINATION ${CMAKE_SOURCE_DIR}/../src/USD.NET/generated/pxr/usd/ndr)
-LIST(APPEND SWIG_FILES pxr/usd/ndr/*.cs)
-
-FILE(GLOB usd_ndr ${CMAKE_BINARY_DIR}/generated/ndr*.cs)
+FILE(GLOB usd_ndr ${CMAKE_BINARY_DIR}/generated/Ndr*.cs)
 FILE(INSTALL ${usd_ndr} DESTINATION ${CMAKE_SOURCE_DIR}/../src/USD.NET/generated/pxr/usd/ndr)
 LIST(APPEND SWIG_FILES pxr/usd/ndr/*.cs)