lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-04-21 20:36:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Provisioning: Fix path for fbx files

Browse Source 
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>
This commit is contained in:
Heikki Halmet
2018-11-07 16:00:29 +02:00
committed by Jani Heikkinen
parent 6c624aa570
commit 84aaa89cf4
2 changed files with 13 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
coin/provisioning/common/macos/fbx_macos.sh
View File

@@ -1,7 +1,7 @@
#!/usr/bin/env bash #!/usr/bin/env bash
############################################################################# #############################################################################
## ##
## Copyright (C) 2017 The Qt Company Ltd. ## Copyright (C) 2018 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/ ## Contact: http://www.qt.io/licensing/
## ##
## This file is part of the provisioning scripts of the Qt Toolkit. ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -39,33 +39,21 @@ set -ex
# shellcheck source=../unix/SetEnvVar.sh # shellcheck source=../unix/SetEnvVar.sh
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
fileName="fbx20161_2_fbxsdk_clang_mac.pkg.tgz" version="2016.1.2"
targetFolder="/opt/fbx" fileName="fbx20161_2_fbxsdk_clang_mac.pkg_nospace.tgz"
cachedUrl="/net/ci-files01-hki.intra.qt.io/hdd/www/input/fbx/$fileName" 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" # officialUrl="http://download.autodesk.com/us/fbx_release_older/$version/fbx20161_2_fbxsdk_clang_mac.pkg.tgz"
sha1="f82535423c700c605320c52e13e781c92208ec6b"
targetFolder="/tmp" targetFolder="/tmp"
targetFile="$targetFolder/$fileName"
installer="$targetFolder/fbx20161_2_fbxsdk_clang_macos.pkg"
echo "Extracting '$cachedUrl'" echo "Extracting '$cachedUrl'"
tar -xzf "$cachedUrl" -C "$targetFolder" || ( 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"
)
rm -rf "$targetFile" rm -rf "$targetFolder/$fileName"
echo "Running installer for '$installer'" echo "Copying preinstalled FBX SDK to Applications"
sudo installer -pkg "$installer" -target "/" sudo cp -r "$targetFolder/Autodesk" /Applications
# Set env variables # 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 echo "FBX SDK = 2016.1.2" >> ~/versions.txt

8
coin/provisioning/common/windows/fbx_windows.ps1
View File

@@ -37,11 +37,11 @@
$version = "2016.1.2" $version = "2016.1.2"
$name = "fbx20161_2_fbxsdk_vs2015_win" $name = "fbx20161_2_fbxsdk_vs2015_win_nospace"
$packageName = "$name.7z" $packageName = "$name.7z"
$installerName = "$name.exe" $installerName = "$name.exe"
$cacheUrl = "\\ci-files01-hki.intra.qt.io\provisioning\fbx\$packageName" $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. # 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" # $officialUrl = "http://download.autodesk.com/us/fbx_release_older/2016.1.2/$installerName"
@@ -49,7 +49,7 @@ $sha1 = "3690400625672bef6369bcf90dcde4d78b493b24"
# $sha1 = "54f581c7c19cf5a08cf5e7bc62b8cc7f0617558e" # $sha1 = "54f581c7c19cf5a08cf5e7bc62b8cc7f0617558e"
#$targetFile = "C:\Windows\Temp\$packageName" #$targetFile = "C:\Windows\Temp\$packageName"
$targetFolder = "C:\Program Files\" $targetFolder = "C:\Utils\"
#Write-Host "Downloading '$installerName'" #Write-Host "Downloading '$installerName'"
#Download $officialUrl $cacheUrl $targetFile #Download $officialUrl $cacheUrl $targetFile
@@ -60,7 +60,7 @@ Extract-7Zip $cacheUrl $targetFolder
#Remove-Item -Recurse -Force "$packageName" #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 Write-Output "FBX SDK = $version" >> ~\versions.txt