summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* Move permissions handling after rename.kh12014-07-151-2/+1
| | | | | | | | | At least on Linux we lost the executable permission while doing a rename before setPermissions(...). Not so urgent in these cases, though more correct. Change-Id: Ibb1ca9f04fe94732ff22afd004fbf921255df690 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Update documentation and rename code to improve readability.kh12014-07-151-8/+10
| | | | | Change-Id: I5b467aca314f81304f7a4854cb6ea5b4f57361f3 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Make the marker and the find function class members.kh12014-07-153-9/+13
| | | | | | | Prepare for QTIFW-292 and QTIFW-345. Change-Id: I065366742d28e72bc5ae55e70eabf6532b809fea Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Move class BinaryContent into its own file.kh12014-07-154-2/+5
| | | | | | | Prepare for QTIFW-292 and QTIFW-345. Change-Id: I938b5aa728e8f81eb9521df5753ad80ac630d96e Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Introduce developer tool.kh12014-07-119-1/+847
| | | | | | | | | | Supports dump binary content, run operation and update existing binary with new installer base. The support for starting with binary data of a different installer got dropped completely, use update and run instead. Change-Id: I41073d0bfc9a4c4da18fbb9f49fd3e65bb54b501 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Remove now superfluous tool, replaced by devtool.kh12014-07-103-216/+0
| | | | | | Change-Id: I987722065d65704e9df4864df3232911c9d9747a Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Niels Weber <niels.weber@digia.com>
* Make tools compile again.kh12014-07-108-36/+35
| | | | | Change-Id: Ie9cfeca59450b7d9f31e5002a50b5c95150d8bed Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Workaround for QFileInfo::isBundle().kh12014-07-041-1/+1
| | | | | | | | | | | | | | | For some reason the former code did not work anyore as expected, the issue seems to be in QFileInfo::isBundle or how we used it. To not depend on a possible fix in Qt, we now always resolve the path before we ask QFileInfo if it is a bundle. Fixes also the behavior change introduced in cead4555. On OSX, we get the .dat file passed that's inside the bundle, still we need to read the data from a .dat file that's located beside the app bundle... Change-Id: Idaa7adc6fbad6bd8e9ce90c383b34ea51fe40e8f Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Rename pathes -> pathsjkobus2014-07-031-3/+3
| | | | | | Change-Id: I9ad2e5eba7df180dec63ec171d5260c01d9715b2 Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Replace Q_OS_MAC with Q_OS_OSXNiels Weber2014-07-031-7/+7
| | | | | | | | Q_OS_MAC also refers to iOS. Change-Id: I91603d0add90a0f3948453a6b9628814b0d9f80c Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Fix broken tools after switching to QFileDevice.kh12014-07-021-15/+23
| | | | | | | | | | | Follow up on 924ebcdbc9b9e590a5f0905941e2d05ac34d4be2 (Part 1). Get rid of KDSaveFile, reuse QTemporaryFile. After changing KDSaveFile to inherit from QFileDevice, it turns out to be not working properly anymore and crashing e.g. binarycreator while using it. To save fixing it we just switch to QTemporaryFile. Change-Id: I785a04db91b431f5e122f193ecf2ef3c54e34b1c Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Fix build with Qt 5.4.0 or newerKai Koehne2014-06-301-1/+3
| | | | | | | qtaccessiblewidgets plugin got removed in Qt 5.4.0. Change-Id: I597c8aabea7d3548851136263f8d77bbd439baba Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Don't use QObject::tr().kh12014-06-241-22/+41
| | | | | Change-Id: Icefbff9851a4e096a4b800adea7d17db756abe99 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Split out the file IO stuff and adjust other files respectively.kh12014-06-242-26/+28
| | | | | | | | | Also adjust the API to use QFileDevice instead of QIODevice to make clear we just operate on files here and not on any possible device like sockets, processes etc... Change-Id: I4ecbb6e244fe4bb666ed12e62f9f5586bc1347f0 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* binarycreator: add qico and qtaccessiblewidgets as QTPLUGINsRay Donnelly2014-06-201-1/+1
| | | | | | | | | | | Commit 807de076f4fee6c relies on the autoplugs mechanism (added in qtbase commit 4255ba40ab073af) to add the needed statically linked plugins; however because binarycreator is a console app it doesn't depend on gui (QT -= gui) this mechanism fails to add the plugins. Change-Id: If96b0e2c03d229ad1026602b8e8117babda03481 Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Replace script with js engine.kh12014-06-034-8/+8
| | | | | Change-Id: Ic9c88e27dca1e936ba09a3776df3df7ec166c606 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Use QTemporaryDir instead of our homemade solution.kh12014-06-032-2/+8
| | | | | | Change-Id: Ia584a9b2f954df5c29a2f0aa5f12b201b2bfbcc4 Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Merge remote-tracking branch 'origin/1.6'Oswald Buddenhagen2014-06-021-5/+5
|\ | | | | | | | | | | | | | | | | | | Conflicts: dist/config/config.xml dist/packages/org.qtproject.ifw.binaries/meta/package.xml dist/packages/org.qtproject.ifw/meta/package.xml installerfw.pri Change-Id: I32a2a17b8fd7dc0f1f9c12272fc5f814ea5d86cb
| * Mac: Do not require Xcode command line toolsEike Ziller2014-04-161-5/+5
| | | | | | | | | | | | | | | | | | | | | | /usr/bin/xcrun is the tool to use for running build tools from the current Xcode installation, without the need to install anything beside it. Task-number: QTBUG-38015 Change-Id: I32ba8bfac2f2c49e863fe8aeeecaf3df80afb8c8 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com> Reviewed-by: Niels Weber <niels.weber@digia.com>
* | Cleanup to support Qt5 only.kh12014-06-021-8/+0
| | | | | | | | | | Change-Id: Ib8f61229ce2f07e52c22a15e10dc817aca860ead Reviewed-by: Niels Weber <niels.weber@digia.com>
* | fix that package.xml files are not or wrongly generatedTim Jenssen2014-05-051-4/+2
| | | | | | | | | | | | Change-Id: I22b2e9da8d9a8658fec6b5c4976fe2135c2b04f8 Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | Make sure we read the script content as UTF8.kh12014-04-231-4/+4
| | | | | | | | | | | | | | | | Task-number: QTIFW-485 Change-Id: Id09365207c6f5b1312fb85ad67443f7e51a1944e Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Fix strange error message.kh12014-04-041-6/+13
|/ | | | | | | | | | | Task-number: QTIFW-309 If a component script file is empty or misses the component class constructor, bail out during binary create or installer execution. Change-Id: I422c64186652a52122d54b5b042139803c24ba10 Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Merge remote-tracking branch 'origin/1.5'Oswald Buddenhagen2014-03-271-1/+1
|\ | | | | | | | | | | | | Conflicts: installerfw.pri Change-Id: I8bd85997fef0fcfa21a4dd28a6362748a54a4a3b
| * doc: Remove '-u http://www.example.com:8080' from the repogen helpSergio Ahumada2014-02-101-1/+1
| | | | | | | | | | | | | | | | The --updateurl functionality was removed by 17401372c003949a86540c7581e830b980606b73 so removing its usage from the repogen tool help. Change-Id: Iaf0e7bb65b5f116e5c5e3b921d072db70e8e7236 Reviewed-by: Niels Weber <niels.weber@digia.com>
* | Make python script executable for convenience.Niels Weber2014-03-061-0/+0
| | | | | | | | | | Change-Id: I209e477129a371040b7cef940d6b88543e06678a Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Add a current date as release date fallback.kh12014-02-111-2/+8
| | | | | | | | | | Change-Id: Ib42ef38b8b47e3a7f0cf3beec1c1c16a7c51cf26 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* | add --only-metacontent feature to getrepositorycontent toolTim Jenssen2014-02-071-6/+13
|/ | | | | | Change-Id: Ifd89ccd2a5bbeb48ae304ededce35a29b701809e Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Name .dmg files after the application bundle on Mac OS XSascha Cunz2013-11-081-1/+1
| | | | | | | | | Use the name of the application bundle (input.outputPath) to give the disc image a volume name instead of using the file name of the .dat file ("out" is set to 'installer.dat' at construction time). Change-Id: I0f53ca7fcafb83353f4fea61b62037f48281375e Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Merge remote-tracking branch 'origin/1.4' into 1.5Tim Jenssen2013-11-061-1/+3
|\ | | | | | | Change-Id: I2725f9bacbe04240dc3f97062c5ebc50884822c8
| * Mac: Fix Info.plist for installerEike Ziller2013-11-061-1/+1
| | | | | | | | | | Change-Id: I7a0199c3001395356e96c0ef5a0c5104144b9cb2 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
| * Make installer apps retina-ready.Eike Ziller2013-10-241-1/+3
| | | | | | | | | | | | | | | | Also fixes the generator note. Change-Id: Ic9a9a033d74320221563c46611122d0fef216c23 Reviewed-by: Iikka Eklund <iikka.eklund@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | Merge remote-tracking branch 'origin/1.4' into 1.5Tim Jenssen2013-10-231-10/+27
|\| | | | | | | Change-Id: Ib2d382d1aa398b642dc15f4df7c03b19bf638546
| * Option parser, rcc works for current path -> no target expectedMichal Klocek2013-10-161-1/+1
| | | | | | | | | | Change-Id: I93bc6613203e1e879b18e7a8d6ef8849870835ee Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
| * Implement a way to replace the default resource.kh12013-10-161-9/+24
| | | | | | | | | | | | Change-Id: I2e362d255bf2526f216cbb872bbb64d37383d229 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com> Reviewed-by: Michal Klocek <michal.klocek@digia.com>
* | Merge remote-tracking branch 'origin/1.4'Tim Jenssen2013-09-091-6/+63
|\| | | | | | | Change-Id: I202b1babf4b8ff16b6f28f0499e76a15724ed0dd
| * Add support to update only new components.kh12013-09-061-6/+63
| | | | | | | | | | | | | | | | Task-number: QTIFW-234 Change-Id: I49f1714925e7c83e06c86c9022cc8ae8ff01a840 Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
* | Merge remote-tracking branch 'origin/1.4'Tim Jenssen2013-08-264-10/+37
|\| | | | | | | Change-Id: I9ee4395291754fd5a56555e1dd974df19ee39376
| * Remove deprecated argument.kh12013-08-261-2/+2
| | | | | | | | | | | | Change-Id: Ied0b8ef0e35fb39b6b5786f54c9844847d638cec Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
| * adding archives automatically to updates.xmlTim Jenssen2013-08-011-0/+23
| | | | | | | | | | | | | | | | | | Task-number: QTIFW-210 Task-number: QTIFW-248 Change-Id: I6deeade922dfe796df4223dae9e4a4744b7d6724 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
| * fix online only installer creationTim Jenssen2013-08-012-2/+3
| | | | | | | | | | | | | | | | Task-number: QTIFW-319 Change-Id: I1f66f80b952742e7ff21ee6960120271e1579fb9 Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
| * rename copiedArchives to copiedFilesTim Jenssen2013-07-303-4/+4
| | | | | | | | | | | | | | | | - they are including the sha1 files so the old name was misleading Change-Id: I6156b5590bc98ed319a093c82be32d9f79699d28 Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
| * existing empty dir shouldn't be a reason to cancel repogenTim Jenssen2013-07-291-1/+3
| | | | | | | | | | Change-Id: I754063a810c8d30cd26dee55e36b675885e6a4b7 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
| * add a location hint to a warningTim Jenssen2013-07-261-1/+2
| | | | | | | | | | | | Change-Id: Ieaa10ff2e7f20dbdccbddf707923619756fea35e Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* | Merge remote-tracking branch 'origin/1.4'Tim Jenssen2013-06-275-24/+22
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: installerfw.pri tools/binarycreator/binarycreator.cpp tools/common/repositorygen.cpp tools/common/repositorygen.h tools/repogen/repogen.cpp Change-Id: I97767b2e4ef9b7afd5ce368d99c6a7d38dfbd947
| * Lists packages not found that were given explicitly.Niels Weber2013-06-204-6/+15
| | | | | | | | | | | | | | | | | | | | When the user calls repogen or binarycreator using the include or exclude parameter, those packages that were given but could not be found in the packages directory are now listed in a warning. Task-number: QTIFW-233 Change-Id: Iaadd0a14d2c6d834daa6dbe956118d674e048fac Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
| * add warnings if ssl is requested, but is not possibleTim Jenssen2013-06-131-0/+4
| | | | | | | | | | | | Change-Id: I0635df924ccb4b55194f8124b2c99ea3dd6d82ad Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com> Reviewed-by: Niels Weber <niels.weber@digia.com>
| * Remove broken repogen -u functionality.Niels Weber2013-06-063-18/+3
| | | | | | | | | | Change-Id: I5199dac61e05278e85ef44e72bd30dd281881d28 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* | Do not use don't, can't ... in outputKai Koehne2013-06-204-7/+7
| | | | | | | | | | | | | | | | | | | | Don't, Can't, etc abbreviations are used in informal speech. This is okay in code comments etc, but user output should use the correct, non-abbreviated terms. Change-Id: I53c0dfa91596c151bfa7ef7b65f57d5084ceccde Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* | Allow multiple package directories.Niels Weber2013-06-114-41/+46
|/ | | | | | | Task-number: QTIFW-24 Change-Id: I4e6e31457ecd63de7a2de98e35a7be00616151a5 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>