Update submodules on '5.12.0' in qt5

Change-Id: I17131af760308b6520dd702eaf7aaf03b9a7d706 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2026-01-29 09:56:43 +08:00 · 2018-12-03 19:06:04 +00:00 · 2018-11-28 04:11:02 +00:00 · 2018-11-20 04:06:57 +00:00 · 2018-11-15 20:03:18 +00:00 · 2018-11-13 05:51:53 +00:00
29 changed files with 40 additions and 52 deletions
--- 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

--- 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

--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
Author	SHA1	Message	Date
Qt Submodule Update Bot	061cf1f2ca	Update submodules on '5.12.0' in qt5 Change-Id: I17131af760308b6520dd702eaf7aaf03b9a7d706 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>	2018-12-03 19:06:04 +00:00
Qt Submodule Update Bot	820a1fbe7c	Update submodules on '5.12.0' in qt5 Change-Id: Id850c3339ddc5fe82ee9c0ef13340e56001fbd15 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>	2018-11-28 04:11:02 +00:00
Qt Submodule Update Bot	07b6c0554b	Update submodules on '5.12.0' in qt5 Change-Id: Ice89787923481000fca0409665a366ab8c3540be Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>	2018-11-20 04:06:57 +00:00
Qt Submodule Update Bot	efb253f031	Update submodules on '5.12.0' in qt5 Change-Id: Ib05608e04fe7128046e0573e6c029262e2f8280b Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>	2018-11-15 20:03:18 +00:00
Heikki Halmet	84aaa89cf4	Provisioning: Fix path for fbx files Currently Qt3d Studio build don't recognize fbx path because of space in folder name. This change will fix it by taken use the packages which don't have space in the folder name. Task-number: QT3DS-2440 Change-Id: I502bb04489a03a5a81e164f8a86f3200f4ec3910 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>	2018-11-13 05:51:53 +00:00
Qt Submodule Update Bot	6c624aa570	Update submodules on '5.12.0' in qt5 Change-Id: I8c971bdcbbca07a8ec03cc4a3dda56ada4afcd00 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>	2018-11-11 18:59:51 +00:00
Qt Submodule Update Bot	829447d340	Update submodules on '5.12.0' in qt5 Change-Id: If218ebc667e5378b1a2527f42c93c456045f1f45 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>	2018-11-09 13:10:15 +00:00
Qt Submodule Update Bot	092b611d80	Update submodules on '5.12.0' in qt5 Change-Id: Ie4dca9cdf3a39a21cd8c380204860ee578733463 Reviewed-by: Liang Qi <liang.qi@qt.io>	2018-11-07 05:00:29 +00:00