summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | Add option to define operations in component.xmlKatja Marttila2020-12-0755-252/+780
| | | | | | | | | | | | | | | | | | | | | | Operations can from now on be declared also in component.xml. The operations are performed, backuped and rollbacked the same way as they would be when defined from scripting api. Task-number: QTIFW-507 Change-Id: Ia509219b94737136c3de25db0cb0c72076b48380 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
* | Remove 'Reject Licenses' radio buttonKatja Marttila2020-12-022-23/+0
| | | | | | | | | | | | | | | | | | One radio button is enough, by selecting 'Accept Licenses' the 'Next' button is enabled. Task-number: QTIFW-2057 Change-Id: I0db0fb2e85644528b4a2b4304903549d0a91ecbf Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
* | Tools: refactor to move general purpose functionality to installer libArttu Tarkiainen2020-12-0223-377/+552
| | | | | | | | | | | | | | | | | | This makes it possible to utilize parts of our existing tooling in the offline installer from online installer generation process. Task-number: QTIFW-2048 Change-Id: I7ee605be75541cc83a3b6909089bda45f0835bcf Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* | Print package information in xml formatKatja Marttila2020-11-2512-317/+236
| | | | | | | | | | | | | | | | | | Also removed logging categories for package information, the full package information can be printed by increasing the verbosity level. Task-number: QTIFW-1950 Change-Id: I4bce019a63ba1fbf48e3bb0ca45511e42d4974c9 Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
* | Merge remote-tracking branch 'origin/4.0' into masterKatja Marttila2020-11-2444-86/+228
|\| | | | | | | Change-Id: If5205ff6ef2c8989520e24d41595c04d5920d207
| * Fix permissions in 'Licenses' and 'installerResources' directoriesArttu Tarkiainen2020-11-182-3/+9
| | | | | | | | | | | | | | | | | | Both directories are created by IFW so they should follow the same file permissions practice we use whenever possible. This fix also applies to subdirectories inside 'installerResources'. Change-Id: I747a7638028fb0b9ff406143a97b5100eacc2566 Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
| * Set "FrameworkVersion" installer valueArttu Tarkiainen2020-11-181-0/+5
| | | | | | | | | | | | | | | | This makes it possible to query for the Installer Framework version of the running installer binary from the scripting-API. Change-Id: I88fd12d081aa720cbe95683ee35714e5e2d4908b Reviewed-by: Katja Marttila <katja.marttila@qt.io>
| * Update ChangelogKatja Marttila2020-11-181-0/+11
| | | | | | | | | | Change-Id: I09aba5b1ad22af3ce3826812e268a814c0dfa52e Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
| * Enable HighDPI support in X11Katja Marttila2020-11-111-1/+1
| | | | | | | | | | Change-Id: I560796aa248df505a86701014a001deb90c627f2 Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
| * Fix AppendFile undoKatja Marttila2020-11-111-0/+4
| | | | | | | | | | | | | | | | | | | | If Appendfile is done to a file in an install folder, the backup file name folder name is saved as @RELOCATABLE_PATH@. Replace the variable with actual folder when the value is read. Task-number: QTIFW-2020 Change-Id: Ibe32f9afd53fd9698c0acc14de62a641d0dd89c4 Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
| * Update IFW version to 4.0.1Katja Marttila2020-11-104-8/+8
| | | | | | | | | | Change-Id: I084e4a80cc7d98f6ddc455dad4f8df09d01087ee Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
| * Repogen: Fix unite metadata when --repository switch usedKatja Marttila2020-11-1026-51/+126
| | | | | | | | | | | | | | | | | | | | United metadata 7z was missing the component which had no update available. Task-number: QTIFW-2018 Change-Id: I069fd852499f157075bf28e3ccfef3e42e5f30a9 Reviewed-by: Iikka Eklund <iikka.eklund@qt.io> Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
| * CLI: Tidy up progress message printArttu Tarkiainen2020-11-052-5/+5
| | | | | | | | | | | | | | | | The debug print does not look very nice when the string contains escape characters for quotes or extra spaces. Change-Id: I9428d3aef4e3ebd693f66083447430e4e2600098 Reviewed-by: Katja Marttila <katja.marttila@qt.io>
| * Docs: Fix doc on gui::showFinishedPage()Martin Kampas2020-11-041-1/+1
| | | | | | | | | | | | | | Task-number: QTIFW-798 Change-Id: I9ed5bb585cc0b09cd0a17c535e7073d6e7bf4fc8 Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io> Reviewed-by: Katja Marttila <katja.marttila@qt.io>
| * Fix loading controller script with comment on last lineMartin Kampas2020-11-042-1/+3
| | | | | | | | | | | | | | Task-number: QTIFW-1062 Change-Id: I3deb46cae74d1e5851d4ddd4b58c0ba19375ddbd Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io> Reviewed-by: Katja Marttila <katja.marttila@qt.io>
| * Fix segfault on file download error properlyMartin Kampas2020-11-041-5/+5
| | | | | | | | | | | | | | | | | | | | | | The onError function destroys instances required later during the error message construction. This improves over the fix introduced with commit 6a93f37440a3dcc72bb5e496dac90a8f95d63eab. Change-Id: I54c4064eb225d3e3913ce5073706a5ce5717d234 Reviewed-by: Katja Marttila <katja.marttila@qt.io>
| * Doc: Update command line interface referenceArttu Tarkiainen2020-11-041-6/+9
| | | | | | | | | | | | | | Add missing short versions of options and '--confirm-command' reference. Change-Id: I4e4df0a7f883a97b653da1dea4dae878f4e1484c Reviewed-by: Katja Marttila <katja.marttila@qt.io>
| * CLI: Minor cleanup for commands help textArttu Tarkiainen2020-11-031-7/+8
| | | | | | | | | | | | | | | | | | | | Instead of using tabs for indentation, use the same two whitespaces as with options. Use the same format for package list arguments as in documentation. Change-Id: Id5a7d1e6bdbea6a49c560cdadb2fe3ef5793d04a Reviewed-by: Katja Marttila <katja.marttila@qt.io> Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
| * Add missing members to PackageManagerCorePrivate member initializer listArttu Tarkiainen2020-11-031-0/+8
| | | | | | | | | | | | | | | | | | | | The lesser called class constructor function was missing initialization for some of the fundamental data type member variables. This could cause weird behavior in autotests, where a PackageManagerCore object for "fake" installers is instantiated on multiple occasions. Change-Id: I4e65453e3125cb5b4b662314a593bb0232907478 Reviewed-by: Katja Marttila <katja.marttila@qt.io>
| * Obey stylesheet in SettingsDialogKatja Marttila2020-11-031-0/+17
| | | | | | | | | | Change-Id: I3fa464acece6276a3c147d9b8585c7da100a3574 Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
| * CLI: Fix wrong warning text in command 'purge' for running processesArttu Tarkiainen2020-11-033-6/+16
| | | | | | | | | | | | Task-number: QTIFW-1996 Change-Id: Iaf9aa6bfd39d266ed052838e969881c168b4b2ed Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* | Update IFW version numberKatja Marttila2020-11-104-8/+8
| | | | | | | | | | Change-Id: Ia170c00fcd6dd585a2e91bdc0e266dc05de90d8d Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
* | Arrange licenses and filter duplicatesJarkko Lehtoranta2020-11-0611-26/+100
| | | | | | | | | | | | | | | | | | | | | | - Add a "priority" attribute to the "License" element used in "package.xml" for arranging licenses by priority in the LicenseAgreementPage and in CLI. Priority >0 shows the license on top of others. - Arrange the licenses with the same priority alphabetically - Filter duplicate licenses from the LicenseAgreementPage and from CLI Change-Id: I1dcacdd417d2383b8dc18149e4de329fbf11cfe8 Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
* | CLI: Print extra archive information with higher verbosity levelArttu Tarkiainen2020-11-057-12/+69
| | | | | | | | | | | | | | | | | | | | Also rework verbosity level handling to use predefined and range constrained enumeration list values. Task-number: QTIFW-1998 Change-Id: Iaf15ca638411e6842d3d502c4d7ff11d28d06658 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* | Allow to set ForcedInstallation from component scriptMartin Kampas2020-11-041-8/+6
| | | | | | | | | | | | Change-Id: I7bba68f5159737971de9801012daef8aaff09216 Task-number: QTIFW-675 Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* | Automatically uninstall unneeded virtual componentsMartin Kampas2020-11-046-2/+53
| | | | | | | | | | | | Change-Id: Ifbbfec4449a9f5b0a79269fc7ddfcc1780e762e5 Task-number: QTBUG-76210 Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* | CLI: Add possibility to filter installed packages with regexpArttu Tarkiainen2020-11-047-8/+23
| | | | | | | | | | | | Task-number: QTIFW-1953 Change-Id: Ie291e8ae96d46082e342e9bcb152258862813afd Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* | Replace obsolete qrand() with QRandomGeneratorKatja Marttila2020-11-046-8/+10
| | | | | | | | | | Change-Id: Ie61b192bcf047cc70f728ea15370ff50e7a41769 Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
* | Remove unused code blocks and functionsKatja Marttila2020-11-0415-95/+24
|/ | | | | | | | Results analyzed using cppcheck tools. Also add Q_DECL_OVERRIDE to overwrited functions. Change-Id: Iab5eb43206af0050c1dd84efb7ed860ab9594496 Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
* create_ifw_installer.py: Set execute bit for file4.0.0Arttu Tarkiainen2020-10-221-0/+0
| | | | | Change-Id: Id7e544f912d7c59c7c57f59680611ae52ed8a50e Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
* Fix ifw package versionsKatja Marttila2020-10-212-2/+2
| | | | | | | | Packages don't understand the variants, replacing those with hard coded values. Change-Id: I5a35a1f46958b4ce699a2eff117305cc2e75cbb1 Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
* create_ifw_installer.py: Require filename for the generated binaryArttu Tarkiainen2020-10-211-16/+4
| | | | | Change-Id: I1330a170999c0518637dd3b27ec9050382756c02 Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* Allow replacing variants in 'Title'Katja Marttila2020-10-211-1/+1
| | | | | Change-Id: If3c675f0cd76744eee63170f629633b31f7a046a Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
* Add a script to generate IFW installerArttu Tarkiainen2020-10-201-0/+121
| | | | | | | | | | | | This script can be used to generate an offline installer that packs the built IFW libraries as installable content. It requires that the IFW has been built first i.e. the IFW build artifacts are the input for this script. Task-number: QTIFW-1027 Change-Id: I34157d43129464273a1e4c338b795cb3a1b9277b Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* Update ChangelogKatja Marttila2020-10-201-0/+5
| | | | | Change-Id: I31f3ec6f14d689e8f4892ae31f9bb8cc2500aca8 Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
* Fix segfault in 'void localSocket()' test functionArttu Tarkiainen2020-10-161-33/+31
| | | | | Change-Id: Iced229d7d364f68599bd6eec20db57838f36a671 Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* Fix packagemanagercore test in macosKatja Marttila2020-10-162-2/+6
| | | | | Change-Id: I67178a9df34e3ed4752452dca9a85709fdd4c620 Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
* Remove "What's this" button from settings page on WindowsArttu Tarkiainen2020-10-161-0/+1
| | | | | | Task-number: QTIFW-1986 Change-Id: I0dbf619c5d0459bc6750764abfaabc8abbe265c7 Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* Repogen: Fix options to work with unite metadataKatja Marttila2020-10-1543-81/+827
| | | | | | | | | | | | | | Fixed regogen 'update' and 'repository' options to work with unite metadata. --update-new-components with unify metadata is prevented. Moved --update-new-components functionality from repogen.cpp to QInstallerTools so it can be accessed from tests. Created tests for repogen. Task-number: QTIFW-1943 Change-Id: I12389f4747154a0f6f51b4f34f630103c2cfef04 Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
* Don't warn if maintenance tool cannot be deletedKatja Marttila2020-10-152-4/+22
| | | | | | | | | We have a deferred delete for maintenance tool as in Windows the running program cannot be deleted. Task-number: QTIFW-1979 Change-Id: I3bfd98dd1d476450b9b770c9b2f1c70810e67492 Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
* Fix essential updateKatja Marttila2020-10-096-12/+61
| | | | | | | | | When updating essential, no other components should be installed nor updated unless there is autodepend on the essential component. Task-number: QTIFW-1970 Change-Id: If9edd6515e3e5ec51611ac07ac52b13f05983b9d Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
* CLI: Add retry count limit for checking running processesArttu Tarkiainen2020-10-091-0/+7
| | | | | | Task-number: QTIFW-1974 Change-Id: I5f2c815a5fe64a2fc2d15e26ff8687b3929292d7 Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* Add short version for option --accept-licensesKatja Marttila2020-10-063-3/+5
| | | | | | Task-number: QTIFW-1984 Change-Id: I9e2c9302d4a21f169266b147bac618758f004fa5 Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
* Add short version for --no-default-installationsKatja Marttila2020-10-062-1/+2
| | | | | | Task-number: QTIFW-1981 Change-Id: Ibb531dcd6e95c6dc6a17d92659736f3cab57af29 Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
* Add missing const parameter referencesKatja Marttila2020-10-059-10/+10
| | | | | | | Results from cppcheck analyzer tool Change-Id: Ib76a53728d2774f5e7ec884e1b98d6bf98d20b21 Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
* Add short version for --confirm-commandKatja Marttila2020-10-053-5/+7
| | | | | | Task-id: QTIFW-1980 Change-Id: Id4641406d67f377597575d1e7f9d2e6d312091a3 Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
* CLI: Add short versions for message query optionsKatja Marttila2020-10-054-19/+29
| | | | | | Task-id: QTIFW-1982 Change-Id: I97f51c0931f4baef5e19f0e819bd6beee186301e Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
* Expand the sanity check for mutually exclusive optionsArttu Tarkiainen2020-10-013-15/+45
| | | | | | Task-number: QTIFW-1744 Change-Id: I4a4fdcd2517028e05f9282c15a91a4fb83c24901 Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
* CLI: Print package id when running checkupdatesKatja Marttila2020-10-011-0/+1
| | | | | | Task-number: QTIFW-1972 Change-Id: Ia6f75e4b06b17fb9d1b0cf4ae4af47f140f86be4 Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
* CLI: Add informative print when calling "remove" with no argumentsArttu Tarkiainen2020-10-011-0/+5
| | | | | | | Task-number: QTIFW-1744 Change-Id: Id44df3b5edbea5582e8ddee230c915d403271d3f Reviewed-by: Iikka Eklund <iikka.eklund@qt.io> Reviewed-by: Katja Marttila <katja.marttila@qt.io>