aboutsummaryrefslogtreecommitdiffstats
path: root/coin/provisioning/common/windows
diff options
context:
space:
mode:
authorHeikki Halmet <heikki.halmet@qt.io>2018-11-07 16:00:29 +0200
committerJani Heikkinen <jani.heikkinen@qt.io>2018-11-13 05:51:53 +0000
commit84aaa89cf43b11f4726c7aec7ce65b84f59d1208 (patch)
tree49f7922e5392681ba53c03113fbaaf5ade6a81fe /coin/provisioning/common/windows
parent6c624aa570a41aa964a2574f3fe28586273932b3 (diff)
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>
Diffstat (limited to 'coin/provisioning/common/windows')
-rw-r--r--coin/provisioning/common/windows/fbx_windows.ps18
1 files changed, 4 insertions, 4 deletions
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