Merge pull request #641 from asenyaev/asen/revert_pre_downloaded_files

asenyaev · web-flow · commit 9ad778e311df · 2022-03-25T23:14:35.000+03:00
Revert changes for pre-downloaded files
diff --git a/.github/workflows/build_wheels_linux.yml b/.github/workflows/build_wheels_linux.yml
@@ -171,8 +171,6 @@ 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
diff --git a/scripts/source-packages-preparation.sh b/scripts/source-packages-preparation.sh
diff --git a/setup.py b/setup.py
@@ -162,8 +162,6 @@ 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,8 +162,6 @@ 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")),`
`167`	`165`	`]`
`168`	`166`	`+ (`
`169`	`167`	`# If it is not defined 'linker flags: /machine:X86' on Windows x64`