Skip to content

Commit

Permalink
Use runtime.json for native binary distributions
Browse files Browse the repository at this point in the history
  • Loading branch information
glopesdev committed Dec 28, 2021
1 parent d00fd8c commit ea9b439
Show file tree
Hide file tree
Showing 14 changed files with 91 additions and 236 deletions.
6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
.vs
bin
obj
obj
lib
include
staticlib
*.nupkg
27 changes: 0 additions & 27 deletions OpenCV.Net/NuGet/NuGet-Overlay.cmd

This file was deleted.

4 changes: 0 additions & 4 deletions OpenCV.Net/NuGet/build/native/pivot-list.txt

This file was deleted.

Binary file not shown.
Binary file not shown.
15 changes: 0 additions & 15 deletions OpenCV.Net/NuGet/build/net40/OpenCV.Net.props

This file was deleted.

50 changes: 0 additions & 50 deletions OpenCV.Net/NuGet/build/net40/OpenCV.Net.targets

This file was deleted.

4 changes: 1 addition & 3 deletions OpenCV.Net/OpenCV.Net.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,7 @@
</PropertyGroup>

<ItemGroup>
<Content Include="..\.nuget\NuGet.exe" PackagePath="build\native\private" />
<Content Include="NuGet\build\**" PackagePath="build" />
<Content Include="NuGet\NuGet-Overlay.cmd" PackagePath="/" />
<Content Include="runtime.json" PackagePath="/" />
</ItemGroup>

</Project>
14 changes: 14 additions & 0 deletions OpenCV.Net/runtime.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"runtimes": {
"win-x64": {
"OpenCV.Net": {
"OpenCV.runtime.win-x64": "2.4.8"
}
},
"win-x86": {
"OpenCV.Net": {
"OpenCV.runtime.win-x86": "2.4.8"
}
}
}
}
33 changes: 33 additions & 0 deletions OpenCV/LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
By downloading, copying, installing or using the software you agree to this license.
If you do not agree to this license, do not download, install,
copy or use the software.


License Agreement
For Open Source Computer Vision Library
(3-clause BSD License)

Redistribution and use in source and binary forms, with or without modification,
are permitted provided that the following conditions are met:

* Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.

* Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.

* Neither the names of the copyright holders nor the names of the contributors
may be used to endorse or promote products derived from this software
without specific prior written permission.

This software is provided by the copyright holders and contributors "as is" and
any express or implied warranties, including, but not limited to, the implied
warranties of merchantability and fitness for a particular purpose are disclaimed.
In no event shall copyright holders or contributors be liable for any direct,
indirect, incidental, special, exemplary, or consequential damages
(including, but not limited to, procurement of substitute goods or services;
loss of use, data, or profits; or business interruption) however caused
and on any theory of liability, whether in contract, strict liability,
or tort (including negligence or otherwise) arising in any way out of
the use of this software, even if advised of the possibility of such damage.
88 changes: 0 additions & 88 deletions OpenCV/OpenCV.autopkg

This file was deleted.

19 changes: 19 additions & 0 deletions OpenCV/OpenCV.runtime.win-x64/OpenCV.runtime.win-x64.nuspec
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<package xmlns="http://schemas.microsoft.com/packaging/2013/01/nuspec.xsd">
<metadata minClientVersion="2.12">
<id>OpenCV.runtime.win-x64</id>
<version>2.4.8</version>
<authors>OpenCV team</authors>
<owners>OpenCV team</owners>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<license type="file">LICENSE</license>
<projectUrl>https://opencv.org/</projectUrl>
<description>win x64 native runtime for OpenCV.Net.</description>
<copyright>Copyright © OpenCV team</copyright>
<repository type="git" url="https://github.com/opencv/opencv" branch="2.4" />
</metadata>
<files>
<file src="..\LICENSE" target="LICENSE" />
<file src="x64\vc11\bin\*.dll" exclude="**\*d.dll" target="runtimes\win-x64\native" />
</files>
</package>
19 changes: 19 additions & 0 deletions OpenCV/OpenCV.runtime.win-x86/OpenCV.runtime.win-x86.nuspec
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<package xmlns="http://schemas.microsoft.com/packaging/2013/01/nuspec.xsd">
<metadata minClientVersion="2.12">
<id>OpenCV.runtime.win-x86</id>
<version>2.4.8</version>
<authors>OpenCV team</authors>
<owners>OpenCV team</owners>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<license type="file">LICENSE</license>
<projectUrl>https://opencv.org/</projectUrl>
<description>win x86 native runtime for OpenCV.Net.</description>
<copyright>Copyright © OpenCV team</copyright>
<repository type="git" url="https://github.com/opencv/opencv" branch="2.4" />
</metadata>
<files>
<file src="..\LICENSE" target="LICENSE" />
<file src="x86\vc11\bin\*.dll" exclude="**\*d.dll" target="runtimes\win-x86\native" />
</files>
</package>
Loading

0 comments on commit ea9b439

Please sign in to comment.