Merge pull request #483 from Unity-Technologies/v2.0.3-preview.1

V2.0.3 preview.1 - fixes packaging for FBX exporter integrations.

Author: benoithudson

CHANGELOG.md

@@ -1,6 +1,10 @@
 # Changes in Fbx Exporter
 
 
+## [2.0.3-preview.1] - 2019-08-27
+
+FIXES
+* Integrations were missing in 2.0.2 and 2.0.1 due to a packaging bug. They are back now.
 
 ## [2.0.2-preview.1] - 2019-06-20
 

CMakeLists.txt

@@ -10,10 +10,10 @@ project (UnityFbxExporterEditorPackage NONE)
 
 set(MAYA_INTEGRATION_COPY_TARGET CopyMayaIntegration)
 set(MAYA_INTEGRATION_ZIP_TARGET ZipMayaIntegration)
-set(MAYA_INTEGRATION_ZIP_NAME "UnityFbxForMaya.zip")
+set(MAYA_INTEGRATION_ZIP_NAME "UnityFbxForMaya.7z")
 
 set(MAX_INTEGRATION_ZIP_TARGET ZipMaxIntegration)
-set(MAX_INTEGRATION_ZIP_NAME "UnityFbxForMax.zip")
+set(MAX_INTEGRATION_ZIP_NAME "UnityFbxForMax.7z")
 
 configure_file("${CMAKE_SOURCE_DIR}/Integrations/Autodesk/maya/scripts/unitySetupUI.mel.in"
     "${CMAKE_BINARY_DIR}/Integrations/Autodesk/maya/scripts/unitySetupUI.mel"
@@ -36,7 +36,7 @@ add_custom_command(OUTPUT ${MAYA_INTEGRATION_FILES}
 add_custom_target(${MAYA_INTEGRATION_COPY_TARGET} ALL DEPENDS ${MAYA_INTEGRATION_FILES})
 
 add_custom_command(OUTPUT ${MAYA_INTEGRATION_ZIP_NAME}
-    COMMAND ${CMAKE_COMMAND} -E tar "cfv" ${CMAKE_BINARY_DIR}/${MAYA_INTEGRATION_ZIP_NAME} --format=zip
+    COMMAND ${CMAKE_COMMAND} -E tar "cfv" ${CMAKE_BINARY_DIR}/${MAYA_INTEGRATION_ZIP_NAME} --format=7zip
        "${CMAKE_BINARY_DIR}/Integrations/Autodesk/maya"
     MAIN_DEPENDENCY "${CMAKE_SOURCE_DIR}/Integrations/Autodesk/maya" 
     WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
@@ -46,7 +46,7 @@ add_custom_target(${MAYA_INTEGRATION_ZIP_TARGET} ALL DEPENDS ${MAYA_INTEGRATION_
 add_dependencies(${MAYA_INTEGRATION_ZIP_TARGET} ${MAYA_INTEGRATION_COPY_TARGET})
 
 add_custom_command(OUTPUT ${MAX_INTEGRATION_ZIP_NAME}
-    COMMAND ${CMAKE_COMMAND} -E tar "cfv" ${CMAKE_BINARY_DIR}/${MAX_INTEGRATION_ZIP_NAME} --format=zip
+    COMMAND ${CMAKE_COMMAND} -E tar "cfv" ${CMAKE_BINARY_DIR}/${MAX_INTEGRATION_ZIP_NAME} --format=7zip
        "${CMAKE_SOURCE_DIR}/Integrations/Autodesk/max"
     WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
     COMMENT "Zipping 3DsMax Integration folder"

com.unity.formats.fbx/Editor/InstallIntegration.cs

@@ -96,7 +96,7 @@ internal class MayaIntegration : DCCIntegration
     {
         public override string DccDisplayName { get { return "Maya"; } }
 
-        public override string IntegrationZipPath { get { return "UnityFbxForMaya.zip"; } }
+        public override string IntegrationZipPath { get { return "UnityFbxForMaya.7z"; } }
 
         private string FBX_EXPORT_SETTINGS_PATH { get { return "/Integrations/Autodesk/maya/scripts/unityFbxExportSettings.mel"; } }
 
@@ -589,7 +589,7 @@ internal class MaxIntegration : DCCIntegration
         private const string ExportSettingsTag = "UnityFbxExportSettings";
         private const string ImportSettingsTag = "UnityFbxImportSettings";
 
-        public override string IntegrationZipPath { get { return "UnityFbxForMax.zip"; } }
+        public override string IntegrationZipPath { get { return "UnityFbxForMax.7z"; } }
 
         /// <summary>
         /// Gets the absolute Unity path for relative path in Integrations folder.

com.unity.formats.fbx/package.json

@@ -1,7 +1,7 @@
 {
   "name": "com.unity.formats.fbx",
   "displayName": "FBX Exporter",
-  "version": "2.0.2-preview.1",
+  "version": "2.0.3-preview.1",
   "dependencies": {
     "com.unity.timeline": "1.0.0",
     "com.autodesk.fbx": "2.0.1-preview.1"