Fix for Autodesk-default MAYA_LOCATION on OSX.

Also made the AdskRoot a const rather than a function, and clarified the
expected output of some unit tests.

Author: Benoit Hudson

Assets/FbxExporters/Editor/InstallIntegration.cs

@@ -32,14 +32,16 @@ public MayaVersion(string desiredVersion = "") {
                 // If the location is given by the environment, use it.
                 Location = System.Environment.GetEnvironmentVariable ("MAYA_LOCATION");
                 if (!string.IsNullOrEmpty(Location)) {
+                    Location = Location.TrimEnd('/');
+                    Debug.Log("Using maya set by MAYA_LOCATION: " + Location);
                     return;
                 }
 
                 // List that directory and find the right version:
                 // either the newest version, or the exact version we wanted.
                 string mayaRoot = "";
                 string bestVersion = "";
-                var adskRoot = new System.IO.DirectoryInfo(GetAdskRoot());
+                var adskRoot = new System.IO.DirectoryInfo(AdskRoot);
                 foreach(var productDir in adskRoot.GetDirectories()) {
                     var product = productDir.Name;
 
@@ -71,22 +73,27 @@ public MayaVersion(string desiredVersion = "") {
                                 "Unable to find any version of maya. Set MAYA_LOCATION."));
                 }
 
-                Location = GetAdskRoot() + "/" + mayaRoot;
+                Location = AdskRoot + "/" + mayaRoot;
+                if (string.IsNullOrEmpty(desiredVersion)) {
+                    Debug.Log("Using latest version of maya found in: " + Location);
+                } else {
+                    Debug.Log(string.Format("Using maya {0} found in: {1}", desiredVersion, Location));
+                }
             }
 
             /// <summary>
             /// The path where all the different versions of Maya are installed
             /// by default. Depends on the platform.
             /// </summary>
-            public static string GetAdskRoot() {
+            public const string AdskRoot =
 #if UNITY_EDITOR_OSX
-                return "/Applications/Autodesk";
+                "/Applications/Autodesk"
 #elif UNITY_EDITOR_LINUX
-                return "/usr/autodesk";
+                "/usr/autodesk"
 #else // WINDOWS
-                return "C:/Program Files/Autodesk";
+                "C:/Program Files/Autodesk"
 #endif
-            }
+            ;
 
             /// <summary>
             /// The value that you might set MAYA_LOCATION to if you wanted to
@@ -100,9 +107,13 @@ public static string GetAdskRoot() {
             public string MayaExe {
                 get {
 #if UNITY_EDITOR_OSX
-                    // MAYA_LOCATION on mac might be the app bundle itself, or
-                    // the directory in which the app bundle is stored.
-                    if (Location.EndsWith(".app")) {
+                    // MAYA_LOCATION on mac is set by Autodesk to be the
+                    // Contents directory. But let's make it easier on people
+                    // and allow just having it be the app bundle or a
+                    // directory that holds the app bundle.
+                    if (Location.EndsWith(".app/Contents")) {
+                        return Location + "/MacOS/Maya";
+                    } else if (Location.EndsWith(".app")) {
                         return Location + "/Contents/MacOS/Maya";
                     } else {
                         return Location + "/Maya.app/Contents/MacOS/Maya";

Assets/FbxExporters/Editor/UnitTests/IntegrationsTest.cs

@@ -28,7 +28,7 @@ void LogNonEmptyString(string name, string str) {
         [Test]
         public void BasicTest() {
             // Note: This test assumes that Maya is actually installed in a default location.
-            Assert.IsTrue(Directory.Exists(Editor.Integrations.MayaVersion.GetAdskRoot()));
+            Assert.IsTrue(Directory.Exists(Editor.Integrations.MayaVersion.AdskRoot));
 
             var maya = new Editor.Integrations.MayaVersion();
 
@@ -38,8 +38,8 @@ public void BasicTest() {
 
             Assert.IsFalse(Editor.Integrations.IsHeadlessInstall());
 
-            LogNonEmptyString("module path", Editor.Integrations.GetModulePath("2017"));
-            LogNonEmptyString("module template path", Editor.Integrations.GetModuleTemplatePath("2017"));
+            LogNonEmptyString("module path (2017)", Editor.Integrations.GetModulePath("2017"));
+            LogNonEmptyString("module template path (2017)", Editor.Integrations.GetModuleTemplatePath("2017"));
             Assert.That( () => Editor.Integrations.GetModuleTemplatePath("bad version"),
                     Throws.Exception.TypeOf<Editor.Integrations.MayaException>());