From 2be9656332f86450dd198023944590b267bab1b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C4=99drzej=20Nowacki?= Date: Fri, 27 May 2016 15:07:53 +0200 Subject: Coin provisioning: overwrite files while unzipping Change-Id: I5cf59322f5a34cffe9fe8668755800bccb8cc13a Reviewed-by: Frederik Gladhorn --- coin/provisioning/common/helpers.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'coin/provisioning/common') diff --git a/coin/provisioning/common/helpers.ps1 b/coin/provisioning/common/helpers.ps1 index f517e94d..d7b957f3 100644 --- a/coin/provisioning/common/helpers.ps1 +++ b/coin/provisioning/common/helpers.ps1 @@ -27,5 +27,5 @@ function Extract-Zip $shell = new-object -com shell.application $zipfile = $shell.Namespace($Source) $destinationFolder = $shell.Namespace($Destination) - $destinationFolder.CopyHere($zipfile.Items()) + $destinationFolder.CopyHere($zipfile.Items(), 16) } -- cgit v1.2.3 From a97874523f996ccf5b7a297f2489d89b630034d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C4=99drzej=20Nowacki?= Date: Thu, 26 May 2016 14:40:35 +0200 Subject: Export CI_ICU_PATH variables on all windows templates That is needed to change provisioning way in Coin, as currently it depends on variables hard-coded in Coin agent. Change-Id: I15068bec57dd9d67be05ef753d566b456fb8a2fc Reviewed-by: Frederik Gladhorn --- coin/provisioning/common/icu.ps1 | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 coin/provisioning/common/icu.ps1 (limited to 'coin/provisioning/common') diff --git a/coin/provisioning/common/icu.ps1 b/coin/provisioning/common/icu.ps1 new file mode 100644 index 00000000..4be185e5 --- /dev/null +++ b/coin/provisioning/common/icu.ps1 @@ -0,0 +1,9 @@ +# ICU is already pre-installed on Windows machines, it would be nice to have +# the installation script, but for now let's just export the right variables + +# FIXME: do we really want to have it per MSVC version? What about MSVC2015? +[Environment]::SetEnvironmentVariable("CI_ICU_PATH_MSVC2012", "C:\\Utils\\icu_53_1_msvc_2012_64_devel\\icu53_1", "Machine") +[Environment]::SetEnvironmentVariable("CI_ICU_PATH_MSVC2013", "C:\\Utils\\icu_53_1_msvc_2013_64_devel\\icu53_1", "Machine") + +# FIXME: do we really want to use the 4.8.2 ICU build? +[Environment]::SetEnvironmentVariable("CI_ICU_PATH_Mingw49", "C:\Utils\icu_53_1_Mingw_builds_4_8_2_posix_seh_64_devel\icu53_1", "Machine") -- cgit v1.2.3 From 928c4913977ad4ff99d51105cfa7f20baa3ce6c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C4=99drzej=20Nowacki?= Date: Thu, 26 May 2016 14:29:30 +0200 Subject: Export CI_JOM_PATH variable on all templates with jom That is needed to change provisioning way in Coin, as currently it depends on variables hard-coded in Coin agent. Change-Id: I0bc5c76717e994824b85a4353a7218db4b648344 Reviewed-by: Frederik Gladhorn --- coin/provisioning/common/jom.ps1 | 2 ++ 1 file changed, 2 insertions(+) (limited to 'coin/provisioning/common') diff --git a/coin/provisioning/common/jom.ps1 b/coin/provisioning/common/jom.ps1 index c233ee6e..ef012b64 100644 --- a/coin/provisioning/common/jom.ps1 +++ b/coin/provisioning/common/jom.ps1 @@ -5,3 +5,5 @@ $zip = "c:\users\qt\downloads\jom_1_1_0.zip" Invoke-WebRequest -UseBasicParsing http://download.qt.io/official_releases/jom/jom_1_1_0.zip -OutFile $zip Verify-Checksum $zip "C4149FE706B25738B4C4E54C73E180B9CAB55832" Extract-Zip $zip C:\Utils\Jom + +[Environment]::SetEnvironmentVariable("CI_JOM_PATH", "C:\Utils\Jom", "Machine") -- cgit v1.2.3