summaryrefslogtreecommitdiffstats
path: root/src/sdk
Commit message (Collapse)AuthorAgeFilesLines
...
* | Initialize productkeycheck at later stateKatja Marttila2020-04-291-7/+5
| | | | | | | | | | | | | | | | | | Productkeycheck can set temporary repositoes etc., initialize it after other command line options have been handled so it won't overwrite values and can utilize the core values set from command line. Change-Id: Iacab5be4efa0d4133a089004a04ecb937f093b2d Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
* | Add possibility to accept licenses from CLIArttu Tarkiainen2020-04-281-0/+3
| | | | | | | | | | | | | | | | | | | | | | License agreements can be accepted automatically by using command line option --accept-licenses or interactively by answering queries with either "Accept", "Reject" or "Show" selections. Task-number: QTIFW-1742 Task-number: QTIFW-1745 Change-Id: Iff46b44f91faddb7f163b299994167ab16df68b3 Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* | Answer queries from command lineKatja Marttila2020-04-285-218/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Standard input is possible in Windows only in console application. This change makes installers to be console applications by default. If started as gui from command line, console is released and application is restarted so cmd.exe won't be waiting for application to finish. If started from explorer, console is launched but released immediately. This may be seen on screen with short console flash. Using command line interface messagebox strings and possible answer values for it are printed to console. Answers must be given in case sensitive format as StandardButton QMetaEnum is utilized when reading button values. This ensures that if StandardButtons are added/removed/changed the code continues to work. Also added a new option 'default-answer' which will answer the questions with default button values without user interaction. Task-number: QTIFW-1739 Change-Id: I710f921f5c927dbd13090af32f93656dded84e72 Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
* | Fix installationlog.txt writingKatja Marttila2020-04-273-21/+27
| | | | | | | | | | | | | | | | | | Fixes also remoterepo deletion from tmp folder Task-number: QTIFW-1664 Task-number: QTIFW-1683 Change-Id: I8485eb63c4ec5a30c04f4177922bb60f2176ce37 Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
* | Add new option --auto-answerKatja Marttila2020-04-161-0/+38
| | | | | | | | | | | | | | | | | | | | | | With this change user can individually answer to message queries if message id is known. The syntax is --auto-answer message.id=QMessageBox::Ok,message.id2=QMessageBox::Cancel Task-number: QTIFW-1740 Change-Id: I86d08df77cf5f3d665901b599586d8c52b7dcdf6 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
* | Add possibility to auto accept or reject IFW queries from CLIKatja Marttila2020-04-151-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added new command line switches accept-messages and reject-messages to automatically accept or reject installer message queries. Also removed Retry option in CLI when archive or hash download failed. With GUI it is possible to try Retry in case either is missing but without GUI Retry will cause infinite loop. Added unit tests for accept-messages and reject-messages using CLI. Task-number: QTIFW-1736 Change-Id: Ie87d2d8157be772b790415c96e5b94fc882d4be7 Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
* | Initialize user arguments earlierKatja Marttila2020-04-081-14/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | User can give arguments from command line, for example AllUsers=true, which can affect to other core values. Initialize user arguments in core constructor so we an utilize the user given values when defining other core values. Added also unit test for overwriting core data values. Note that some values belong to QSettings such as MaintenanceToolName which cannot be overwritten. Task-number: QTIFW-576 QTIFW-1730 Change-Id: I82a05f9f4bc8498f4e0e2af407ba29f6dabbf030 Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
* | Remove existing installation from command lineArttu Tarkiainen2020-04-073-0/+21
| | | | | | | | | | | | | | | | | | | | | | Add new "purge" command to command line interface. This removes all components and all program directory contents. Add test function to unit tests. Task-number: QTIFW-1574 Change-Id: Iccd4a052c7e2fc8eec0a6ae2b5a93c0c607604cb Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* | Fix startserver argument when starting installer as adminKatja Marttila2020-03-311-1/+2
| | | | | | | | | | | | Task-number: QTIFW-1701 Change-Id: I1ae59a0a352578918a718d89ce600f4e41910306 Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
* | Separate maintenance tool writing for testing purposeKatja Marttila2020-03-201-13/+32
| | | | | | | | | | | | | | | | | | Some unit tests wont work as installer wants to unpack maintenance tool from the installer. As unit tests are not normal installers we need to separate the maintenance unpacking when running tests. Change-Id: I5f2bb60e775a42d1b8dd6ee088ff4f2a694a7a09 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* | Add short versions of CLI optionsArttu Tarkiainen2020-03-194-54/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add single or couple letter short options and two letter short commands. Single letter short options can be passed in a single joined form, for instance '-dg'. Also change CLI options constant string literals type to QLatin1String as we would have to use this as a wrapper anyway wherever the constants would be used, causing quite long and verbose statements. Task-number: QTIFW-1634 Change-Id: I17e80c9a657d934687d2b7e87fcecddffa1b9b21 Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* | Refactor naming and usage of CLI commandsArttu Tarkiainen2020-03-197-303/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Rename and alter the description of some command line options according to validation results from task QTIFW-1635. The suggested additions are not added in this change. - Remove options "framework-version" and "silentUpdate", these should not be needed anymore. - Combine options "installPackages" and "installDefault" into single "install" command. - Change command line syntax from "binary [options]" to "binary [options] command <arguments>". - Re-order & group known option variables and "--help" printing order based on their topic. - Move CommandLineParser class files under src/libs/installer and add private class for future options extension. Short versions of command line options should be added in a follow-up commit. Task-number: QTIFW-1671 Change-Id: Ie0d393368b5275c8ffa1ab8833885b149af3178e Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* | Merge remote-tracking branch 'origin/3.2' to masterKatja Marttila2020-03-162-0/+6
|\| | | | | | | Change-Id: Ia4cf718409ce431cce8d766865ecec506426afb9
| * Add command line option to disable checking of free space on target3.2.2-rcArttu Tarkiainen2020-02-273-0/+7
| | | | | | | | | | | | | | | | | | | | Also move functionality to PackageManagerCore::checkAvailableSpace() for more convenient later usage, if we want to use this without starting the Wizard GUI. Task-number: QTIFW-1602 Change-Id: I4f2d3cc78bc542475fe9c51b9364b1b221098e4a Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* | Improve warning log stringsKatja Marttila2020-03-131-6/+6
| | | | | | | | | | | | Change-Id: Ifdc7a63b9e60807b0d5f6e68758296d417da1d1c Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io> Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
* | Perform headless commands without GUI dependencyKatja Marttila2020-03-128-499/+561
| | | | | | | | | | | | Task-number: QTIFW-1633 Change-Id: I207cd152a471fddd51c152223460f8a9873f4382 Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
* | Add command line option to start the installer binary as uninstallerArttu Tarkiainen2020-03-023-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add option "--uninstaller" to start the installer binary explicitly as uninstaller. This complements options "--updater" and "--manage-packages". Add convenience functions for setting and checking if the magic binary marker has been set by the user. Task-number: QTIFW-1639 Change-Id: Ie40ba9c56e09be079e309bca985b19a8a7bef7ef Reviewed-by: Iikka Eklund <iikka.eklund@qt.io> Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* | CLI: decrease the amount of default debug printsKatja Marttila2020-02-201-9/+21
| | | | | | | | | | | | | | | | | | | | Debug prints can be suppressed or extended with logging rules. Make the default usage so that only relevant information will be shown to user, such as uninstall/install progress, server information, warning messages and package name, version and displayname. Change-Id: I09be754a36dd97530d75cdea3edb5fc77e67a856 Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
* | Enable optional targetDir argument on command line installationArttu Tarkiainen2020-02-172-29/+17
| | | | | | | | | | | | | | | | | | | | Try to use default target directory value from internal configuration when --targetDir option is not set. This affects usage of options --installDefault and --installPackages (when running as installer). Task-number: QTIFW-1608 Change-Id: Ieac709f6e3d7c539a3a1cb66dce8eb448b20dcfe Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* | Uninstall selected packages from command lineKatja Marttila2020-02-142-0/+12
| | | | | | | | | | | | | | | | | | | | Components can be uninstalled from CLI with --uninstallPackages package1,package2,... Replicates the same behavior as when removing from visual UI, so forced installation, virtual and components installed as autodependency cannot be uninstalled. Change-Id: Ibcd87b5ceb8e509c84c6944510c23e59b28dedb9 Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
* | Move CLI options from /sdk to /libs for access from installer extensionsKatja Marttila2020-02-133-81/+2
| | | | | | | | | | Change-Id: I657645f2126813a93bc38626fabf46deb4711791 Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
* | Use of QLoggingCategoryKatja Marttila2020-02-132-10/+25
| | | | | | | | | | | | | | | | The change enables easier filtering of log messages Change-Id: I769f7c163e20f34c37fa0fe2b0729867ffca5bcb Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io> Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
* | Fix checking for options requiring verbose outputArttu Tarkiainen2020-02-121-5/+5
| | | | | | | | | | | | | | | | QInstaller::setVerbose(true) was not executed for the last option in foreach loop. Change-Id: Ie0b63e6f996c0c702b4844dc5bdd92f736bda4f9 Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* | Do not prompt admin query when command line interface is usedArttu Tarkiainen2020-02-121-1/+3
| | | | | | | | | | | | | | | | | | | | | | If admin rights are needed, fail and require to install with sudo. This is how command line interfaces commonly behave. Add convenience functions for setting and checking if the installer is used from command line. Task-number: QTIFW-1598 Change-Id: Ib28d3be08254dade5d9b2d29da9232064f008eb4 Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* | Move cli options list to static const variable for easier later usageArttu Tarkiainen2020-02-122-7/+19
| | | | | | | | | | Change-Id: Ib1011058124601160aa69ee7ceaad1ee0cc9ecd6 Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* | Use verbose mode by default when command line interface is usedArttu Tarkiainen2020-02-101-1/+6
| | | | | | | | | | | | | | | | Enable verbose console output for a select set of options by default. Task-number: QTIFW-1597 Change-Id: I774fdfcc19dd0297eb79116d1889881e8ac314d5 Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* | Enable command line default components installationArttu Tarkiainen2020-02-034-15/+33
| | | | | | | | | | | | | | | | | | | | Add --installDefault option to install components that are set to be checked by default and their respective dependencies. Do not do anything if the component tree does not have anything checked by default. Task-number: QTIFW-1583 Change-Id: I3825c7e797b102a8d6a65ae0e57bfe82fafef5e9 Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* | Install selected packages from CLIKatja Marttila2019-12-043-0/+35
| | | | | | | | | | | | | | | | | | Also move targetDirWarning() from targetdirectorypage to packagemanager and move target directory check to checkTargetDir() function so that those are accessible also without UI. Change-Id: Ia38cc7e66bb542e6a60fea2c39cc3b80735564ef Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
* | Update selected components from command lineKatja Marttila2019-11-223-2/+13
| | | | | | | | | | | | | | | | | | Selected components can be updated with --updatePackages <package_id>. If essential components are found, only the essential components are updated. Change-Id: I0eb8a8f5ca855af16eabd5f888cd9a0d5e933d84 Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
* | Merge remote-tracking branch 'origin/3.1' into masterKatja Marttila2019-11-201-6/+22
|\| | | | | | | Change-Id: Icc077e3757b84b2367b2a7dd9c1e389f6845365b
| * Add early prompt to run MaintenanceTool as admin when neededArttu Tarkiainen2019-11-141-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | Currently IFW does not support manipulating Windows Access Control Lists for files. If a user does not have reading permissions to installer.dat it will throw error on QInstaller::openForRead() before the wizard GUI is shown. At very least, add a MessageBox to prompt the user to run the executable again as administrator in such a case. Task-number: QTIFW-1392 Change-Id: I9e20c34b215ee697118af9c15a7e344f9cfc3c3f Reviewed-by: Katja Marttila <katja.marttila@qt.io>
| * Fix --no-proxy option in WindowsKatja Marttila2019-10-141-5/+5
| | | | | | | | | | | | Task-number: QTIFW-1445 Change-Id: Iad02ecda0d5b27c3c9719f7c57e090d53a249be6 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | List available packages from command lineKatja Marttila2019-11-194-2/+18
| | | | | | | | | | | | | | | | | | | | | | | | Available packages can be listed from command line with --listPackages <regexp>. All packages can be listed with --listPackages . . By default package id, name and version are listed in output. In case you want to see all the packet information use logging category --logging-rules ifw.package.*=true. See --help for more detailed information on how to use logging category. Change-Id: Ic0815d2274643e3fb3f0670ed9036fe765805c0e Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
* | Refactor code to functions which command line interface needsKatja Marttila2019-11-192-7/+12
| | | | | | | | | | | | | | | | These are needed in multiple places while implementing CLI so created common functions to avoid code repeat. Change-Id: I2b30bedf5de838211f48bd1669c59ff3a17f640e Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
* | List installed packages from command lineKatja Marttila2019-10-183-2/+13
| | | | | | | | | | Change-Id: Ic8efe08be347f3a208e37458936f8316d66ca916 Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
* | Merge remote-tracking branch 'origin/3.1' into masterKatja Marttila2019-08-2311-38/+56
|\| | | | | | | Change-Id: I8b203e12283374aed707e0e89c2f73d44ff296cb
| * Fix maintenance tool source translations to match the actual stringsAndy Shaw2019-08-237-28/+28
| | | | | | | | | | Change-Id: If4f87a6d14450a74151b610e0da54ef3a82712fd Reviewed-by: Katja Marttila <katja.marttila@qt.io>
| * Update usage of Apple-related terminologyArttu Tarkiainen2019-08-163-10/+10
| | | | | | | | | | | | | | | | | | | | | | Replace deprecated Q_OS_OSX macro used in several places with the newer Q_OS_MACOS. Old style reference of Apple's desktop operating system name as "OS X" in documentation and files are also replaced with "macOS" where applicable. Task-number: QTIFW-1406 Change-Id: I0561d5e0d964917ac4fca0702d58a06b85d30e57 Reviewed-by: Katja Marttila <katja.marttila@qt.io>
| * Add IFW version information to installerbase binary on WindowsArttu Tarkiainen2019-08-151-0/+18
| | | | | | | | | | | | | | | | | | | | | | Add Windows VERSIONINFO resource definition to installerbase.rc so we can link the installerbase executable with file version property. Created installers using this base binary will include the set version property. Task-number: QTIFW-1397 Change-Id: Ie7781bf65c6032c01bb0bac9e945c665e81973d9 Reviewed-by: Katja Marttila <katja.marttila@qt.io>
* | Merge remote-tracking branch 'origin/3.1' into masterKatja Marttila2019-05-275-52/+91
|\| | | | | | | Change-Id: I65e3ed3858cda954a5f916031d4ff02a39a9aa87
| * Fix installer hang on Windows with empty command prompt window appearingArttu Tarkiainen2019-05-172-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Installer sometimes hangs on Windows with a command prompt window opening and blocking any progress. Hitting enter in this command prompt window causes progress to move forward. This blocks automated execution of tests since it requires manual interaction. parentConsole boolean was not initialized properly, fix logically broken closing actions for console. Task-number: QTIFW-1250 Change-Id: I062c0491c16c26e9435022d79f99240bf59e1a79 Reviewed-by: Katja Marttila <katja.marttila@qt.io>
| * Update Russian translationKatja Marttila2019-05-171-4/+4
| | | | | | | | | | | | | | Change-Id: Ic8edbbd34b048d4d7b4fd034b0dddfa1e73ef8a1 Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com> Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Paul Wicking <paul.wicking@qt.io>
| * Pass -sort-contexts when calling lconvert to keep the order for smaller diffsAndy Shaw2019-05-031-2/+3
| | | | | | | | | | Change-Id: I4634d54b9bbf0d762a7274ae482f480baed6c0d2 Reviewed-by: Katja Marttila <katja.marttila@qt.io>
| * Fix install button string having a font name in French translationKatja Marttila2019-05-021-2/+2
| | | | | | | | | | | | Task-number: QTIFW-1333 Change-Id: Ia1b055aa0360885d6ab9b3c0aa0fc7930521e040 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * Update Russian translationSergey Belyashov2019-04-171-42/+76
| | | | | | | | | | | | | | Change-Id: I36d329b7c8742133fe62cfc250e53a71ac25d069 Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: olesya gerasimenko <gammaray@basealt.ru> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
* | Merge branch '3.1' into masterKatja Marttila2019-03-1914-7434/+5453
|\| | | | | | | Change-Id: I2ac4e385ee771892369d98495ceceb09c481c018
| * Update translations for a number of languagesAndy Shaw2019-03-016-7342/+5361
| | | | | | | | | | | | | | | | The translations were contributed from an external and are for Spanish, French, Italian, Japanese, Polish and Chinese. Change-Id: I737c88e727c61fb358ab2cf99ce4b80a89817311 Reviewed-by: Katja Marttila <katja.marttila@qt.io>
| * Change quantity information unit textKatja Marttila2019-02-078-96/+96
| | | | | | | | | | | | Task-number: QTIFW-1288 Change-Id: Ie5a6fdc27bb5eb96b080638839ee09f06370848e Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * Replace 0 with nullptrKatja Marttila2019-01-095-12/+12
| | | | | | | | | | | | | | Prevents a lot of warnings seen in QtCreator Change-Id: I63bf95aca68a04fc9fd0eecbe29c63e9b9c47efd Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
* | Add Brazilian portuguese translation fileHermeson Barbosa2019-01-291-0/+2498
| | | | | | | | | | | | Change-Id: I70b8f16cb0cd66ac26df1f9f5d1b3bfcfd5131ec Reviewed-by: Andre de la Rocha <andre.rocha@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-25 09:35:39 +0000