Skip to content

Commit d09d079

Browse files
nihuinihui
committed
drop opencv 1.x headers for ios package
1 parent 2ff9dc5 commit d09d079

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

‎.github/workflows/release.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@ jobs:
289289
ln -s Versions/Current/Resources opencv2.framework/Resources
290290
ln -s Versions/Current/opencv2 opencv2.framework/opencv2
291291
lipo -create opencv-${{ env.OPENCV_VERSION }}/build-ios/install/lib/libopencv_world.a opencv-${{ env.OPENCV_VERSION }}/build-simulator/install/lib/libopencv_world.a -o opencv2.framework/Versions/A/opencv2
292-
cp -r opencv-${{ env.OPENCV_VERSION }}/build-ios/install/include/opencv4/* opencv2.framework/Versions/A/Headers/
292+
cp -r opencv-${{ env.OPENCV_VERSION }}/build-ios/install/include/opencv4/opencv2/* opencv2.framework/Versions/A/Headers/
293293
sed -e 's/__NAME__/OpenCV/g' -e 's/__IDENTIFIER__/org.opencv/g' -e 's/__VERSION__/${{ env.OPENCV_VERSION }}/g' Info.plist > opencv2.framework/Versions/A/Resources/Info.plist
294294
rm -f ${{ env.PACKAGENAME }}.zip
295295
zip -9 -y -r ${{ env.PACKAGENAME }}.zip opencv2.framework
@@ -346,7 +346,7 @@ jobs:
346346
ln -s Versions/Current/Resources opencv2.framework/Resources
347347
ln -s Versions/Current/opencv2 opencv2.framework/opencv2
348348
lipo -create opencv-${{ env.OPENCV_VERSION }}/build-ios/install/lib/libopencv_world.a opencv-${{ env.OPENCV_VERSION }}/build-simulator/install/lib/libopencv_world.a -o opencv2.framework/Versions/A/opencv2
349-
cp -r opencv-${{ env.OPENCV_VERSION }}/build-ios/install/include/* opencv2.framework/Versions/A/Headers/
349+
cp -r opencv-${{ env.OPENCV_VERSION }}/build-ios/install/include/opencv2/* opencv2.framework/Versions/A/Headers/
350350
sed -e 's/__NAME__/OpenCV/g' -e 's/__IDENTIFIER__/org.opencv/g' -e 's/__VERSION__/${{ env.OPENCV_VERSION }}/g' Info.plist > opencv2.framework/Versions/A/Resources/Info.plist
351351
rm -f ${{ env.PACKAGENAME }}.zip
352352
zip -9 -y -r ${{ env.PACKAGENAME }}.zip opencv2.framework
@@ -404,7 +404,7 @@ jobs:
404404
ln -s Versions/Current/Resources opencv2.framework/Resources
405405
ln -s Versions/Current/opencv2 opencv2.framework/opencv2
406406
lipo -create opencv-${{ env.OPENCV_VERSION }}/build-ios/install/lib/libopencv_world.a opencv-${{ env.OPENCV_VERSION }}/build-simulator/install/lib/libopencv_world.a -o opencv2.framework/Versions/A/opencv2
407-
cp -r opencv-${{ env.OPENCV_VERSION }}/build-ios/install/include/* opencv2.framework/Versions/A/Headers/
407+
cp -r opencv-${{ env.OPENCV_VERSION }}/build-ios/install/include/opencv2/* opencv2.framework/Versions/A/Headers/
408408
sed -e 's/__NAME__/OpenCV/g' -e 's/__IDENTIFIER__/org.opencv/g' -e 's/__VERSION__/${{ env.OPENCV_VERSION }}/g' Info.plist > opencv2.framework/Versions/A/Resources/Info.plist
409409
rm -f ${{ env.PACKAGENAME }}.zip
410410
zip -9 -y -r ${{ env.PACKAGENAME }}.zip opencv2.framework
@@ -462,7 +462,7 @@ jobs:
462462
ln -s Versions/Current/Resources opencv2.framework/Resources
463463
ln -s Versions/Current/opencv2 opencv2.framework/opencv2
464464
lipo -create opencv-${{ env.OPENCV_VERSION }}/build-ios/install/lib/libopencv_world.a opencv-${{ env.OPENCV_VERSION }}/build-simulator/install/lib/libopencv_world.a -o opencv2.framework/Versions/A/opencv2
465-
cp -r opencv-${{ env.OPENCV_VERSION }}/build-ios/install/include/opencv4/* opencv2.framework/Versions/A/Headers/
465+
cp -r opencv-${{ env.OPENCV_VERSION }}/build-ios/install/include/opencv4/opencv2/* opencv2.framework/Versions/A/Headers/
466466
sed -e 's/__NAME__/OpenCV/g' -e 's/__IDENTIFIER__/org.opencv/g' -e 's/__VERSION__/${{ env.OPENCV_VERSION }}/g' Info.plist > opencv2.framework/Versions/A/Resources/Info.plist
467467
rm -f ${{ env.PACKAGENAME }}.zip
468468
zip -9 -y -r ${{ env.PACKAGENAME }}.zip opencv2.framework
@@ -519,7 +519,7 @@ jobs:
519519
ln -s Versions/Current/Resources opencv2.framework/Resources
520520
ln -s Versions/Current/opencv2 opencv2.framework/opencv2
521521
lipo -create opencv-${{ env.OPENCV_VERSION }}/build-ios/install/lib/libopencv_world.a opencv-${{ env.OPENCV_VERSION }}/build-simulator/install/lib/libopencv_world.a -o opencv2.framework/Versions/A/opencv2
522-
cp -r opencv-${{ env.OPENCV_VERSION }}/build-ios/install/include/* opencv2.framework/Versions/A/Headers/
522+
cp -r opencv-${{ env.OPENCV_VERSION }}/build-ios/install/include/opencv2/* opencv2.framework/Versions/A/Headers/
523523
sed -e 's/__NAME__/OpenCV/g' -e 's/__IDENTIFIER__/org.opencv/g' -e 's/__VERSION__/${{ env.OPENCV_VERSION }}/g' Info.plist > opencv2.framework/Versions/A/Resources/Info.plist
524524
rm -f ${{ env.PACKAGENAME }}.zip
525525
zip -9 -y -r ${{ env.PACKAGENAME }}.zip opencv2.framework
@@ -577,7 +577,7 @@ jobs:
577577
ln -s Versions/Current/Resources opencv2.framework/Resources
578578
ln -s Versions/Current/opencv2 opencv2.framework/opencv2
579579
lipo -create opencv-${{ env.OPENCV_VERSION }}/build-ios/install/lib/libopencv_world.a opencv-${{ env.OPENCV_VERSION }}/build-simulator/install/lib/libopencv_world.a -o opencv2.framework/Versions/A/opencv2
580-
cp -r opencv-${{ env.OPENCV_VERSION }}/build-ios/install/include/* opencv2.framework/Versions/A/Headers/
580+
cp -r opencv-${{ env.OPENCV_VERSION }}/build-ios/install/include/opencv2/* opencv2.framework/Versions/A/Headers/
581581
sed -e 's/__NAME__/OpenCV/g' -e 's/__IDENTIFIER__/org.opencv/g' -e 's/__VERSION__/${{ env.OPENCV_VERSION }}/g' Info.plist > opencv2.framework/Versions/A/Resources/Info.plist
582582
rm -f ${{ env.PACKAGENAME }}.zip
583583
zip -9 -y -r ${{ env.PACKAGENAME }}.zip opencv2.framework

0 commit comments

Comments
 (0)