Merge pull request #448 from Unity-Technologies/Uni-68872-fix-package-validation

Fixed issues causing package validation failure

Author: mjmvisser

CMakeLists.txt

@@ -6,12 +6,28 @@ MESSAGE(STATUS "CMAKE_INSTALL_PREFIX is: " ${CMAKE_INSTALL_PREFIX})
 project (UnityFbxExporterEditorPackage NONE)
 
 ###########################################################################
-# Get git tag as package version
 
+# Get git tag as package version
 find_package(Git REQUIRED)
 execute_process(COMMAND ${GIT_EXECUTABLE} describe --tags HEAD
-                OUTPUT_VARIABLE COM_UNITY_FORMATS_FBX_VERSION
-                OUTPUT_STRIP_TRAILING_WHITESPACE) 
+        OUTPUT_VARIABLE PACKAGE_VERSION
+        OUTPUT_STRIP_TRAILING_WHITESPACE)
+# only keep x.y.z[-preview.n]
+string(REGEX REPLACE "^.*([0-9]\.[0-9]\.[0-9].*)$" "\\1" PACKAGE_VERSION "${PACKAGE_VERSION}")
+
+# Get git revision hash as package revision
+execute_process(COMMAND ${GIT_EXECUTABLE} rev-parse HEAD
+        OUTPUT_VARIABLE PACKAGE_REVISION
+        OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+# Get git repo url
+execute_process(COMMAND ${GIT_EXECUTABLE} config --get remote.origin.url
+        OUTPUT_VARIABLE PACKAGE_REPO_URL
+        OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+configure_file(${CMAKE_SOURCE_DIR}/proto.com.unity.formats.fbx/package.json.in ${CMAKE_BINARY_DIR}/package.json @ONLY)
+
+configure_file(${CMAKE_SOURCE_DIR}/proto.com.unity.formats.fbx/Documentation~/index.md.in ${CMAKE_BINARY_DIR}/index.md @ONLY)
 
 ###########################################################################
 # Zip integrations folder
@@ -67,12 +83,17 @@ add_custom_target(${MAX_INTEGRATION_ZIP_TARGET} ALL DEPENDS ${MAX_INTEGRATION_ZI
 install(
     DIRECTORY "${CMAKE_SOURCE_DIR}/proto.com.unity.formats.fbx/"
     DESTINATION "${CMAKE_INSTALL_PREFIX}/com.unity.formats.fbx"
+    PATTERN "*.in" EXCLUDE
 )
 install(
     FILES "${CMAKE_BINARY_DIR}/${MAYA_INTEGRATION_ZIP_NAME}" "${CMAKE_BINARY_DIR}/${MAX_INTEGRATION_ZIP_NAME}"
     DESTINATION "${CMAKE_INSTALL_PREFIX}/com.unity.formats.fbx/Editor/Integrations~"
 )
 install(
-    FILES "${CMAKE_SOURCE_DIR}/CHANGELOG.md" "${CMAKE_SOURCE_DIR}/LICENSE.md" 
+    FILES "${CMAKE_BINARY_DIR}/index.md"
+    DESTINATION "${CMAKE_INSTALL_PREFIX}/com.unity.formats.fbx/Documentation~"
+)
+install(
+    FILES "${CMAKE_SOURCE_DIR}/CHANGELOG.md" "${CMAKE_SOURCE_DIR}/LICENSE.md" "${CMAKE_BINARY_DIR}/package.json"
     DESTINATION "${CMAKE_INSTALL_PREFIX}/com.unity.formats.fbx"
 )

proto.com.unity.formats.fbx/Documentation~/index.md renamed to proto.com.unity.formats.fbx/Documentation~/index.md.in

@@ -1,6 +1,6 @@
 # FBX Exporter 
 
-__Version__: 2.0.0-preview
+__Version__: @PACKAGE_VERSION@
 
 The FBX Exporter package provides round-trip workflows between Unity and 3D modeling software. Use this workflow to send geometry, Lights, Cameras, and animation from Unity to Autodesk® Maya®, Autodesk® Maya LT™, or Autodesk® 3ds Max®, and back again, with minimal effort.
 

proto.com.unity.formats.fbx/package.json renamed to proto.com.unity.formats.fbx/package.json.in

@@ -1,9 +1,11 @@
 {
 "name": "com.unity.formats.fbx",
 "displayName" : "FBX Exporter",
-"version" : "2.0.0-preview",
-"dependencies" : { "com.autodesk.fbx" : "2.0.0-preview" },
+"version" : "@PACKAGE_VERSION@",
+"dependencies" : { "com.autodesk.fbx" : "2.0.0-preview.1" },
 "unity": "2018.2",
 "description" : "The Unity FBX Exporter package makes it easy to send geometry and animation from Unity 2018.2 or later to any application that supports FBX and back again with minimal effort.\n\nIn particular, this round-trip workflow enables you to export Unity scenes to FBX, import into Maya, Maya LT, or 3ds Max using an artist-friendly interface, export Unity-ready FBX geometry and animation, and safely merge your changes back into those Assets to continue your work.\n\nThe exporter provides support for GameObject hierarchies, Materials, Textures, Cameras, Lights, Skinned Meshes, and Animation. The Unity FBX importer provides support for hierarchies, Materials, Textures, Stingray Physically Based Shader (PBS), Cameras, Animation and Animated custom properties (when present in the FBX file).\n\nThis package includes a plug-in for Autodesk Maya 2017 or later, Autodesk Maya LT 2017 or later, and 3ds Max 2017 or later.",
-"keywords" : [ "fbx", "animation", "modeling", "maya", "max" ]
+"keywords" : [ "fbx", "animation", "modeling", "maya", "max" ],
+"repository.url": "@PACKAGE_REPO_URL@",
+"repository.revision": "@PACKAGE_REVISION@"
 }