Added pre-downloaded 3rdparty files to source packages

asenyaev · asenyaev · commit 3a4c30e50438 · 2022-03-24T18:17:16.000+03:00
diff --git a/.github/workflows/build_wheels_linux.yml b/.github/workflows/build_wheels_linux.yml
@@ -171,12 +171,14 @@ jobs:
 
     - name: Build a package
       run: |
+        # Download all 3rdparty files
+        source scripts/source-packages-preparation.sh ${{ github.workspace }}
         set -e
         # Build and package
         set -x
           python -m pip install --upgrade pip
           python -m pip install scikit-build
-          python setup.py sdist
+          python setup.py sdist --formats=xztar
         set +x
         # Install and run tests
         set -x
@@ -186,7 +188,7 @@ jobs:
       uses: actions/upload-artifact@v2
       with:
         name: wheels
-        path: dist/opencv*.tar.gz
+        path: dist/opencv*.tar.xz
 
   test_release_opencv_python:
     if: github.event_name == 'release' && github.event.release.prerelease
diff --git a/scripts/source-packages-preparation.sh b/scripts/source-packages-preparation.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+# ${1} variable is a path to repository opencv-python
+
+# Define flags
+if [ "0" == $ENABLE_CONTRIB ]; then
+  git submodule update --init opencv
+  EXTRA_CMAKE_OPTIONS="-DOPENCV_DOWNLOAD_PATH=${1}/opencv/3rdparty"
+else
+  git submodule update --init opencv opencv_contrib
+  EXTRA_CMAKE_OPTIONS="-DOPENCV_DOWNLOAD_PATH=${1}/opencv/3rdparty -DOPENCV_EXTRA_MODULES_PATH=${1}/opencv_contrib/modules"
+fi
+
+# Download 3rdparty files
+cd opencv && \
+mkdir generate && \
+cd generate && \
+cmake $EXTRA_CMAKE_OPTIONS ${1}/opencv && \
+cd ${1} && \
+rm -rf opencv/generate
diff --git a/setup.py b/setup.py
@@ -162,6 +162,8 @@ def main():
             "-DPYTHON3_LIMITED_API=ON",
             "-DBUILD_OPENEXR=ON",
             "-DBUILD_PNG=ON",
+            # To have all 3rdparty files in one place for source packages
+            "-DOPENCV_DOWNLOAD_PATH=%s" % (os.path.join(os.path.dirname(os.path.abspath(__file__)), "opencv", "3rdparty")),
         ]
         + (
             # If it is not defined 'linker flags: /machine:X86' on Windows x64

Original file line number	Diff line number	Diff line change
`@@ -162,6 +162,8 @@ def main():`
`162`	`162`	`"-DPYTHON3_LIMITED_API=ON",`
`163`	`163`	`"-DBUILD_OPENEXR=ON",`
`164`	`164`	`"-DBUILD_PNG=ON",`
	`165`	`+ # To have all 3rdparty files in one place for source packages`
	`166`	`+ "-DOPENCV_DOWNLOAD_PATH=%s" % (os.path.join(os.path.dirname(os.path.abspath(__file__)), "opencv", "3rdparty")),`
`165`	`167`	`]`
`166`	`168`	`+ (`
`167`	`169`	`# If it is not defined 'linker flags: /machine:X86' on Windows x64`