CR changes

Author: inwoods

Assets/FbxExporters/Editor/InstallIntegration.cs

@@ -13,8 +13,9 @@ class Integrations
         private const string VERSION_FIELD = "**Version**";
         private const string VERSION_TAG = "{Version}";
         private const string PROJECT_TAG = "{UnityProject}";
+        private const string INTEGRATION_TAG = "{UnityIntegrationsPath}";
 
-        private const string FBX_EXPORT_SETTINGS_PATH = "FbxExporters/Integrations/Autodesk/maya/scripts/unityFbxExportSettings.mel";
+        private const string FBX_EXPORT_SETTINGS_PATH = "/Integrations/Autodesk/maya/scripts/unityFbxExportSettings.mel";
 
         private const string MAYA_INSTRUCTION_FILENAME = "_safe_to_delete/_temp.txt";
 
@@ -131,7 +132,7 @@ public static string GetFullMayaInstructionPath()
         /// <returns>The export settings path.</returns>
         public static string GetExportSettingsPath()
         {
-            return FBX_EXPORT_SETTINGS_PATH;
+            return INTEGRATION_FOLDER_PATH + FBX_EXPORT_SETTINGS_PATH;
         }
 
         public static string GetPackageVersion()
@@ -338,7 +339,8 @@ public static bool InstallMaya(bool verbose = false)
                 Dictionary<string,string> Tokens = new Dictionary<string,string>()
                 {
                     {VERSION_TAG, GetPackageVersion() },
-                    {PROJECT_TAG, GetProjectPath() }
+                    {PROJECT_TAG, GetProjectPath() },
+                    {INTEGRATION_TAG, INTEGRATION_FOLDER_PATH },
                  };
 
                 // parse template, replace "{UnityProject}" with project path

Assets/FbxExporters/README.txt

@@ -4,7 +4,7 @@ Copyright (c) 2017 Unity Technologies. All rights reserved.
 
 See LICENSE.txt file for full license information.
 
-**Version**: build20170921001 build20170921001 0.0.14a
+**Version**: 0.0.14a
 
 Requirements
 ------------

Assets/Integrations/Autodesk/maya/scripts/unityOneClick/commands.py

@@ -268,11 +268,16 @@ def scriptCmd(cls):
         return
 
     def doIt(self, args):
+        def integrationBinPath():
+            head, tail = os.path.split(maya.cmds.pluginInfo("unityOneClickPlugin", q=True, path=True))
+            head, tail = os.path.split(head)
+            return head
 
         unityAppPath = maya.cmds.optionVar(q='UnityApp')
         unityProjectPath = maya.cmds.optionVar(q='UnityProject')
         unityTempSavePath = os.path.join(unityProjectPath, "Assets", maya.cmds.optionVar(q='UnityTempSavePath'))
         unityCommand = "FbxExporters.Review.TurnTable.LastSavedModel"
+
         if maya.cmds.optionVar(exists='UnityInstructionPath'):
             instructionFile = os.path.join(unityProjectPath, "Assets", maya.cmds.optionVar(q='UnityInstructionPath'))
         else:
@@ -316,7 +321,7 @@ def doIt(self, args):
 
         elif maya.cmds.about(windows=True):
             melCommand = r'system("start \"{0}\" \"{1}\" \"{2}\" \"-projectPath {3} -executeMethod {4}\"");'\
-                .format(unityProjectPath + "/Assets/FbxExporters/Integrations/BringToFront.exe", 
+                .format(integrationBinPath() + "/BringToFront.exe",
                         os.path.basename(unityProjectPath), unityAppPath,
                         unityProjectPath, unityCommand)
 

Assets/Integrations/Autodesk/maya/unityoneclick.txt

@@ -13,4 +13,4 @@
 #
 ########################################################################
 
-+ unityoneclick {Version} {UnityProject}/Assets/FbxExporters/Integrations/Autodesk/maya
++ unityoneclick {Version} {UnityIntegrationsPath}/Integrations/Autodesk/maya

CMakeLists.txt

@@ -77,9 +77,14 @@ set(FBXSDK_PACKAGE_TARGET import_fbxsdk)
 add_custom_target(
     ${FBXSDK_PACKAGE_TARGET}
     COMMAND "${UNITY_EDITOR_PATH}" -projectPath "${CMAKE_SOURCE_DIR}" -importPackage ${FBXSDK_PACKAGE_PATH} -quit
-    COMMAND ${CMAKE_COMMAND} -E rename "${CMAKE_SOURCE_DIR}/Assets/FbxSdk" "${CMAKE_SOURCE_DIR}/Assets/FbxExporters/FbxSdk"
 )
 
+IF(IS_DIRECTORY "${CMAKE_SOURCE_DIR}/Assets/FbxSdk")
+    file(RENAME "${CMAKE_SOURCE_DIR}/Assets/FbxSdk" "${CMAKE_SOURCE_DIR}/Assets/FbxExporters/FbxSdk")
+ELSE()
+    message("Error failed to install FbxSdk")
+ENDIF()
+
 ###########################################################################
 # TODO: Add target to replace the version number in README.txt
 
@@ -92,7 +97,9 @@ set(MAYA_INTEGRATION_ZIP_NAME "unityoneclick_for_maya.zip")
 file(REMOVE "${CMAKE_SOURCE_DIR}/Assets/FbxExporters/${MAYA_INTEGRATION_ZIP_NAME}")
 # remove .pyc files that we don't want to ship
 file(GLOB PYC_FILES "${CMAKE_SOURCE_DIR}/Assets/Integrations/Autodesk/maya/scripts/unityOneClick/*.pyc")
-file(REMOVE ${PYC_FILES})
+IF( PYC_FILES )
+    file(REMOVE ${PYC_FILES})
+ENDIF()
 
 add_custom_command(OUTPUT ${MAYA_INTEGRATION_ZIP_NAME}
     COMMAND ${CMAKE_COMMAND} -E tar "cfv" ${CMAKE_SOURCE_DIR}/Assets/FbxExporters/${MAYA_INTEGRATION_ZIP_NAME} --format=zip