aboutsummaryrefslogtreecommitdiffstats
path: root/coin
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2018-01-196-14/+25
|\ | | | | | | Change-Id: I0fdced87d2064e8459fa0b9c4e16a53c1f44ac0a
| * Move exception throw to the correct lineJoni Jantti2018-01-191-2/+2
| | | | | | | | | | | | | | | | | | This throw was placed on the echo line instead of the actual command. Change-Id: I907c2ce17afa64c9c4ef628d766d7dfe270ade59 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| * Merge remote-tracking branch 'origin/5.9.4' into 5.9Liang Qi2018-01-182-2/+6
| |\ | | | | | | | | | Change-Id: I1c5c5e6e938f33dd8b0b9c40e64d509eeec25774
| | * Revert "Add 'ForceDebugInfo' -flag to linux desktop binaries"v5.9.4Jani Heikkinen2018-01-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now debug symbols are added in qtlibs as well and library size is huge. We need additional 'separate_debug_info' flag in addition to this but currently there isn't support for it in coin. That's why we need to revert this change until coin has full support for this. This reverts commit b0b6b05b34f7d24c3a762e9b383c1b5bd1153a04. Change-Id: I7d36d2778433d2034420c209b73d21b5af32249f Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
| | * Provisioning: Set CMake to PATH on UbuntuTony Sarajärvi2018-01-091-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ubuntu uses .profile file instead of .bashrc. We need to use the correct file accordingly. Task-number: QTBUG-65594 (cherry picked from commit 22e4664eb08dc5384c5afd0bd6c6a0725b242517) Change-Id: Iceeec53882f1a5c97cd8f7ea5b013d543c156acb Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| * | Provisioning: Fix disabling windows updatesOliver Wolff2018-01-181-2/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On some machines the updates were already disabled, which lead to the call to disable the service failing. Now we just move on without error. Change-Id: Ia48f7164c23dfe24e24548558d582cdc0190b7e3 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| * | Fix provisioning: NotePad++ path on 64 bit windowsFrederik Gladhorn2018-01-181-6/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | We install the 64 bit version of np++ which is installed in the regular program files folder. Change-Id: I702210eaf7dfae75bbfcfd9cc98d8ed96d775f61 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
| * | Fix provisioning: Wait for msvc-2013 update 5 to finishFrederik Gladhorn2018-01-181-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Installing Update 5 for Visual Studio 2013 Update 5 (KB2829760)... Removing C:\Windows\Temp\vs12-kb2829760.exe ... Caught System.UnauthorizedAccessException Access to the path 'C:\Windows\Temp\vs12-kb2829760.exe' is denied. Change-Id: I9fe136f0361ee21e38563dd17bf76bf4fd53747f Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| * | Fix checksum for QNX 7 SDK downloadFrederik Gladhorn2018-01-171-1/+1
| | | | | | | | | | | | | | | Change-Id: Ia37c6d032d1a4c2841482292a2c2c2f8fd468859 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
* | | Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2018-01-121-1/+1
|\| | | | | | | | | | | Change-Id: Idf9c18da5527327178887c257fc56dbc27e1c8ad
| * | Install p7zip-full, that contains the 7z binaryFrederik Gladhorn2018-01-111-1/+1
| | | | | | | | | | | | | | | | | | | | | p7zip is only a minimal version containing 7zr. Change-Id: I12531514490b6eb871419bdb61ea5896b175a678 Reviewed-by: Simo Fält <simo.falt@qt.io>
* | | Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2018-01-11299-271/+269
|\| | | | | | | | | | | | | | | | | | | | Fixed up provisioning script locations after the reshuffeling into common/platform folders. Change-Id: Ia0b7d076e475ccc207f2955572fb9ab4171e5d9d
| * | Remove 'Packaging' flag from QtWebKit MSVC2017/x86Konstantin Tokarev2018-01-101-1/+1
| | | | | | | | | | | | | | | | | | | | | Qt doesn't provide binaries for this platform. Change-Id: Iab30435bb480ee898c2409f87facabb26fce9421 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| * | Split Common folder based on operating system familiesHeikki Halmet2018-01-10282-253/+253
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change will split common folder to four different folders: Linux, Unix, Windows and MacOS. Each of these folders includes scripts which are common for their operating system familes Task-number: QTQAINFRA-1451 Change-Id: Ic93b2183052335dee875d1452b21e38d268b6474 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
| * | Remove devtoolset sourcing from openssl provisioning on UbuntuJoni Jantti2018-01-101-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | This line is a leftover from RHEL script and needs to be removed on Ubuntu. Change-Id: I8fc8ab7cff808da997cb88a3cec4c65eaa1528a4 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
* | | Add +x rights to provisioning scrips missing it and consolidate shebangTony Sarajärvi2018-01-076-5/+5
| | | | | | | | | | | | | | | | | | Change-Id: I1e1fb37bfffd0451c02166227805b40b48d31582 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
* | | Fix opcua provisioning by sourcing .profileTony Sarajärvi2018-01-072-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When CMake is installed it exports its install path into .profile. However, freeopcua doesn't source it as builds do, so it couldn't find the cmake. Also, as Ubuntu is using .profile in our builds, this commit fixes so that the PATH is actually written into the right file. Task-number: QTBUG-65594 Change-Id: I561a88a07872436bb4a3bd62a2d55fd56a130121 Reviewed-by: Joni Jäntti <joni.jantti@qt.io> Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
* | | Consolidate prefixes of provisioning scriptsTony Sarajärvi2018-01-0713-72/+0
| | | | | | | | | | | | | | | Change-Id: I75a4bcb049a2c4d034a74b6838ffe7ddf2c3015e Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | | Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2018-01-06170-156/+672
|\| | | | | | | | | | | Change-Id: I7119e6e1853b0eef2b695fb8165518e90b18d250
| * | Merge remote-tracking branch 'origin/5.9.4' into 5.9Liang Qi2018-01-051-0/+5
| |\| | | | | | | | | | | | | | | | | | | Conflicts: .gitmodules Change-Id: I6a2446b8ed4212e3965b37cb2c25f35ba6ed7efc
| | * Provisioning: Ubuntu16.04 - CMakeJoni Jantti2018-01-051-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | CMake is missing from the clean installed Ubuntu 16.04. Change-Id: I965bc3e55eb9b0765f483a84e5584e61054bdd80 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io> Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * | Provisioning: Ubuntu 16.04 - Set timezone to UTCJoni Jantti2018-01-051-0/+6
| |/ | | | | | | | | | | Task-number: QTBUG-65435 Change-Id: I329926d0f83d47c9e69eee177c600ac629ee9415 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
| * Set up proxy for provisioning scriptsTony Sarajärvi2018-01-029-1/+165
| | | | | | | | | | | | Task-number: QTQAINFRA-1669 Change-Id: I582dc5037bd2b46dcd5c9c3b2cb13784e122d6a5 Reviewed-by: Simo Fält <simo.falt@qt.io>
| * Fix shebangs and give provisioning scripts +x rightsTony Sarajärvi2018-01-0279-69/+80
| | | | | | | | | | Change-Id: Ib85721600b1e4461470a9ea4fd3b29fca0b35633 Reviewed-by: Simo Fält <simo.falt@qt.io>
| * Add set -ex to 7z provisioning in RHEL 7.4Tony Sarajärvi2018-01-021-0/+3
| | | | | | | | | | | | Change-Id: If6323055999830954df6893d72ff2031b34f0276 Reviewed-by: Joni Jäntti <joni.jantti@qt.io> Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
| * Fix the Tier1 image that qtbase builds qemu builds withTony Sarajärvi2018-01-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Commit fcc0feaacb91ab5aefb212d351dcea7c728eefa5 forgot to update the Tier1 image in qtbase.txt. It only updated default.txt and qtdeclarative.txt. Most likely because qtbase.txt was added after initial changes were made and not caught in rebase. Task-number: QTQAINFRA-1574 Change-Id: If5da006172037c27dec5b3ae0b14330bc6f0149f Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
| * Make provisioning script prefix style match across platformsJoni Jantti2017-12-29123-12/+0
| | | | | | | | | | | | | | | | | | | | | | Currently we are using different styles and amount of digits for the provisioning script prefixes. This change will unify them across the platforms. Also removes a couple of duplicate files. Task-number: QTQAINFRA-1668 Change-Id: I039777e7616bccc29c6a4ac55db13326ae8dc87c Reviewed-by: Joni Jäntti <joni.jantti@qt.io> Reviewed-by: Simo Fält <simo.falt@qt.io>
| * Provisioning: VirtualBox for RTAJoni Jantti2017-12-292-0/+54
| | | | | | | | | | | | | | | | RTA needs VirtualBox for running GammaRayPlugin RTA tests. Task-number: QTQAINFRA-1661 Change-Id: If66d6a63355ed5cc8c8525408c2dfc8c4f3d1bac Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| * Add clean Ubuntu 16.04 provisioningJoni Jäntti2017-12-2910-31/+165
| | | | | | | | | | | | | | | | | | | | Currently Ubuntu 16.04 template has stuff installed on its tier 1. We want to have a clean installed tier 1 and install everything on it during provisioning. This will save some disk space on our hosts. Task-number: QTQAINFRA-1574 Change-Id: Ia7e6df62835a8e31943c00996f12ac70c6c71aed Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| * Add set -ex to provisioning scripts for openSUSE-42.3Joni Jantti2017-12-277-3/+13
| | | | | | | | | | Change-Id: I71fb0074bc07ce3085401ac23be77ea32e52dcfa Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| * Add set -ex to provisioning scripts for RHEL 6.6Joni Jantti2017-12-277-0/+19
| | | | | | | | | | Change-Id: I6e6e66cffcbd84af1e093176d65751063492122b Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| * Add set -ex to provisioning scripts for Ubuntu-16.04Joni Jantti2017-12-274-1/+8
| | | | | | | | | | Change-Id: Icc4b58080875255d8c2efe3e5db2c05e18127606 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| * Add set -ex to provisioning scripts for macos-10.12Joni Jantti2017-12-2720-0/+45
| | | | | | | | | | Change-Id: Ieea4f84909c552728614a4d3c23d4c8ab9134fb2 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| * Add set -ex to provisioning scripts for osx-10.10Joni Jantti2017-12-277-0/+15
| | | | | | | | | | Change-Id: I732df317aa0016b1d970e0d37167a3fc9276a645 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| * Add set -ex to provisioning scripts for osx-10.11Joni Jantti2017-12-2715-1/+33
| | | | | | | | | | Change-Id: I56ecd39a553b8b777eac0f8822cfd3263e972ef5 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| * Remove provisioning of ICU for VS2012Tony Sarajärvi2017-12-271-36/+0
| | | | | | | | | | | | | | Visual Studio 2012 isn't used in our builds. Change-Id: I7f2480a1811efd1c1f164f468407ab55d5c4102d Reviewed-by: Simo Fält <simo.falt@qt.io>
| * Provision fbx to RHEL 7.4 for 3DStudioTony Sarajärvi2017-12-271-0/+5
| | | | | | | | | | Change-Id: I2aaad4abc2e3d42bdd1f5204d20ee4fea3c0388f Reviewed-by: Simo Fält <simo.falt@qt.io>
| * Add set -ex to provisioning scripts for RHEL 7.4Tony Sarajärvi2017-12-2713-4/+58
| | | | | | | | | | | | | | Task-number: QTQAINFRA-1659 Change-Id: I9e3c1ec559eab29ccb693956201fc2b63f999882 Reviewed-by: Joni Jäntti <joni.jantti@qt.io> Reviewed-by: Simo Fält <simo.falt@qt.io>
* | Add Apple tvOS and Apple watchOS configs for all modulesJake Petroules2018-01-051-1/+3
| | | | | | | | | | | | | | | | ...not just qt5. This will eliminate the semi-frequent integration failures in qt5 submodules updates. Change-Id: I99a4eb1cf41005adcfd12e385b663a5d8adbc628 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2017-12-2210-38/+30
|\| | | | | | | | | | | | | Conflicts: coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/002-zypperpackages.sh Change-Id: I5aaf8fa93f7a9f06e30b9730703e8d1e018cb1f7
| * Fix Android provisioning scriptSimo Fält2017-12-221-1/+1
| | | | | | | | | | | | | | | | | | | | We have to accept extra license to enable installing all required packages. Task-number: QTQAINFRA-1660 Change-Id: I9d014991be96ff0723688b317a645e281b3e92d0 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> (cherry picked from commit 5df4ec2ec999440ba291f2bf2f9fa6b72810660d)
| * Remove unneeded OS X provisioning scriptsTony Sarajärvi2017-12-225-15/+0
| | | | | | | | | | | | Change-Id: Icf03c93adee31baac383d1394857df8c2df4fe59 Reviewed-by: Joni Jäntti <joni.jantti@qt.io> Reviewed-by: Simo Fält <simo.falt@qt.io>
| * Remove 'Packaging' flag from builds we don't need itJani Heikkinen2017-12-222-3/+3
| | | | | | | | | | | | | | | | | | We don't offer binaries for INTEGRITY, MSVC2013 32 bit or MSVC2017 32bit so we don't need 'packaging' flag there either Task-number: QTBUG-65324 Change-Id: If9e8fdebab44fcafde9b4da893be6f79f6287aac Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
| * Simplify apt package installation and disable daily package maintenanceSimon Hausmann2017-12-201-19/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of using aptdcon, we can continue to use apt-get to install the software. We just need to make sure that the automatic update and package upgrade services are disabled. This is generally desirable as we do not want these kind of activities to occur in the background while building or running tests. This also fixes the broken package installation via regex, which apt-get supports but aptdcon does not. Revert "Fix Ubuntu 16.04 random provisioning fail" This reverts commit 537ea17d14526bc6564765e2dd4652e11a3ed235. Conflicts: coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/002-apt.sh Change-Id: I920e5132bb0a248d3794e1efcf01ce78d28e6ee3 Reviewed-by: Joni Jäntti <joni.jantti@qt.io> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
| * Install cups-devel in OpenSuseAlbert Astals Cid2017-12-181-0/+3
| | | | | | | | | | | | | | This way we have one build that compiles the "with cups" branch and others (the ubuntu ones) that compile the "without cups" code branch Change-Id: I45ab3d72c34367789e0f344c917a88269883cffe Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* | Add libxml2 and libxslt to RHEL 7 for QtWebKitKonstantin Tokarev2017-12-191-0/+3
| | | | | | | | | | Change-Id: I5c50ee482aa20f0d9959915c81d2c44cccce6dca Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* | Add GStreamer libraries to openSUSE for QtWebKit and QtMultimediaKonstantin Tokarev2017-12-181-0/+4
| | | | | | | | | | Change-Id: Ia40bb35687bbe1ecb429c042d4acfa22599b69b8 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* | Remove Windows 8 provisioning scriptsTony Sarajärvi2017-12-152-2/+0
| | | | | | | | | | | | | | They are replaced by 8.1 scripts. Change-Id: Ib04c183b75cec2c6e529945f382c53fdeb23f213 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
* | Add libxml2 and libxslt to openSUSE for QtWebKitKonstantin Tokarev2017-12-151-0/+4
| | | | | | | | | | Change-Id: Iafb89bf9c12cf1d38c2fe1944d55965319b85ea3 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* | Provisioning: Update default compiler to GCC-7 in openSUSE 42.3Tony Sarajärvi2017-12-141-3/+6
| | | | | | | | | | | | Task-number: QTQAINFRA-1258 Change-Id: Ia2683a23ecc55aae4e82f901f446d1cf46895269 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-26 13:29:31 +0000