Skip to content

Commit 01670c3

Browse files
committed
code review fixes
- use different zip app on OSX - use REMOVE_RECURSE to remove FbxSdk folder - search for latest package in FbxSharpBuild - package only FbxExporter folder (moved FbxSdk into FbxExporters)
1 parent f8d2966 commit 01670c3

File tree

2 files changed

+25
-4
lines changed

2 files changed

+25
-4
lines changed

Assets/FbxExporters/Editor/InstallIntegration.cs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -526,7 +526,11 @@ public static bool DirectoryHasWritePermission(string path)
526526

527527
public static void DecompressZip(string zipPath, string destPath){
528528
System.Diagnostics.Process myProcess = new System.Diagnostics.Process();
529-
myProcess.StartInfo.FileName = string.Format("\"{0}\"", EditorApplication.applicationContentsPath + "/Tools/7z.exe");
529+
var ZIPAPP = "7z.exe";
530+
#if UNITY_EDITOR_OSX
531+
ZIPAPP = "7za.exe";
532+
#endif
533+
myProcess.StartInfo.FileName = EditorApplication.applicationContentsPath + "/Tools/" + ZIPAPP;
530534
myProcess.StartInfo.WindowStyle = System.Diagnostics.ProcessWindowStyle.Hidden;
531535
myProcess.StartInfo.CreateNoWindow = true;
532536
myProcess.StartInfo.UseShellExecute = false;

CMakeLists.txt

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,22 @@ endif()
2727

2828
if (NOT DEFINED FBXSDK_PACKAGE_PATH)
2929
# TODO: store the FbxSdk directly in this project
30-
set(FBXSDK_PACKAGE_PATH "${CMAKE_SOURCE_DIR}/../FbxSharpBuild/FbxSdk_${PACKAGE_VERSION}.unitypackage")
30+
set(FBXSDK_PACKAGE_PATH "${CMAKE_SOURCE_DIR}/../FbxSharpBuild")
31+
32+
# find the most recent package at the path
33+
file(GLOB FBXSDK_PACKAGES "${FBXSDK_PACKAGE_PATH}/FbxSdk_*.*.*.unitypackage")
34+
set(NEWEST_PACKAGE "")
35+
foreach(fbxsdk_package ${FBXSDK_PACKAGES})
36+
if(fbxsdk_package IS_NEWER_THAN NEWEST_PACKAGE)
37+
set(NEWEST_PACKAGE ${fbxsdk_package})
38+
endif()
39+
endforeach(fbxsdk_package)
40+
41+
if("${NEWEST_PACKAGE}" STREQUAL "")
42+
message(FATAL_ERROR "Failed to find FbxSdk Unity Package at: ${FBXSDK_PACKAGE_PATH}")
43+
else()
44+
set(FBXSDK_PACKAGE_PATH ${NEWEST_PACKAGE})
45+
endif()
3146
endif()
3247

3348
# promote warnings to errors
@@ -52,10 +67,12 @@ set(Python_ADDITIONAL_VERSIONS 2.7)
5267
###########################################################################
5368
# Import FbxSharp package
5469

70+
# remove FbxSdk folder
71+
file(REMOVE_RECURSE "${CMAKE_SOURCE_DIR}/Assets/FbxExporters/FbxSdk")
72+
5573
set(FBXSDK_PACKAGE_TARGET import_fbxsdk)
5674
add_custom_target(
5775
${FBXSDK_PACKAGE_TARGET}
58-
COMMAND rmdir /s "${CMAKE_SOURCE_DIR}/Assets/FbxSdk"
5976
COMMAND "${UNITY_EDITOR_PATH}" -projectPath "${CMAKE_SOURCE_DIR}" -importPackage ${FBXSDK_PACKAGE_PATH} -quit
6077
)
6178

@@ -82,7 +99,7 @@ add_custom_target(${MAYA_INTEGRATION_TARGET} DEPENDS ${MAYA_INTEGRATION_ZIP_NAME
8299
# Add target for creating a package
83100
add_custom_command(
84101
OUTPUT ${PACKAGE_PATH}
85-
COMMAND "${UNITY_EDITOR_PATH}" -batchmode -projectPath ${CMAKE_SOURCE_DIR} -exportPackage Assets/FbxExporters Assets/FbxSdk ${PACKAGE_PATH} -quit
102+
COMMAND "${UNITY_EDITOR_PATH}" -batchmode -projectPath ${CMAKE_SOURCE_DIR} -exportPackage Assets/FbxExporters ${PACKAGE_PATH} -quit
86103
COMMENT "Creating Unity Package ${PACKAGE_PATH}"
87104
DEPENDS ${MAYA_INTEGRATION_TARGET}
88105
)

0 commit comments

Comments
 (0)