Commit3a4c30e

committed

Added pre-downloaded 3rdparty files to source packages

1 parent623401a commit3a4c30eCopy full SHA for 3a4c30e

File tree

+26

-2

lines changed

+26

-2

lines changed

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -171,12 +171,14 @@ jobs:`
`171`	`171`
`172`	`172`	`-name:Build a package`
`173`	`173`	`run:\|`
	`174`	`+ # Download all 3rdparty files`
	`175`	`+ source scripts/source-packages-preparation.sh ${{ github.workspace }}`
`174`	`176`	`set -e`
`175`	`177`	`# Build and package`
`176`	`178`	`set -x`
`177`	`179`	`python -m pip install --upgrade pip`
`178`	`180`	`python -m pip install scikit-build`
`179`		`- python setup.py sdist`
	`181`	`+ python setup.py sdist --formats=xztar`
`180`	`182`	`set +x`
`181`	`183`	`# Install and run tests`
`182`	`184`	`set -x`
`@@ -186,7 +188,7 @@ jobs:`
`186`	`188`	`uses:actions/upload-artifact@v2`
`187`	`189`	`with:`
`188`	`190`	`name:wheels`
`189`		`-path:dist/opencv*.tar.gz`
	`191`	`+path:dist/opencv*.tar.xz`
`190`	`192`
`191`	`193`	`test_release_opencv_python:`
`192`	`194`	`if:github.event_name == 'release' && github.event.release.prerelease`

Lines changed: 20 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,20 @@`
	`1`	`+#!/bin/bash`
	`2`	`+`
	`3`	`+# ${1} variable is a path to repository opencv-python`
	`4`	`+`
	`5`	`+# Define flags`
	`6`	`+if ["0"==$ENABLE_CONTRIB ];then`
	`7`	`+ git submodule update --init opencv`
	`8`	`+ EXTRA_CMAKE_OPTIONS="-DOPENCV_DOWNLOAD_PATH=${1}/opencv/3rdparty"`
	`9`	`+else`
	`10`	`+ git submodule update --init opencv opencv_contrib`
	`11`	`+ EXTRA_CMAKE_OPTIONS="-DOPENCV_DOWNLOAD_PATH=${1}/opencv/3rdparty -DOPENCV_EXTRA_MODULES_PATH=${1}/opencv_contrib/modules"`
	`12`	`+fi`
	`13`	`+`
	`14`	`+# Download 3rdparty files`
	`15`	`+cd opencv&& \`
	`16`	`+mkdir generate&& \`
	`17`	`+cd generate&& \`
	`18`	`+cmake$EXTRA_CMAKE_OPTIONS${1}/opencv&& \`
	`19`	`+cd${1}&& \`
	`20`	`+rm -rf opencv/generate`

Lines changed: 2 additions & 0 deletions

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`

Comments

(0)