summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* Properly calculate the file size for symlinks.kh12013-05-301-2/+3
| | | | | | | | Task-number: QTIFW-137 Change-Id: I8a39094228bbb82ff99adfa814cda79634f71274 Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* binarycreator tries to copy qt_menu.nib dirTim Jenssen2013-05-271-2/+9
| | | | | Change-Id: I86ae6eb2c1129537939fc797a88b5c5b8619fbf7 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* introduce no_app_bundle.priTim Jenssen2013-05-276-2/+11
| | | | | | | - it tries to copy the needed qt_menu.nib dir Change-Id: I04fe564f62e16847a417e47c9a0719c043c1f027 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* introduce installerscriptengineTim Jenssen2013-05-161-2/+1
| | | | | | | | | | | - it uses one scriptengine for everything and adds the components or/and the install-controller in javascript closure contexts - added the gui object to the component script context - removed tabController from controlscript context Change-Id: I3bd6c5dcf470666c30add1b7d04a8fdd094f5f11 Reviewed-by: Iikka Eklund <iikka.eklund@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Some minor Nokia -> Qt Project changesSergio Ahumada2013-04-301-1/+1
| | | | | | | | | - Updating the supported platforms link - changing com.nokia -> org.qt-project Change-Id: Ib74fda09f177a989b79288b967423ef04c16786e Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Use example.com as example domain.Niels Weber2013-04-151-1/+1
| | | | | Change-Id: I68d481b9bd36a88decb25040d22bda5b9dfc1cc9 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Merge remote-tracking branch 'origin/1.3'Tim Jenssen2013-04-111-0/+2
|\ | | | | | | Change-Id: Iabd77388834a27ace28587ded37c66b4c9a9cbd3
| * adding the OS attribute to be compatible with old sdksTim Jenssen2013-04-091-0/+2
| | | | | | | | | | Change-Id: Ia9d9e3371008c77cfcdac04c6da40cd4b9a34fb6 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* | create getrepositorycontent toolTim Jenssen2013-04-0912-548/+708
| | | | | | | | | | | | | | | | It is a very useful tool to get repositories locally for testing. Change-Id: Ia83841c3e5c96ab369c35580dd98141cf22ed643 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* | Merge remote-tracking branch 'origin/1.3'Tim Jenssen2013-04-041-0/+4
|\| | | | | | | | | | | | | | | | | Conflicts: installerfw.pri src/libs/installer/settings.cpp tests/auto/installer/settings/tst_settings.cpp Change-Id: Idb89f22fe940a730ed03a7d10f11e1b5fa655b49
| * Add qt_menu.nib to ifw.appKai Koehne2013-03-281-0/+4
| | | | | | | | | | Change-Id: I8d0de3413bf5df0b5b5ef5c839ab63ebd109c6f7 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | Cleanup.kh12013-03-252-172/+123
| | | | | | | | | | | | | | | | | | Iterate just once and remove all tags from existing xml. Throw and print error if we can't open an supported archive. Refactor duplicated copy code - license,translation,ui files. Change-Id: I60e215fdc5591ff9dcb5509db74448298ec6b752 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | Fully qualify function calls. Fix minor typos.kh12013-03-252-19/+23
| | | | | | | | | | Change-Id: I36cc096f3195e69bf027aa629d31ffac1d519732 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | Change function names (to what they actually do) and signature.kh12013-03-254-28/+26
| | | | | | | | | | | | | | | | | | The signature change is kind of a cosmetic one, but I think it is more obvious that passing a reference into a function might modify the parameter. Change-Id: I424c06ed7a449204bd0b243ff07c2d36669b7381 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | Assume offline installer if there are no repositories.kh12013-03-251-0/+3
| | | | | | | | | | | | | | | | Task-number: QTIFW-224 Change-Id: I90f6b5002fde182ed59d2c26f473e258e4bdbfad Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | Pass the settings object to assemble.kh12013-03-251-15/+10
| | | | | | | | | | | | | | There's no need to parse the config file a second time. Change-Id: I7303b86a30f9ce17a8cfa419b70fc70b5948d151 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | Rewrite copy configuration function.kh12013-03-251-72/+56
| | | | | | | | | | | | | | | | | | | | | | Fix broken function naming. Copy only files that are referenced inside the config file. Replace ":" as well, copy fails here on W8. Task-number: QTIFW-221 Change-Id: Ic039a8c54d4bb391fcd644c9da0dba7b20bda0f5 Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | Reuse existing make absolute.kh12013-03-253-13/+10
| | | | | | | | | | Change-Id: I9ad7287db0539e3fb6819220a3648244c10f1869 Reviewed-by: Niels Weber <niels.weber@digia.com>
* | Adjust to match coding guidelines.kh12013-03-251-9/+10
| | | | | | | | | | Change-Id: I1904dc6bd8706b7cf93d67cad497becbe480f1f2 Reviewed-by: Niels Weber <niels.weber@digia.com>
* | Remove unused/ duplicated function.kh12013-03-252-21/+0
| | | | | | | | | | Change-Id: Ic4412244ee9c5e7ff1d96a1d5d86924c7e1fcd1a Reviewed-by: Niels Weber <niels.weber@digia.com>
* | Small cleanup, no functional change.kh12013-03-251-12/+7
| | | | | | | | | | Change-Id: I339d99d86ab71af785a9fa7b221d255d0e1f1f9b Reviewed-by: Niels Weber <niels.weber@digia.com>
* | Merge remote-tracking branch 'origin/1.3'Tim Jenssen2013-03-222-2/+8
|\| | | | | | | Change-Id: I89a0518b54836afd97016061bcf000ccf7cdf62f
| * Compile fix when building tools staticNiels Weber2013-03-221-1/+1
| | | | | | | | | | Change-Id: Ie27962ae3fdf1b3ed06ba06ad81c1b169779ba65 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
| * Allow setting of target dir in installer scriptKai Koehne2013-03-221-1/+7
| | | | | | | | | | | | | | Simplifies uploading of results on build machine. Change-Id: Ifcfb9f11f0b98754cca0368490b2a0267110111b Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | Small cleanup.kh12013-03-211-16/+13
| | | | | | | | | | | | | | | | Use exit codes more consequent. Delete the meta dir even if an exception was thrown. Change-Id: I87354218091b562147fbc04c20181952fdc967ca Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | Merge remote-tracking branch 'origin/1.3'Tim Jenssen2013-03-211-0/+102
|\| | | | | | | Change-Id: Ibe38be81d8e763fb58899e2594641b8b062c5504
| * Add script to build the ifw installerKai Koehne2013-03-191-0/+102
| | | | | | | | | | Change-Id: Ia8e02760ed4288557d51472891b5e9750d960366 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | Compile on MacNiels Weber2013-03-211-2/+3
| | | | | | | | | | Change-Id: Ib0aac416971bc3c73b0905d404f1c1620ddfa708 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>