Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

set wechat_qrcode On and retarget version #1389

Merged
merged 1 commit into from
Mar 11, 2022
Merged

set wechat_qrcode On and retarget version #1389

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docker/al2-dotnet5-opencv4.5.3/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ RUN cd opencv && mkdir build && cd build && \
-D BUILD_opencv_wechat_qrcode=OFF \
-D WITH_GSTREAMER=OFF \
-D OPENCV_ENABLE_NONFREE=ON \
.. && make -j8 && make install
.. && make -j$(nproc) && make install

# Download OpenCvSharp
RUN wget https://github.com/shimat/opencvsharp/archive/master.zip && \
Expand Down
8 changes: 4 additions & 4 deletions docker/ubuntu20-dotnet5-opencv4.5.3/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ RUN cd opencv && mkdir build && cd build && \
-D BUILD_opencv_structured_light=OFF \
-D BUILD_opencv_surface_matching=OFF \
-D BUILD_opencv_videostab=OFF \
-D BUILD_opencv_wechat_qrcode=OFF \
-D BUILD_opencv_wechat_qrcode=ON \
-D WITH_GSTREAMER=OFF \
-D WITH_ADE=OFF \
-D OPENCV_ENABLE_NONFREE=ON \
Expand Down Expand Up @@ -128,14 +128,14 @@ COPY --from=builder /usr/lib /usr/lib
# Install Build the C# part of OpenCvSharp
RUN git clone https://github.com/shimat/opencvsharp.git && cd opencvsharp
RUN cd /opencvsharp/src/OpenCvSharp && \
dotnet build -c Release -f netcoreapp3.1 && \
dotnet build -c Release -f net5.0 && \
cd /opencvsharp/src/OpenCvSharp.Extensions && \
dotnet build -c Release -f netcoreapp2.1
dotnet build -c Release -f net5.0

RUN dotnet test /opencvsharp/test/OpenCvSharp.Tests/OpenCvSharp.Tests.csproj -c Release -f net5.0 --runtime ubuntu.20.04-x64 --logger "trx;LogFileName=test-results.trx" < /dev/null

# Simple console app test using NuGet
#RUN dotnet new console -f netcoreapp3.1 -o "ConsoleApp01" && cd /ConsoleApp01 && \
#RUN dotnet new console -f net5.0 -o "ConsoleApp01" && cd /ConsoleApp01 && \
# echo "\n\
#using System; \n\
#using OpenCvSharp; \n\
Expand Down
6 changes: 3 additions & 3 deletions docker/ubuntu20-dotnet5sdk-opencv4.5.3/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,14 +128,14 @@ COPY --from=builder /usr/lib /usr/lib
# Install Build the C# part of OpenCvSharp
RUN git clone https://github.com/shimat/opencvsharp.git && cd opencvsharp
RUN cd /opencvsharp/src/OpenCvSharp && \
dotnet build -c Release -f netcoreapp3.1 && \
dotnet build -c Release -f net5.0 && \
cd /opencvsharp/src/OpenCvSharp.Extensions && \
dotnet build -c Release -f netcoreapp2.1
dotnet build -c Release -f net5.0

RUN dotnet test /opencvsharp/test/OpenCvSharp.Tests/OpenCvSharp.Tests.csproj -c Release -f net5.0 --runtime ubuntu.20.04-x64 --logger "trx;LogFileName=test-results.trx" < /dev/null

# Simple console app test using NuGet
#RUN dotnet new console -f netcoreapp3.1 -o "ConsoleApp01" && cd /ConsoleApp01 && \
# RUN dotnet new console -f net5.0 -o "ConsoleApp01" && cd /ConsoleApp01 && \
# echo "\n\
#using System; \n\
#using OpenCvSharp; \n\
Expand Down
8 changes: 4 additions & 4 deletions docker/ubuntu20-dotnet6-opencv4.5.3/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ RUN cd opencv && mkdir build && cd build && \
-D BUILD_opencv_structured_light=OFF \
-D BUILD_opencv_surface_matching=OFF \
-D BUILD_opencv_videostab=OFF \
-D BUILD_opencv_wechat_qrcode=OFF \
-D BUILD_opencv_wechat_qrcode=ON \
-D WITH_GSTREAMER=OFF \
-D WITH_ADE=OFF \
-D OPENCV_ENABLE_NONFREE=ON \
Expand Down Expand Up @@ -128,14 +128,14 @@ COPY --from=builder /usr/lib /usr/lib
# Install Build the C# part of OpenCvSharp
RUN git clone https://github.com/shimat/opencvsharp.git && cd opencvsharp
RUN cd /opencvsharp/src/OpenCvSharp && \
dotnet build -c Release -f netcoreapp3.1 && \
dotnet build -c Release -f net6.0 && \
cd /opencvsharp/src/OpenCvSharp.Extensions && \
dotnet build -c Release -f netcoreapp2.1
dotnet build -c Release -f net6.0

RUN dotnet test /opencvsharp/test/OpenCvSharp.Tests/OpenCvSharp.Tests.csproj -c Release -f net6.0 --runtime ubuntu.20.04-x64 --logger "trx;LogFileName=test-results.trx" < /dev/null

# Simple console app test using NuGet
#RUN dotnet new console -f netcoreapp3.1 -o "ConsoleApp01" && cd /ConsoleApp01 && \
# RUN dotnet new console -f net6.0 -o "ConsoleApp01" && cd /ConsoleApp01 && \
# echo "\n\
#using System; \n\
#using OpenCvSharp; \n\
Expand Down
34 changes: 17 additions & 17 deletions docker/ubuntu20-dotnet6sdk-opencv4.5.3/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ RUN cd opencv && mkdir build && cd build && \
-D BUILD_opencv_structured_light=OFF \
-D BUILD_opencv_surface_matching=OFF \
-D BUILD_opencv_videostab=OFF \
-D BUILD_opencv_wechat_qrcode=OFF \
-D BUILD_opencv_wechat_qrcode=ON \
-D WITH_GSTREAMER=OFF \
-D WITH_ADE=OFF \
-D OPENCV_ENABLE_NONFREE=ON \
Expand Down Expand Up @@ -128,27 +128,27 @@ COPY --from=builder /usr/lib /usr/lib
# Install Build the C# part of OpenCvSharp
RUN git clone https://github.com/shimat/opencvsharp.git && cd opencvsharp
RUN cd /opencvsharp/src/OpenCvSharp && \
dotnet build -c Release -f netcoreapp3.1 && \
dotnet build -c Release -f net6.0 && \
cd /opencvsharp/src/OpenCvSharp.Extensions && \
dotnet build -c Release -f netcoreapp2.1
dotnet build -c Release -f net6.0

RUN dotnet test /opencvsharp/test/OpenCvSharp.Tests/OpenCvSharp.Tests.csproj -c Release -f net6.0 --runtime ubuntu.20.04-x64 --logger "trx;LogFileName=test-results.trx" < /dev/null

# Simple console app test using NuGet
#RUN dotnet new console -f netcoreapp3.1 -o "ConsoleApp01" && cd /ConsoleApp01 && \
# echo "\n\
#using System; \n\
#using OpenCvSharp; \n\
#class Program{ \n\
# static void Main(){ \n\
# Console.WriteLine(Cv2.GetTickCount()); \n\
# using var mat = new Mat(1, 1, MatType.CV_8UC1); \n\
# Console.WriteLine(mat.CvPtr); \n\
# } \n\
#}" > Program.cs && \
# dotnet add package OpenCvSharp4 && \
# dotnet run && \
# rm -rf /ConsoleApp01
# RUN dotnet new console -f net6.0 -o "ConsoleApp01" && cd /ConsoleApp01 && \
# echo "\n\
# using System; \n\
# using OpenCvSharp; \n\
# class Program{ \n\
# static void Main(){ \n\
# Console.WriteLine(Cv2.GetTickCount()); \n\
# using var mat = new Mat(1, 1, MatType.CV_8UC1); \n\
# Console.WriteLine(mat.CvPtr); \n\
# } \n\
# }" > Program.cs && \
# dotnet add package OpenCvSharp4 && \
# dotnet run && \
# rm -rf /ConsoleApp01

#RUN ldd /artifacts/libOpenCvSharpExtern.so

Expand Down