Skip to content

Commit ab0b8a4

Browse files
authored
Merge pull request #905 from psychocoderHPC/fix-tbb-win-download
backport of #901 to the release branch
2 parents d7471b9 + 13c06f9 commit ab0b8a4

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

script/travis/install_tbb.sh

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,17 @@ then
2020
travis_retry sudo apt-get -y --quiet --allow-unauthenticated --no-install-recommends install libtbb-dev
2121
elif [ "$TRAVIS_OS_NAME" = "osx" ]
2222
then
23+
brew unlink python@2
2324
brew install tbb
2425
elif [ "$TRAVIS_OS_NAME" = "windows" ]
2526
then
2627
TBB_ARCHIVE_VER="tbb44_20160526oss"
27-
TBB_DOWNLOAD_URL="https://www.threadingbuildingblocks.org/sites/default/files/software_releases/windows/${TBB_ARCHIVE_VER}_win_0.zip"
28-
TBB_DST_PATH="${TBB_ROOT_DIR}/tbb.zip"
28+
TBB_DOWNLOAD_URL="https://github.com/intel/tbb/releases/download/4.4.5/${TBB_ARCHIVE_VER}_win.zip"
29+
TBB_DST_PATH="tbb.zip"
30+
powershell.exe -Command '[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; Invoke-WebRequest "'${TBB_DOWNLOAD_URL}'" -OutFile "'${TBB_DST_PATH}'"'
2931
mkdir "${TBB_ROOT_DIR}"
30-
powershell.exe Invoke-WebRequest "${TBB_DOWNLOAD_URL}" -OutFile "${TBB_DST_PATH}"
3132
unzip -q "${TBB_DST_PATH}" -d "${TBB_ROOT_DIR}"
33+
rm "${TBB_DST_PATH}"
3234
TBB_UNZIP_DIR="${TBB_ROOT_DIR}/${TBB_ARCHIVE_VER}"
3335
mv ${TBB_UNZIP_DIR}/* "${TBB_ROOT_DIR}/"
3436
rmdir "${TBB_UNZIP_DIR}"

0 commit comments

Comments
 (0)