Merge remote-tracking branch 'origin/5.12.0' into 5.12

Change-Id: Ifb4277657a6f85e6a6d0ee62e54360b2cb1c0514

2 files changed, 13 insertions, 25 deletions

diff --git a/coin/provisioning/common/macos/fbx_macos.sh b/coin/provisioning/common/macos/fbx_macos.sh
index 7e58a107..e9b7c689 100755
--- a/coin/provisioning/common/macos/fbx_macos.sh
+++ b/coin/provisioning/common/macos/fbx_macos.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 #############################################################################
 ##
-## Copyright (C) 2017 The Qt Company Ltd.
+## Copyright (C) 2018 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -39,33 +39,21 @@ set -ex
 # shellcheck source=../unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 
-fileName="fbx20161_2_fbxsdk_clang_mac.pkg.tgz"
-targetFolder="/opt/fbx"
+version="2016.1.2"
+fileName="fbx20161_2_fbxsdk_clang_mac.pkg_nospace.tgz"
 cachedUrl="/net/ci-files01-hki.intra.qt.io/hdd/www/input/fbx/$fileName"
-officialUrl="http://download.autodesk.com/us/fbx_release_older/2016.1.2/$fileName"
-sha1="f82535423c700c605320c52e13e781c92208ec6b"
+# officialUrl="http://download.autodesk.com/us/fbx_release_older/$version/fbx20161_2_fbxsdk_clang_mac.pkg.tgz"
 targetFolder="/tmp"
-targetFile="$targetFolder/$fileName"
-installer="$targetFolder/fbx20161_2_fbxsdk_clang_macos.pkg"
 
 echo "Extracting '$cachedUrl'"
-tar -xzf "$cachedUrl" -C "$targetFolder" || (
-    echo "Failed to uncompress from '$cachedUrl'"
-    echo "Downloading from '$officialUrl'"
-    curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$officialUrl"
-    echo "Checking SHA1 on PKG '$targetFile'"
-    echo "$sha1 *$targetFile" > $targetFile.sha1
-    shasum --check $targetFile.sha1
-    echo "Extracting '$targetFile'"
-    tar -xzf "$targetFile" -C "$targetFolder"
-)
+tar -xzf "$cachedUrl" -C "$targetFolder"
 
-rm -rf "$targetFile"
-echo "Running installer for '$installer'"
-sudo installer -pkg "$installer" -target "/"
+rm -rf "$targetFolder/$fileName"
+echo "Copying preinstalled FBX SDK to Applications"
+sudo cp -r "$targetFolder/Autodesk" /Applications
 
 # Set env variables
-SetEnvVar "FBXSDK" "/Applications/Autodesk/FBX\ SDK/2016.1.2/"
+SetEnvVar "FBXSDK" "/Applications/Autodesk/FBXSDK/2016.1.2/"
 
 echo "FBX SDK = 2016.1.2" >> ~/versions.txt
 
diff --git a/coin/provisioning/common/windows/fbx_windows.ps1 b/coin/provisioning/common/windows/fbx_windows.ps1
index 7b7abe43..285f1f66 100644
--- a/coin/provisioning/common/windows/fbx_windows.ps1
+++ b/coin/provisioning/common/windows/fbx_windows.ps1
@@ -37,11 +37,11 @@
 
 $version = "2016.1.2"
 
-$name = "fbx20161_2_fbxsdk_vs2015_win"
+$name = "fbx20161_2_fbxsdk_vs2015_win_nospace"
 $packageName = "$name.7z"
 $installerName = "$name.exe"
 $cacheUrl = "\\ci-files01-hki.intra.qt.io\provisioning\fbx\$packageName"
-$sha1 = "3690400625672bef6369bcf90dcde4d78b493b24"
+$sha1 = "de80edc255ffd5ce86ba25869dad72b4c809fd41"
 
 # The executable is an interactive installer only. We can't run it in a script silently.
 # $officialUrl = "http://download.autodesk.com/us/fbx_release_older/2016.1.2/$installerName"
@@ -49,7 +49,7 @@ $sha1 = "3690400625672bef6369bcf90dcde4d78b493b24"
 # $sha1 = "54f581c7c19cf5a08cf5e7bc62b8cc7f0617558e"
 
 #$targetFile = "C:\Windows\Temp\$packageName"
-$targetFolder = "C:\Program Files\"
+$targetFolder = "C:\Utils\"
 
 #Write-Host "Downloading '$installerName'"
 #Download $officialUrl $cacheUrl $targetFile
@@ -60,7 +60,7 @@ Extract-7Zip $cacheUrl $targetFolder
 
 #Remove-Item -Recurse -Force "$packageName"
 
-Set-EnvironmentVariable "FBXSDK" "$targetFolder\Autodesk\FBX\FBX SDK\2016.1.2"
+Set-EnvironmentVariable "FBXSDK" "$targetFolder\Autodesk\FBX\FBX_SDK\2016.1.2"
 
 Write-Output "FBX SDK = $version" >> ~\versions.txt