Skip to content

Commit 15517bb

Browse files
shimatclaude
shimat
and
claude
committed
Refresh v5 package icon and move nuget/docker under packaging/
- Replace the package icon: keep the red/green/blue layout borrowed from the OpenCV logo, but redraw the glyphs in Arial Black and swap the blue "#" for a "5" so v5 is recognizable even at small sizes. The previous icon is kept as opencvsharp4.png; unused legacy test images (Girl.jpg, Lenna.ico, lenna-icon.png, mandrill-ico.png) are removed. - Move nuget/ and docker/ under a new packaging/ directory to reduce top-level clutter, updating all path references accordingly (CI workflows, csproj includes, devcontainer script, docs). Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
1 parent da3c88b commit 15517bb

50 files changed

Lines changed: 64 additions & 64 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.devcontainer/manylinux/build_extern.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ set -euxo pipefail
2424
# ---------------------------------------------------------------------------
2525
# 2. Static FFmpeg (skipped if already built)
2626
# ---------------------------------------------------------------------------
27-
bash /work/docker/manylinux/build_static_deps.sh
27+
bash /work/packaging/docker/manylinux/build_static_deps.sh
2828

2929
# ---------------------------------------------------------------------------
3030
# 3. OpenCV (full, static)

‎.github/copilot-instructions.md‎

Lines changed: 3 additions & 3 deletions

‎.github/workflows/docker-deploy.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,6 @@ jobs:
4242
uses: docker/build-push-action@v7
4343
with:
4444
context: .
45-
file: docker/${{ env.DOCKER_IMAGE_NAME1 }}/Dockerfile
45+
file: packaging/docker/${{ env.DOCKER_IMAGE_NAME1 }}/Dockerfile
4646
push: true
4747
tags: ghcr.io/shimat/opencvsharp/${{ env.DOCKER_IMAGE_NAME1 }}:${{ github.event.inputs.docker_image_tag }}

‎.github/workflows/docker-test-ubuntu.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ on:
1010
env:
1111
DEBIAN_FRONTEND: noninteractive
1212
OPENCV_VERSION: 5.0.0
13-
DOCKER_BUILD_CONTEXT_FULL: ./docker/ubuntu24-dotnet10-opencv5.0.0
14-
DOCKER_BUILD_CONTEXT_SLIM: ./docker/ubuntu24-dotnet10-opencv5.0.0-slim
13+
DOCKER_BUILD_CONTEXT_FULL: ./packaging/docker/ubuntu24-dotnet10-opencv5.0.0
14+
DOCKER_BUILD_CONTEXT_SLIM: ./packaging/docker/ubuntu24-dotnet10-opencv5.0.0-slim
1515

1616
jobs:
1717
build_full:

‎.github/workflows/linux-arm64.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -124,11 +124,11 @@ jobs:
124124
-D CMAKE_PREFIX_PATH=${GITHUB_WORKSPACE}/opencv_artifacts
125125
cmake --build src/build -j
126126
ls src/build/OpenCvSharpExtern
127-
cp src/build/OpenCvSharpExtern/libOpenCvSharpExtern.so ${GITHUB_WORKSPACE}/nuget/
127+
cp src/build/OpenCvSharpExtern/libOpenCvSharpExtern.so ${GITHUB_WORKSPACE}/packaging/nuget/
128128
129129
- name: Check OpenCvSharpExtern
130130
run: |
131-
cd ${GITHUB_WORKSPACE}/nuget/
131+
cd ${GITHUB_WORKSPACE}/packaging/nuget/
132132
ldd libOpenCvSharpExtern.so
133133
nm libOpenCvSharpExtern.so
134134
echo -ne "#include <stdio.h> \n int core_Mat_sizeof(); int main(){ int i = core_Mat_sizeof(); printf(\"sizeof(Mat) = %d\", i); return 0; }" > test.c
@@ -150,8 +150,8 @@ jobs:
150150
echo "Package version: $version"
151151
152152
cd ${GITHUB_WORKSPACE}
153-
dotnet pack nuget/OpenCvSharp5.runtime.linux-arm64.csproj -o ${GITHUB_WORKSPACE}/artifacts_arm64 -p:Version=$version
154-
dotnet pack nuget/OpenCvSharp5.runtime.linux-arm.csproj -o ${GITHUB_WORKSPACE}/artifacts_arm64 -p:Version=$version --no-restore
153+
dotnet pack packaging/nuget/OpenCvSharp5.runtime.linux-arm64.csproj -o ${GITHUB_WORKSPACE}/artifacts_arm64 -p:Version=$version
154+
dotnet pack packaging/nuget/OpenCvSharp5.runtime.linux-arm.csproj -o ${GITHUB_WORKSPACE}/artifacts_arm64 -p:Version=$version --no-restore
155155
156156
ls ${GITHUB_WORKSPACE}/artifacts_arm64
157157
@@ -164,7 +164,7 @@ jobs:
164164
run: |
165165
cd ${GITHUB_WORKSPACE}/test/OpenCvSharp.Tests
166166
dotnet build -c Release -f net10.0
167-
cp ${GITHUB_WORKSPACE}/nuget/libOpenCvSharpExtern.so ${GITHUB_WORKSPACE}/test/OpenCvSharp.Tests/bin/Release/net10.0/
168-
cp ${GITHUB_WORKSPACE}/nuget/libOpenCvSharpExtern.so ${GITHUB_WORKSPACE}/test/OpenCvSharp.Tests/
169-
sudo cp ${GITHUB_WORKSPACE}/nuget/libOpenCvSharpExtern.so /usr/lib/
167+
cp ${GITHUB_WORKSPACE}/packaging/nuget/libOpenCvSharpExtern.so ${GITHUB_WORKSPACE}/test/OpenCvSharp.Tests/bin/Release/net10.0/
168+
cp ${GITHUB_WORKSPACE}/packaging/nuget/libOpenCvSharpExtern.so ${GITHUB_WORKSPACE}/test/OpenCvSharp.Tests/
169+
sudo cp ${GITHUB_WORKSPACE}/packaging/nuget/libOpenCvSharpExtern.so /usr/lib/
170170
LD_LIBRARY_PATH=. dotnet test OpenCvSharp.Tests.csproj -c Release -f net10.0 --runtime linux-arm64 --logger "trx;LogFileName=test-results.trx" < /dev/null

‎.github/workflows/macos.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -398,13 +398,13 @@ jobs:
398398
echo "Package version: $version"
399399
400400
# x64 package
401-
cp /tmp/dylib-x64/libOpenCvSharpExtern.dylib nuget/libOpenCvSharpExtern.dylib
402-
dotnet pack nuget/OpenCvSharp5.runtime.osx.x64.csproj \
401+
cp /tmp/dylib-x64/libOpenCvSharpExtern.dylib packaging/nuget/libOpenCvSharpExtern.dylib
402+
dotnet pack packaging/nuget/OpenCvSharp5.runtime.osx.x64.csproj \
403403
-o ${GITHUB_WORKSPACE}/artifacts -p:Version=$version
404404
405405
# arm64 package
406-
cp /tmp/dylib-arm64/libOpenCvSharpExtern.dylib nuget/libOpenCvSharpExtern.dylib
407-
dotnet pack nuget/OpenCvSharp5.runtime.osx.arm64.csproj \
406+
cp /tmp/dylib-arm64/libOpenCvSharpExtern.dylib packaging/nuget/libOpenCvSharpExtern.dylib
407+
dotnet pack packaging/nuget/OpenCvSharp5.runtime.osx.arm64.csproj \
408408
-o ${GITHUB_WORKSPACE}/artifacts -p:Version=$version
409409
410410
ls ${GITHUB_WORKSPACE}/artifacts

‎.github/workflows/manylinux.yml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -79,26 +79,26 @@ jobs:
7979
uses: actions/cache/restore@v6
8080
with:
8181
path: /opt/ffmpeg
82-
key: manylinux2_28-ffmpeg-${{ hashFiles('docker/manylinux/build_static_deps.sh') }}
82+
key: manylinux2_28-ffmpeg-${{ hashFiles('packaging/docker/manylinux/build_static_deps.sh') }}
8383

8484
- name: Build FFmpeg
8585
if: steps.ffmpeg-cache.outputs.cache-hit != 'true'
86-
run: bash docker/manylinux/build_static_deps.sh
86+
run: bash packaging/docker/manylinux/build_static_deps.sh
8787

8888
- name: Save FFmpeg cache
8989
if: steps.ffmpeg-cache.outputs.cache-hit != 'true' && github.event_name == 'push' && github.ref == 'refs/heads/main'
9090
uses: actions/cache/save@v6
9191
with:
9292
path: /opt/ffmpeg
93-
key: manylinux2_28-ffmpeg-${{ hashFiles('docker/manylinux/build_static_deps.sh') }}
93+
key: manylinux2_28-ffmpeg-${{ hashFiles('packaging/docker/manylinux/build_static_deps.sh') }}
9494

9595
# -- OpenCV cache --------------------------------------------------------
9696
- name: Restore OpenCV cache (full)
9797
id: opencv-cache
9898
uses: actions/cache/restore@v6
9999
with:
100100
path: ${{ github.workspace }}/opencv_artifacts
101-
key: opencv-${{ env.OPENCV_VERSION }}-manylinux2_28-full-${{ hashFiles('vcpkg.json', 'cmake/opencv_build_options.cmake', 'docker/manylinux/build_static_deps.sh') }}
101+
key: opencv-${{ env.OPENCV_VERSION }}-manylinux2_28-full-${{ hashFiles('vcpkg.json', 'cmake/opencv_build_options.cmake', 'packaging/docker/manylinux/build_static_deps.sh') }}
102102

103103
- name: Configure OpenCV (full)
104104
if: steps.opencv-cache.outputs.cache-hit != 'true'
@@ -168,7 +168,7 @@ jobs:
168168
uses: actions/cache/save@v6
169169
with:
170170
path: ${{ github.workspace }}/opencv_artifacts
171-
key: opencv-${{ env.OPENCV_VERSION }}-manylinux2_28-full-${{ hashFiles('vcpkg.json', 'cmake/opencv_build_options.cmake', 'docker/manylinux/build_static_deps.sh') }}
171+
key: opencv-${{ env.OPENCV_VERSION }}-manylinux2_28-full-${{ hashFiles('vcpkg.json', 'cmake/opencv_build_options.cmake', 'packaging/docker/manylinux/build_static_deps.sh') }}
172172

173173
# -- OpenCvSharpExtern ---------------------------------------------------
174174
- name: Build OpenCvSharpExtern (full)
@@ -301,7 +301,7 @@ jobs:
301301
uses: actions/download-artifact@v8
302302
with:
303303
name: libOpenCvSharpExtern-full
304-
path: nuget/
304+
path: packaging/nuget/
305305

306306
- name: Download slim artifact
307307
uses: actions/download-artifact@v8
@@ -318,9 +318,9 @@ jobs:
318318
run: |
319319
cd ${GITHUB_WORKSPACE}/test/OpenCvSharp.Tests
320320
dotnet build -c Release -f net10.0
321-
cp ${GITHUB_WORKSPACE}/nuget/libOpenCvSharpExtern.so bin/Release/net10.0/
322-
cp ${GITHUB_WORKSPACE}/nuget/libOpenCvSharpExtern.so ./
323-
sudo cp ${GITHUB_WORKSPACE}/nuget/libOpenCvSharpExtern.so /usr/lib/
321+
cp ${GITHUB_WORKSPACE}/packaging/nuget/libOpenCvSharpExtern.so bin/Release/net10.0/
322+
cp ${GITHUB_WORKSPACE}/packaging/nuget/libOpenCvSharpExtern.so ./
323+
sudo cp ${GITHUB_WORKSPACE}/packaging/nuget/libOpenCvSharpExtern.so /usr/lib/
324324
LD_LIBRARY_PATH=. dotnet test OpenCvSharp.Tests.csproj -c Release -f net10.0 --runtime linux-x64 \
325325
--logger "trx;LogFileName=test-results.trx" < /dev/null
326326
@@ -376,13 +376,13 @@ jobs:
376376
echo "Package version: $version"
377377
378378
# Full package
379-
cp /tmp/so-full/libOpenCvSharpExtern.so nuget/libOpenCvSharpExtern.so
380-
dotnet pack nuget/OpenCvSharp5.official.runtime.linux-x64.csproj \
379+
cp /tmp/so-full/libOpenCvSharpExtern.so packaging/nuget/libOpenCvSharpExtern.so
380+
dotnet pack packaging/nuget/OpenCvSharp5.official.runtime.linux-x64.csproj \
381381
-o ${GITHUB_WORKSPACE}/artifacts -p:Version=$version
382382
383-
# Slim package (overwrite .so in nuget/ with slim binary)
384-
cp /tmp/so-slim/libOpenCvSharpExtern-slim.so nuget/libOpenCvSharpExtern.so
385-
dotnet pack nuget/OpenCvSharp5.official.runtime.linux-x64.slim.csproj \
383+
# Slim package (overwrite .so in packaging/nuget/ with slim binary)
384+
cp /tmp/so-slim/libOpenCvSharpExtern-slim.so packaging/nuget/libOpenCvSharpExtern.so
385+
dotnet pack packaging/nuget/OpenCvSharp5.official.runtime.linux-x64.slim.csproj \
386386
-o ${GITHUB_WORKSPACE}/artifacts -p:Version=$version
387387
388388
ls ${GITHUB_WORKSPACE}/artifacts

‎.github/workflows/wasm.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ jobs:
154154
emcmake cmake -S src -B src/build -DCMAKE_BUILD_TYPE=Release -DOpenCV_DIR=${GITHUB_WORKSPACE}/opencv_wasm/lib/cmake/opencv5 -DWASM_LIB=${GITHUB_WORKSPACE}/opencv_wasm/libopencv.o
155155
cmake --build src/build --parallel $(nproc)
156156
ls src/build/OpenCvSharpExtern
157-
cp src/build/OpenCvSharpExtern/libOpenCvSharpExtern.a ${GITHUB_WORKSPACE}/nuget/
157+
cp src/build/OpenCvSharpExtern/libOpenCvSharpExtern.a ${GITHUB_WORKSPACE}/packaging/nuget/
158158
159159
- name: Check OpenCvSharpExtern
160160
run: |
@@ -174,7 +174,7 @@ jobs:
174174
version="${OPENCV_VERSION}.${yyyymmdd}${BETA}"
175175
echo "Package version: $version"
176176
177-
dotnet pack ${GITHUB_WORKSPACE}/nuget/OpenCvSharp5.runtime.wasm.csproj -o ${GITHUB_WORKSPACE}/artifacts_wasm -p:Version=$version
177+
dotnet pack ${GITHUB_WORKSPACE}/packaging/nuget/OpenCvSharp5.runtime.wasm.csproj -o ${GITHUB_WORKSPACE}/artifacts_wasm -p:Version=$version
178178
179179
ls ${GITHUB_WORKSPACE}/artifacts_wasm
180180

‎.github/workflows/windows.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -237,15 +237,15 @@ jobs:
237237
dotnet pack src/OpenCvSharp.WpfExtensions/OpenCvSharp.WpfExtensions.csproj -c Release -o artifacts -p:Version=$version
238238
239239
# Pack runtime packages
240-
dotnet pack nuget/OpenCvSharp5.runtime.win.csproj -o artifacts -p:Version=$version
241-
dotnet pack nuget/OpenCvSharp5.runtime.win.slim.csproj -o artifacts -p:Version=$version
240+
dotnet pack packaging/nuget/OpenCvSharp5.runtime.win.csproj -o artifacts -p:Version=$version
241+
dotnet pack packaging/nuget/OpenCvSharp5.runtime.win.slim.csproj -o artifacts -p:Version=$version
242242
243243
# Add local artifacts as NuGet source for meta-package
244244
dotnet nuget add source "${env:GITHUB_WORKSPACE}\artifacts" --name LocalPackages
245245
246246
# Pack meta-package (depends on packages built above)
247-
dotnet pack nuget/OpenCvSharp5.Windows.csproj -o artifacts -p:Version=$version -p:PackageVersion=$version
248-
dotnet pack nuget/OpenCvSharp5.Windows.Slim.csproj -o artifacts -p:Version=$version -p:PackageVersion=$version
247+
dotnet pack packaging/nuget/OpenCvSharp5.Windows.csproj -o artifacts -p:Version=$version -p:PackageVersion=$version
248+
dotnet pack packaging/nuget/OpenCvSharp5.Windows.Slim.csproj -o artifacts -p:Version=$version -p:PackageVersion=$version
249249
250250
- name: Pack release zip
251251
shell: pwsh
@@ -437,8 +437,8 @@ jobs:
437437
$version = "${env:OPENCV_VERSION}.${date}-beta"
438438
Write-Host "version = ${version}"
439439
440-
dotnet pack nuget/OpenCvSharp5.runtime.win-arm64.csproj -o artifacts -p:Version=$version
441-
dotnet pack nuget/OpenCvSharp5.runtime.win-arm64.slim.csproj -o artifacts -p:Version=$version
440+
dotnet pack packaging/nuget/OpenCvSharp5.runtime.win-arm64.csproj -o artifacts -p:Version=$version
441+
dotnet pack packaging/nuget/OpenCvSharp5.runtime.win-arm64.slim.csproj -o artifacts -p:Version=$version
442442
443443
- name: Upload NuGet packages
444444
uses: actions/upload-artifact@v7

‎.gitignore‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,8 @@ UpgradeLog*.XML
117117
*.BAK
118118
/.vs
119119
/OpenCvSharp.VC.VC.opendb
120-
/nuget/nuget/*.nupkg
121-
/nuget/*.nupkg
120+
/packaging/nuget/nuget/*.nupkg
121+
/packaging/nuget/*.nupkg
122122
/Help
123123
/myresults.xml
124124

0 commit comments

Comments
 (0)