summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Fixes required for errorless MinGW-w64 compilation are done."wip/componentviewkh12012-08-2447-125/+98
| | | | | | | | This reverts commit 9cad5d54cf0d78e92b4ee831299d83b657f42f2e as it breaks compressing the meta folder (Windows 7, VS 2010). Change-Id: I24d4ec37941487fc3cc998706d33cd5d8b9f011a Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
* Code changes for new SDK Manager UI.prbiswal2012-08-247-252/+146
| | | | | | | | | - These changes are specific to S40 SDK installer. Changes are done (libs)to create a new coulmn on component selection page to get the status for component. - New SDK Manager UI replaces default component selection page (s40/componentviewpage.cpp/.h) - A macro has been added to .pro file to have s40 specific changes in libs. Change-Id: Ic8cf61d7085b3c7d62edd208949ec71d81e43140 Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
* Put all the other code there as well.kh12012-08-2117-23/+12274
| | | | | | | We can't share it right now, but will figure out a way tomorrow. Change-Id: I2471c3d27d895f59d0b51f0c9f254fcc4e61943b Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
* Create a new folder for S40.kh12012-08-216-1/+1333
| | | | | | | | | Share as much files as possible, also add a basic version for the new component selection page. It does compile, still no guarantee to function in any way. Change-Id: Ib10303041876d7ae7b7bb4a741989c131997a3b2 Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
* Silence a warning.Niels Weber2012-08-171-1/+1
| | | | | Change-Id: I4ad459c74b555378f7069c35fbf3336930290a54 Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
* Add new commandline argument.kh12012-08-176-21/+24
| | | | | | | | | | | | In case we run an offline installer, --create-offline-repository will dump the whole installer content into the install directory and add an extra url to the repositories pointing to the mentioned local repository. This allows an offline user to add packages without the need of a new installation. Change-Id: I3e7eb0c56f632b74f5ea41b96bf3d9be83173f41 Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com> Reviewed-by: Niels Weber <niels.2.weber@nokia.com>
* Fixes required for errorless MinGW-w64 compilation are done.tjenssen2012-08-1047-98/+125
| | | | | | Change-Id: Iedc83b536df9f00e3737d7c92c4a57d6c0feb07a Reviewed-by: Niels Weber <niels.2.weber@nokia.com> Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
* Make all Ubuntu versions use cleanlooks style.Niels Weber2012-08-031-5/+2
| | | | | | | | | | Doesn't make any sense to limit this to specific versions as the old ones go away anyway and all new ones exhibit this issue. Change-Id: I20fb4d13f2d1933c92fa09727f3d467d5210d24f Reviewed-by: Rainer Keller <rainer.keller@nokia.com> Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
* Show a real version in the version info on Mac.Niels Weber2012-08-021-1/+1
| | | | | | | Issue: QTIFW-123 Change-Id: Ie2f5f663e394eb1c55e2ae578f4f735309e57ebc Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
* remove -qt-gif optionkh12012-07-091-1/+1
| | | | | | | | follow-up on 1133a88b01ea294f6e422e7c20c84bee4d028e46 Change-Id: I4256e7af2ff3deec270d384ed85e06d6b41c4ded Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com> Reviewed-by: Niels Weber <niels.2.weber@nokia.com>
* Fix broken build on MacIikka Eklund2012-06-271-0/+1
| | | | | | | | | | | | | On Mac the variable "scTargetDir" was not defined. This block of code was behind "#ifdef Q_OS_MAC" so other platforms were not affected. Added constants.h include for mac only to resolve the missing global constant. Change-Id: Ia8bef78d7c3015f283b202435d56d00187f3fb4f Reviewed-by: Simo Fält <simo.falt@nokia.com> Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* fix path to tests in READMEJoerg Bornemann2012-06-131-2/+2
| | | | | Change-Id: I019e1af46c508f4577e8952475bb4c2275fb0649 Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
* remove unreadable throwIfNotOK methodkh12012-06-131-28/+35
| | | | | Change-Id: I5ae011a1151886fbf04eecb9ad202d5e0fd78ab0 Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
* remove unused methodTim Jenssen2012-06-132-18/+0
| | | | | Change-Id: I7022626546cdf7baba77134934ab6e4e240dedfe Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
* no need to add the name of the class inside the classTim Jenssen2012-06-131-3/+3
| | | | | Change-Id: Iff878145c2dc5d4bec67d78a70bc8d2329db0c24 Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
* remove unneeded emit progresschangedTim Jenssen2012-06-131-1/+0
| | | | | Change-Id: I4399d19920e842d97a8543f8386c9f594bfb46e3 Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
* add a comment why there is another percent pointTim Jenssen2012-06-131-0/+2
| | | | | Change-Id: I3e26de71cf8eebbdbf57cb2aa85c7e4b16782da1 Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
* add "Writing uninstaller." output to the uiTim Jenssen2012-06-131-0/+1
| | | | | Change-Id: Iabf4d9ea979689697da0fa01a0ddb5f9216ecd49 Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
* save some cpu cycles in updateProgress() methodTim Jenssen2012-06-131-1/+7
| | | | | Change-Id: Ie1d297ef7cea97ce0e179d85385711031aeea38d Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
* normalize pathes in create symlink operation on linux aswellTim Jenssen2012-06-131-1/+2
| | | | | | Change-Id: I94a2408da5c5f39cf93c176a6562c851eab1facc Reviewed-by: Niels Weber <niels.2.weber@nokia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
* Fix create archive with files only. See code comment.kh12012-06-131-4/+6
| | | | | Change-Id: Iba14d0a895cebd2a212221309dfbcd521db3e75e Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
* fix openpty static link problemTim Jenssen2012-06-125-4/+2
| | | | | | | | | - as the linker only adds symbols which are needed, the order of the libraries are important Change-Id: Iad8e5a5015cc5949be9b8f0b01702a7f854f6d95 Reviewed-by: Rainer Keller <rainer.keller@nokia.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* add the installer create datetime to --versionTim Jenssen2012-06-122-1/+19
| | | | | | | | | | - binarycreate patches the installerbase to add the installer create datetime - output is now: Installer creation time 2012-06-08 - 17:39:43 IFW Version: "1.0.0", Installer base SHA1: "7031ecf", Build date: "Jun 8 2012". Change-Id: I8f82c6942eefaf49e5ad8605577a0034a7502a6c Reviewed-by: Niels Weber <niels.2.weber@nokia.com>
* remove -qt-gif option from README as wellNiels Weber2012-06-111-1/+1
| | | | | Change-Id: Ib3fc1592f9be94f9452462e499ed15a1e4eeec67 Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
* clean up exception usageTim Jenssen2012-06-113-59/+27
| | | | | Change-Id: I6e1fd425e9b528049f1d461eb2d66c49f70e7288 Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
* adjust the existing create-test-installer.bat to new syntax of the ifwTim Jenssen2012-06-111-41/+58
| | | | | | | Change-Id: Idedcdb57ef169114ef2974a4a748a86ad88b9739 Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com> Reviewed-by: Niels Weber <niels.2.weber@nokia.com> Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
* Bring documentation of Repositories tag in line with the code.Niels Weber2012-06-081-13/+12
| | | | | | | | Remove obsolete option, add missing options. Change-Id: I4d34c7dcbb222243b35bb5362db9222c96e30dcc Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com> Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
* Include unistd.h where needed on LinuxNiels Weber2012-06-053-0/+8
| | | | | | | | | | This allows compiling with gcc 4.7. For more information see: http://gcc.gnu.org/gcc-4.7/porting_to.html Change-Id: I1b3b62fad3c44bdeb701d961297519a2057bf76e Reviewed-by: Oliver Wolff <oliver.wolff@nokia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com> Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
* add working dir parameterMaurice Kalinowski2012-06-042-4/+11
| | | | | | | | sometimes it is useful to launch a process with a specified working directory. Only use this as an optional argument. Change-Id: I4eedd9b27713b9bc284f1945e67e115b5615640b Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
* Revert "windows needs to know that the link will be a directory"Tim Jenssen2012-06-011-7/+4
| | | | | | | | | - better is to use it on existing directory This reverts commit a240e7dbadc3f0cbcd4a483ddf7093562df8ca37. Change-Id: I9103174eaa392a28b7a278ca9343a94b66d76e80 Reviewed-by: Oliver Wolff <oliver.wolff@nokia.com>
* QFileInfo.exists looks for the target which wasn't intendedTim Jenssen2012-05-312-3/+3
| | | | | Change-Id: I8d371045bb500f8954a42523f8d5024b04309ceb Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
* windows needs to know that the link will be a directoryTim Jenssen2012-05-311-4/+7
| | | | | | | | - but at the moment the directory doesn't exist so the only thing is to get that information from the last char Change-Id: I96ecc086ca19047dc0a3ae57262e903ae8923535 Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
* fix case in READMENiels Weber2012-05-311-1/+1
| | | | | Change-Id: Ib156fc53e87f87b410695e9ca91efa2380e57134 Reviewed-by: Niels Weber <niels.2.weber@nokia.com>
* QFileInfo(m_path).readLink(); can't read junctionsTim Jenssen2012-05-303-18/+64
| | | | | | | | | | | | | - in older code there was a try to resolve junctions like symbolic links, but this broke many other code - we copied the read windows symlink code from the private qt file and made small adjustmenst to be able to call it directly in targetPath() method - and changed the isValid behaviour, because we want to create links to locations which are created later - and it is creating the path to the link on every OS Change-Id: Id11839bbf2ecfde410982833d10f96d36fe1cab7 Reviewed-by: Alexander Lenhardt <alexander.lenhardt@nokia.com>
* normalize the pathes in windows create link functionsTim Jenssen2012-05-301-2/+5
| | | | | | Change-Id: I83dd005fa3ee3732cb1884deb87c1bfebbbe3237 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@nokia.com> Reviewed-by: Oliver Wolff <oliver.wolff@nokia.com>
* execute the dependsOnLocalInstallerBinary check after beginInstallationTim Jenssen2012-05-301-15/+24
| | | | | | | | | | | - beginInstallation needs to be run before checking for dependsOnLocalInstallerBinary as that value isn't set before - with this change we can use the beginnInstallation method in the component scripts to set this depends check Change-Id: Ib0964ab84a43499b3dc574aa5d7aecb2c69f01f1 Reviewed-by: Niels Weber <niels.2.weber@nokia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
* now setValue methods are replacing @variables@Tim Jenssen2012-05-252-7/+10
| | | | | | | Change-Id: I9ded8cc4c226b4f3694e1f7fe7ad012269c18dde Reviewed-by: Alexander Lenhardt <alexander.lenhardt@nokia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com> Reviewed-by: Niels Weber <niels.2.weber@nokia.com>
* add a fallback for alreadys installed installationsTim Jenssen2012-05-259-28/+109
| | | | | | Change-Id: Ib7dd955cb89e307d557b7a4706a885c031d6289f Reviewed-by: Alexander Lenhardt <alexander.lenhardt@nokia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
* added new Link class and corresponding operationTim Jenssen2012-05-257-90/+466
| | | | | | | - replace read junction link target code with already existing Qt code Change-Id: I6642f19ceb9a907791987ced8e9eacc6ca4f2780 Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
* After failing admin authorization, allow retrying by handNiels Weber2012-05-242-2/+24
| | | | | | Change-Id: If05f1c6359c2667e0094721540415b5293856370 Reviewed-by: Alexander Lenhardt <alexander.lenhardt@nokia.com> Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
* line length fixingNiels Weber2012-05-211-2/+5
| | | | | Change-Id: I4e625eac370bfa195fdc4e79e4edf9c4caa54792 Reviewed-by: Alexander Lenhardt <alexander.lenhardt@nokia.com>
* now the qt creator releated locations are more flexibleTim Jenssen2012-05-1611-106/+130
| | | | | | | | - tried to remove or move Qt/Qt Creator related things from the core classes Change-Id: I168ae3c56785e389ac34b761be98a7782a683de7 Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com> Reviewed-by: Niels Weber <niels.2.weber@nokia.com>
* remove unneeded #include "constants.h"Tim Jenssen2012-05-162-2/+0
| | | | | | Change-Id: Id25e26fd88a43f5470036e8d9cde04e5d7e7b0d8 Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com> Reviewed-by: Niels Weber <niels.2.weber@nokia.com>
* let value() also query the Settings objectAlexander Lenhardt2012-05-163-2/+11
| | | | | | | | | | if a value can not be found in the m_vars hash, value() will query the Settings object first before returning the default value. This allows to specify arbitrary tags to be defined in e.g. config.xml which can later be accessed by installationscripts. Change-Id: I881ff961e3647fa32a0219bbfc8bbb89935ff3d4 Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
* corrected spelling in a method nameTim Jenssen2012-05-153-3/+3
| | | | | | Change-Id: I1c9d91af82fee76b0da0c1ed15067bc806883e04 Reviewed-by: Niels Weber <niels.2.weber@nokia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
* remove the limitation that archivegen could handle directories onlyTim Jenssen2012-05-145-27/+21
| | | | | Change-Id: I5e7b6740d6df1b858cee091a1174e8fd64e477a7 Reviewed-by: Niels Weber <niels.2.weber@nokia.com>
* remove unneeded variableTim Jenssen2012-05-141-1/+0
| | | | | Change-Id: Iced0128f40f4e84b2751ef37079c70f7c69dabcc Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
* Fix broken check for translation files.kh12012-05-071-1/+1
| | | | | | | | Even if SUCCESS contains false, the term evaluates to true cause SUCCESS is not empty... Change-Id: I259e6224de9816629c4fb538a49dd072ea58e7d3 Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
* use string replace method instead of unneeded regexp (\ -> /)Tim Jenssen2012-05-073-11/+5
| | | | | | Change-Id: I9116fc2484e0c2c6e76a9f7e5318d7985f31b898 Reviewed-by: Oliver Wolff <oliver.wolff@nokia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
* add killProcess methodTim Jenssen2012-05-076-0/+97
| | | | | | | | | - only implemented under windows where it could be needed for update - even the delete file method moves files to temp which can not be removed, it is much safer to kill the process Change-Id: Ide043657d5f74186da02cb18a87072b18910c964 Reviewed-by: Oliver Wolff <oliver.wolff@nokia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>