Sign Emgu.TF.Lite, Emgu.TF.Lite.Models & Emgu.TF.Protobuf

emgucv · Jun 10, 2024 · f888a6b · f888a6b
1 parent 77297cb
commit f888a6b
Show file tree

Hide file tree

Showing 7 changed files with 105 additions and 231 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
diff --git a/Emgu.TF.Lite.Models/CMakeLists.txt b/Emgu.TF.Lite.Models/CMakeLists.txt
@@ -42,18 +42,20 @@ IF(HAVE_LITE_BUILD)
     PROJECT(Emgu.TF.Lite.Models.Netstandard)
 
     BUILD_DOTNET_PROJ(${PROJECT_NAME} "${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}/${PROJECT_NAME}.csproj" "" ALL)
-
-    IF (EMGU_SIGN_FOUND)
-      EMGU_SIGN_BINARY(${PROJECT_NAME}  ${LIBRARY_OUTPUT_PATH}/Emgu.TF.Lite.Models.dll)
-    ENDIF()
+
+    # Binary signing should be done during project build time.
+    #IF (EMGU_SIGN_FOUND)
+    #  EMGU_SIGN_BINARY(${PROJECT_NAME} ${LIBRARY_OUTPUT_PATH}/Build/Emgu.TF.Lite.Models/AnyCPU/Release/netstandard2.0/Emgu.TF.Lite.Models.dll)
+    #  EMGU_SIGN_BINARY(${PROJECT_NAME} ${LIBRARY_OUTPUT_PATH}/Build/Emgu.TF.Lite.Models/AnyCPU/Release/net8.0-ios/Emgu.TF.Lite.Models.dll)
+    #  EMGU_SIGN_BINARY(${PROJECT_NAME} ${LIBRARY_OUTPUT_PATH}/Build/Emgu.TF.Lite.Models/AnyCPU/Release/net8.0-maccatalyst/Emgu.TF.Lite.Models.dll)
+    #ENDIF()
 
     ADD_DEPENDENCIES(${PROJECT_NAME} Emgu.TF.Lite.Netstandard)
 
     INSTALL(
-      FILES 
-      ${LIBRARY_OUTPUT_PATH}/Emgu.TF.Lite.Models.dll
-      ${LIBRARY_OUTPUT_PATH}/Emgu.TF.Lite.Models.xml
-      DESTINATION ${CPACK_PACKAGE_CLI_FOLDER}
+      DIRECTORY 
+      ${LIBRARY_OUTPUT_PATH}/Build/Emgu.TF.Lite.Models
+      DESTINATION lib
       COMPONENT emgutf_binary)
   ENDIF()
 ENDIF()

diff --git a/Emgu.TF.Lite/CMakeLists.txt b/Emgu.TF.Lite/CMakeLists.txt
@@ -51,15 +51,15 @@ IF (DOTNET_FOUND)
 	IF (WIN32 AND HAVE_WINDESKTOP_X86_LITE)
       EMGU_SIGN_BINARY(${PROJECT_NAME} ${LIBRARY_OUTPUT_PATH}/runtimes/win-x86/native/tfliteextern.dll)
     ENDIF()
-    EMGU_SIGN_BINARY(${PROJECT_NAME} ${LIBRARY_OUTPUT_PATH}/Emgu.TF.Lite.dll)
+    #Binary signing should be done during project build time
+    #EMGU_SIGN_BINARY(${PROJECT_NAME} ${LIBRARY_OUTPUT_PATH}/Emgu.TF.Lite.dll)
   ENDIF()
 
   INSTALL(
-    FILES 
-    ${LIBRARY_OUTPUT_PATH}/Emgu.TF.Lite.xml
-    ${LIBRARY_OUTPUT_PATH}/Emgu.TF.Lite.dll 
-    DESTINATION ${CPACK_PACKAGE_CLI_FOLDER}
+    DIRECTORY
+    ${LIBRARY_OUTPUT_PATH}/Build/Emgu.TF.Lite
+    DESTINATION lib
     COMPONENT emgutf_binary)
 
 ENDIF()
-ENDIF()
+ENDIF()
diff --git a/cmake/Emgu.TF.Lite.Directory.Build.props.in b/cmake/Emgu.TF.Lite.Directory.Build.props.in
@@ -45,5 +45,6 @@ http://www.emgu.com/wiki/files/emgutflite/${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK
   <!-- https://learn.microsoft.com/en-us/visualstudio/msbuild/customize-by-directory?view=vs-2022 -->
   <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
   ${EMGUTF_LITE_POST_PROCESS_BINARY}
+  ${EMGUTF_LITE_POST_PROCESS_NUGET}
 
 </Project>
diff --git a/cmake/Emgu.TF.Lite.Models.Directory.Build.props.in b/cmake/Emgu.TF.Lite.Models.Directory.Build.props.in
@@ -44,6 +44,6 @@ http://www.emgu.com/wiki/files/emgutflite/${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK
 
   <!-- https://learn.microsoft.com/en-us/visualstudio/msbuild/customize-by-directory?view=vs-2022 -->
   <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
-  ${EMGUTF_LITE_POST_PROCESS_BINARY}
-
+  ${EMGUTF_LITE_MODELS_POST_PROCESS_BINARY}
+  ${EMGUTF_LITE_MODELS_POST_PROCESS_NUGET}
 </Project>
diff --git a/cmake/Emgu.TF.Lite.Models.Package.nuspec.in b/cmake/Emgu.TF.Lite.Models.Package.nuspec.in
diff --git a/cmake/Emgu.TF.Protobuf.Directory.Build.props.in b/cmake/Emgu.TF.Protobuf.Directory.Build.props.in
@@ -44,5 +44,5 @@ http://www.emgu.com/wiki/files/emgutf/${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PAC
 
   <!-- https://learn.microsoft.com/en-us/visualstudio/msbuild/customize-by-directory?view=vs-2022 -->
   <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
-  ${EMGUTF_POST_PROCESS_BINARY} 
+  ${EMGUTF_PROTOBUF_POST_PROCESS_BINARY} 
 </Project>