Rename raspbian to Raspberry Pi OS.

CMakeLists.txt

@@ -974,7 +974,7 @@ IF(HAVE_WINSTORE_10 AND WIN32)
 ENDIF()
 
 IF(HAVE_LINUX_ARM)
-	SET(EMGUCV_RASPBIAN_NUGET_ID "${EMGUCV_NUGET_ID}.runtime.${NUGET_NATIVE_PLATFORM_ID_RASPBIAN}")
+	SET(EMGUCV_RASPBERRY_PI_NUGET_ID "${EMGUCV_NUGET_ID}.runtime.${NUGET_NATIVE_PLATFORM_ID_RASPBIAN}")
 ENDIF()
 
 IF(HAVE_LINUX_X64 OR HAVE_LINUX_X86)
@@ -1000,7 +1000,7 @@ IF ("${LICENSE_TYPE}" STREQUAL "Commercial")
 #	  SET(EMGUCV_WINDOWS_NUGET_ID "${EMGUCV_WINDOWS_NUGET_ID}-CR")
 #	ENDIF()
 #	IF(HAVE_LINUX_ARM)
-#	  SET(EMGUCV_RASPBIAN_NUGET_ID "${EMGUCV_RASPBIAN_NUGET_ID}-CR")
+#	  SET(EMGUCV_RASPBERRY_PI_NUGET_ID "${EMGUCV_RASPBERRY_PI_NUGET_ID}-CR")
 #	ENDIF()
 #    IF(HAVE_LINUX_X64 OR HAVE_LINUX_X86)
 #	  SET(EMGUCV_UBUNTU_NUGET_ID "${EMGUCV_UBUNTU_NUGET_ID}-CR")
@@ -1086,18 +1086,14 @@ IF(HAVE_WINSTORE_10)
     <file src=\"..\\..\\..\\${EMGUCV_LICENSE_FILE}\" target=\"\" />")
 ENDIF()
 
-SET(EMGUCV_RASPBIAN_NUGET_FILE_LIST "")
+SET(EMGUCV_RASPBERRY_PI_NUGET_FILE_LIST "")
 IF(HAVE_LINUX_ARM)
-	SET(EMGUCV_RASPBIAN_NUGET_FILE_LIST "${EMGUCV_RASPBIAN_NUGET_FILE_LIST} 
+	SET(EMGUCV_RASPBERRY_PI_NUGET_FILE_LIST "${EMGUCV_RASPBERRY_PI_NUGET_FILE_LIST} 
       <file src=\"..\\..\\..\\libs\\arm\\*.so\" target=\"runtimes\\${NUGET_NATIVE_PLATFORM_ID_RASPBIAN}\\native\" />")
-    SET(EMGUCV_RASPBIAN_NUGET_DEPENDENCY "    <dependencies>
+    SET(EMGUCV_RASPBERRY_PI_NUGET_DEPENDENCY "    <dependencies>
       <dependency id=\"${EMGUCV_NUGET_ID}\" version=\"${CPACK_PACKAGE_DEPENDENCY_VERSION}\" />
       </dependencies>")
-	#SET(EMGUCV_RASPBIAN_NUGET_FILE_LIST "${EMGUCV_RASPBIAN_NUGET_FILE_LIST} 
-    #<file src=\"Emgu.CV.runtime.raspbian.targets\" target=\"build\\${EMGUCV_RASPBIAN_NUGET_ID}.targets\" />
-    #<file src=\"..\\..\\..\\miscellaneous\\nuget_icon.png\" target=\"icon.png\" />
-    #<file src=\"..\\..\\..\\${EMGUCV_LICENSE_FILE}\" target=\"\" />")
-	SET(EMGUCV_RASPBIAN_NUGET_FILE_LIST "${EMGUCV_RASPBIAN_NUGET_FILE_LIST} 
+	SET(EMGUCV_RASPBERRY_PI_NUGET_FILE_LIST "${EMGUCV_RASPBERRY_PI_NUGET_FILE_LIST} 
       <file src=\"..\\..\\..\\miscellaneous\\nuget_icon.png\" target=\"icon.png\" />
       <file src=\"..\\..\\..\\${EMGUCV_LICENSE_FILE}\" target=\"\" />")
 ENDIF()
@@ -1490,12 +1486,12 @@ IF(HAVE_WINDESKTOP_X86 OR HAVE_WINDESKTOP_X64)
 ENDIF()
 
 if(HAVE_LINUX_ARM)
-  SET(EMGUCV_RASPBIAN_NUGET_TITLE "Emgu CV for Raspbian Native Runtime")
-  CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/cmake/Emgu.CV.runtime.raspbian.Package.nuspec.in ${CMAKE_CURRENT_SOURCE_DIR}/platforms/nuget/Emgu.CV.runtime.raspbian/Package.nuspec)
+  SET(EMGUCV_RASPBERRY_PI_NUGET_TITLE "Emgu CV Native Runtime for Raspberry Pi OS")
+  CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/cmake/Emgu.CV.runtime.linux-arm.Package.nuspec.in ${CMAKE_CURRENT_SOURCE_DIR}/platforms/nuget/Emgu.CV.runtime.linux-arm/Package.nuspec)
 ENDIF()
 
 if(HAVE_LINUX_X86 OR HAVE_LINUX_X64)
-  SET(EMGUCV_UBUNTU_NUGET_TITLE "Emgu CV for Ubuntu Native Runtime")
+  SET(EMGUCV_UBUNTU_NUGET_TITLE "Emgu CV Native Runtime for Ubuntu")
   CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/cmake/Emgu.CV.runtime.ubuntu.Package.nuspec.in ${CMAKE_CURRENT_SOURCE_DIR}/platforms/nuget/Emgu.CV.runtime.ubuntu/Package.nuspec)
 ENDIF()
 

cmake/Emgu.CV.runtime.raspbian.Package.nuspec.in → cmake/Emgu.CV.runtime.linux-arm.Package.nuspec.in

@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <package >
   <metadata>
-    <id>${EMGUCV_RASPBIAN_NUGET_ID}</id>
-	<title>${EMGUCV_RASPBIAN_NUGET_TITLE}</title>
+    <id>${EMGUCV_RASPBERRY_PI_NUGET_ID}</id>
+	<title>${EMGUCV_RASPBERRY_PI_NUGET_TITLE}</title>
     <version>${CPACK_PACKAGE_VERSION}</version>
     <authors>${CPACK_PACKAGE_VENDOR}</authors>
     <owners>${CPACK_PACKAGE_VENDOR}</owners>
@@ -11,16 +11,16 @@
 	<repository type="git" url="https://github.com/emgucv/emgucv" />
 	<icon>icon.png</icon>
     <requireLicenseAcceptance>true</requireLicenseAcceptance>
-	<summary>Runtime package of Emgu CV for Raspbian</summary>
-    <description>This package contains the native runtime of Emgu CV for Raspbian</description>
-    <releaseNotes>This is the ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH} release of Emgu CV for Raspbian. For online documentation please visit
+	<summary>Emgu CV native runtime for Raspberry Pi OS</summary>
+    <description>This package contains the Emgu CV native runtime for Raspberry Pi OS</description>
+    <releaseNotes>This is the ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH} release of Emgu CV native runtime for Raspberry Pi OS. For online documentation please visit
 http://www.emgu.com/wiki/files/emgucv/${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}/document/
     </releaseNotes>
-	${EMGUCV_RASPBIAN_NUGET_DEPENDENCY}
+	${EMGUCV_RASPBERRY_PI_NUGET_DEPENDENCY}
     <copyright>© ${CPACK_PACKAGE_VENDOR} ${CURRENT_YEAR}. All rights reserved.</copyright>
-    <tags>opencv emgu emgucv ai image raspbian raspberry pi</tags>
+    <tags>opencv emgu emgucv ai image raspberry pi</tags>
   </metadata>
   <files>
-  ${EMGUCV_RASPBIAN_NUGET_FILE_LIST}
+  ${EMGUCV_RASPBERRY_PI_NUGET_FILE_LIST}
   </files>
 </package>

platforms/nuget/CMakeLists.txt

@@ -23,7 +23,7 @@ ADD_SUBDIRECTORY("Emgu.CV.runtime.uwp")
 ADD_SUBDIRECTORY("Emgu.CV.runtime.ios")
 
 IF (HAVE_LINUX_ARM)
-  add_subdirectory("Emgu.CV.runtime.raspbian")
+  add_subdirectory("Emgu.CV.runtime.linux-arm")
 ENDIF()
 
 IF (HAVE_LINUX_X86 OR HAVE_LINUX_X64)

platforms/nuget/Emgu.CV.runtime.linux-arm/Emgu.CV.runtime.linux-arm.targets

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <PropertyGroup>
+      <EmguCVRaspberryPiLinkTarget>RaspberryPi_arm</EmguCVRaspberryPiLinkTarget>
+      <EmguCVRaspberryPiBuildArm Condition="'$(Platform)'=='AnyCPU' OR '$(Platform)'=='arm'">True</EmguCVRaspberryPiBuildArm>
+      <EmguCVRaspberryPiNativeFileArm>$(MSBuildThisFileDirectory)\arm\libcvextern.so</EmguCVRaspberryPiNativeFileArm>
+      <EmguCVRaspberryPiDeployMessage Condition="'$(EmguCVRaspberryPiBuildArm)'=='True' AND Exists('$(EmguCVRaspberryPiNativeFileArm)')">$(EmguCVRaspberryPiDeployMessage)arm </EmguCVRaspberryPiDeployMessage>
+      <EmguCVRaspberryPiErrorMessage Condition="'$(EmguCVRaspberryPiBuildArm)'=='True' AND !Exists('$(EmguCVRaspberryPiNativeFileArm)')">This package do not contain necessary binary for $(EmguCVRaspberryPiLinkTarget). Arm is targeted, but file $(EmguCVRaspberryPiNativeFileArm) is missing. Pinvoke may fail on RaspberryPi ARM platform.</EmguCVRaspberryPiErrorMessage>
+    </PropertyGroup>
+    <ItemGroup Condition="'$(EmguCVRaspberryPiBuildArm)'=='True' AND Exists('$(EmguCVRaspberryPiNativeFileArm)')">
+      <None Include="$(MSBuildThisFileDirectory)\arm\*.so">
+        <Link>arm\%(RecursiveDir)%(Filename)%(Extension)</Link>
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
+    </ItemGroup>
+    <Target Name="EmguCVRaspberryPiPackageBuildImports" BeforeTargets="PrepareForBuild">
+      <Message Condition="'$(EmguCVRaspberryPiLinkTarget)'!=''" Text="Emgu CV nuget package compiling against $(EmguCVRaspberryPiLinkTarget)" Importance="High" />
+      <Warning Text="'$(EmguCVRaspberryPiErrorMessage)'" Condition="'$(EmguCVRaspberryPiErrorMessage)'!=''" />
+      <Message Text="Emgu CV compiling with $(EmguCVRaspberryPiDeployMessage)binary" Condition="'$(EmguCVRaspberryPiDeployMessage)'!=''" Importance="High" />
+      <Message Text="No native binary is deployed by the Emgu CV project." Condition="'$(EmguCVRaspberryPiDeployMessage)'==''" Importance="High" />
+    </Target>
+</Project>

platforms/nuget/Emgu.CV.runtime.raspbian/Emgu.CV.runtime.raspbian.targets

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-    <PropertyGroup>
-      <EmguCVRaspbianLinkTarget>Raspbian_arm</EmguCVRaspbianLinkTarget>
-      <EmguCVRaspbianBuildArm Condition="'$(Platform)'=='AnyCPU' OR '$(Platform)'=='arm'">True</EmguCVRaspbianBuildArm>
-      <EmguCVRaspbianNativeFileArm>$(MSBuildThisFileDirectory)\arm\libcvextern.so</EmguCVRaspbianNativeFileArm>
-      <EmguCVRaspbianDeployMessage Condition="'$(EmguCVRaspbianBuildArm)'=='True' AND Exists('$(EmguCVRaspbianNativeFileArm)')">$(EmguCVRaspbianDeployMessage)arm </EmguCVRaspbianDeployMessage>
-      <EmguCVRaspbianErrorMessage Condition="'$(EmguCVRaspbianBuildArm)'=='True' AND !Exists('$(EmguCVRaspbianNativeFileArm)')">This package do not contain necessary binary for $(EmguCVRaspbianLinkTarget). Arm is targeted, but file $(EmguCVRaspbianNativeFileArm) is missing. Pinvoke may fail on Raspbian ARM platform.</EmguCVRaspbianErrorMessage>
-    </PropertyGroup>
-    <ItemGroup Condition="'$(EmguCVRaspbianBuildArm)'=='True' AND Exists('$(EmguCVRaspbianNativeFileArm)')">
-      <None Include="$(MSBuildThisFileDirectory)\arm\*.so">
-        <Link>arm\%(RecursiveDir)%(Filename)%(Extension)</Link>
-        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      </None>
-    </ItemGroup>
-    <Target Name="EmguCVRaspbianPackageBuildImports" BeforeTargets="PrepareForBuild">
-      <Message Condition="'$(EmguCVRaspbianLinkTarget)'!=''" Text="Emgu CV nuget package compiling against $(EmguCVRaspbianLinkTarget)" Importance="High" />
-      <Warning Text="'$(EmguCVRaspbianErrorMessage)'" Condition="'$(EmguCVRaspbianErrorMessage)'!=''" />
-      <Message Text="Emgu CV compiling with $(EmguCVRaspbianDeployMessage)binary" Condition="'$(EmguCVRaspbianDeployMessage)'!=''" Importance="High" />
-      <Message Text="No native binary is deployed by the Emgu CV project." Condition="'$(EmguCVRaspbianDeployMessage)'==''" Importance="High" />
-    </Target>
-</Project>