diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-09-22 21:15:52 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-09-22 21:15:52 +0200 |
| commit | 04ccf0e8dbdb9620ea2e850e5f1cc35a96cf95b6 (patch) | |
| tree | ad43c2b5c1f89c763854f72dc14e72d18b97faac /coin/provisioning/common/install-notepad++.ps1 | |
| parent | 6c4eb77aa0f8b07bb48d74ede633c6bc56d1a75c (diff) | |
| parent | e7472f43087921c3d83ff4452bbdb67ed27ed604 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.9
42b502f is not needed for branches >= 5.8, configure.exe does not
exist anymore.
30660bf was not applied to 5.9 branch, the scripts were not
adapted to new template.
Conflicts:
coin/platform_configs/default.txt
coin/platform_configs/qt5.txt
Change-Id: Ie3681d5f641e99a074368f21b7f85fe31beacc17
Diffstat (limited to 'coin/provisioning/common/install-notepad++.ps1')
| -rw-r--r-- | coin/provisioning/common/install-notepad++.ps1 | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/coin/provisioning/common/install-notepad++.ps1 b/coin/provisioning/common/install-notepad++.ps1 index 15a8c004..2e893852 100644 --- a/coin/provisioning/common/install-notepad++.ps1 +++ b/coin/provisioning/common/install-notepad++.ps1 @@ -36,9 +36,16 @@ # This script will install Notepad++ $version = "7.3" -$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\npp." + $version + ".Installer.x64.exe" -$url_official = "https://notepad-plus-plus.org/repository/7.x/" + $version + "/npp." + $version + ".Installer.x64.exe" -$sha1 = "E7306DF1D6E81801FB4BE0868610DB70E979B0AA" +if( (is64bitWinHost) -eq 1 ) { + $arch = ".x64" + $sha1 = "E7306DF1D6E81801FB4BE0868610DB70E979B0AA" +} +else { + $arch = "" + $sha1 = "d4c403675a21cc381f640b92e596bae3ef958dc6" +} +$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\npp." + $version + ".Installer" + $arch + ".exe" +$url_official = "https://notepad-plus-plus.org/repository/7.x/" + $version + "/npp." + $version + ".Installer" + $arch + ".exe" $nppPackage = "C:\Windows\Temp\npp-$version.exe" Download $url_official $url_cache $nppPackage @@ -50,5 +57,11 @@ Remove-Item -Recurse -Force "$nppPackage" echo "Notepad++ = $version" >> ~\versions.txt -Rename-Item -Path "C:\Program Files (x86)\Notepad++\updater" -NewName "updater_disabled" +if( (is64bitWinHost) -eq 1 ) { + Rename-Item -Path "C:\Program Files (x86)\Notepad++\updater" -NewName "updater_disabled" +} +else { + Rename-Item -Path "C:\Program Files\Notepad++\updater" -NewName "updater_disabled" +} + echo "Auto-updating disabled." |