summaryrefslogtreecommitdiffstats
path: root/tools/binarycreator
Commit message (Collapse)AuthorAgeFilesLines
* Fully qualify function calls. Fix minor typos.kh12013-03-251-5/+7
| | | | | Change-Id: I36cc096f3195e69bf027aa629d31ffac1d519732 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Change function names (to what they actually do) and signature.kh12013-03-251-5/+5
| | | | | | | | | 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>
* 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>
* Compile on MacNiels Weber2013-03-211-2/+3
| | | | | Change-Id: Ib0aac416971bc3c73b0905d404f1c1620ddfa708 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Deprecate Icon, introduce replacements.Niels Weber2013-03-211-4/+13
| | | | | | | | | | InstallerApplicationIcon is used on Mac and Windows for a custom icon of the installer. InstallerWindowIcon is used to set the window icon of the installer on all platforms. Change-Id: I1f555441875b96e4d8e4ca9a808cf18b3a566c3c Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Replace child in place instead of deleting and appending.Niels Weber2013-03-141-2/+1
| | | | | Change-Id: Idb8463d3728d2cdbaff59c7c27ec7d2044ea2bf0 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Improve variable names in createMetaDataDirectory()Niels Weber2013-03-141-20/+20
| | | | | | | Split out of https://codereview.qt-project.org/#change,48710 Change-Id: Ia0f09818debaf43dcd9d12cef70361575258f89b Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Introduce QInstallerTools::copyWithException functionTim Jenssen2013-03-141-3/+3
| | | | | | | | | Also use this new function and clean up some output lines related to this. Change-Id: I74e9385b449bbca79b70fbd214c5fa75b419ea29 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Clean up Qt 5 build rulesKai Koehne2013-03-061-1/+1
| | | | | | | Change-Id: I2e494d5f91d1cb740c6254544cf92daaae236f1a Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Whitespace fixesNiels Weber2013-03-011-4/+4
| | | | | Change-Id: Ibd38a8e477bbf7a03fc6e7a69479b401d4a37f78 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* binarycreator still needs config optionNiels Weber2013-03-011-0/+2
| | | | | Change-Id: Ied61160ee377bf48b2f1a80ca71cdd1e24798a55 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Fix incorrect error message in binarycreator.Niels Weber2013-02-271-8/+13
| | | | | | | | | | | | | This happened when calling binarycreator with -i and -n at the same time. Also fix a similar error when calling with -f -n. Also improve the error message when using -n together with -i or -e. Task-number: QTIFW-189 Change-Id: I369b218172997d2b46b3209ab13dfc4101767a5c Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Don't hard-code version in sourcesKai Koehne2013-02-141-1/+3
| | | | | | Change-Id: I1a1f3a22d7360f9a9e8036c76b721aa740e612e9 Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Make IFW compile with mingw.kh12013-01-291-0/+2
| | | | | Change-Id: I0336e02ef701a2bc392bd385d1822bc51cee0c5c Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Change copyright headers from Nokia to DigiaSergio Ahumada2012-12-217-84/+202
| | | | | Change-Id: Id55a71a6ee24b234739b6066e11e9c1f2e389f73 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Update with latest changes from Qt4 and Qt5.kh12012-12-072-120/+203
| | | | | Change-Id: I1e737164436e7eea94d9fd5b561f3c9e1cf828ad Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Finally IFW compiles with Qt5 (use private headers)kh12012-12-072-0/+10
| | | | | Change-Id: I2604c77418e4a930bd0f76092db581fef1e45817 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Compile with Qt5.kh12012-11-211-2/+2
| | | | | Change-Id: Ied9886d589d7b3c3928f29c8363eb66e1634819a Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Follow advice given by Joerg, DEPENDPATH is now deprecated.kh12012-11-201-5/+4
| | | | | Change-Id: I8e08618bcc88cc445c317c79d93cdf9f1f2ca5e8 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* remove app_bundle config only if it is a static build on MacTim Jenssen2012-11-091-1/+0
| | | | | Change-Id: Id26c7fed5ee155ab971b2a81aa9beb0589411c56 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* no matter which verbose mode - warnings should be showntjenssen2012-10-011-1/+1
| | | | | | | | | - and creation of the exception shouldn't write the warning - this should be happen in the catch block Change-Id: I574c77fab42845079bda7c0d57c4a4a0bdbe1e7f Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* emphasize the dynamic values in outputstjenssen2012-10-011-25/+25
| | | | | | | | - this makes the debug output much clearer Change-Id: I580b3af1479e2e38c5a44b50628e4c71d6b5d45f Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* add executableExtension to default templateBinary on windowstjenssen2012-09-281-17/+18
| | | | | | | | - and use a better name for binaryEnding -> executableExtension Change-Id: Ie0ab28152f6a9f1c8e93b0fcd2cf3eb2a976122a Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com> Reviewed-by: Niels Weber <niels.weber@digia.com>
* Store installer data in a separate file on Mac to support code signingPasi Matilainen2012-09-261-0/+17
| | | | | | | | | | | | | Code signing fails on Mac OS X if there's any extra data after the link edit segment in a binary, so store the installer data in a separate file inside the bundle. Task-number: QTIFW-153 Change-Id: Ie1edf21212b4a3bc5b6f32eea3f5d61e8800a0d5 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Niels Weber <niels.weber@digia.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>
* fix openpty static link problemTim Jenssen2012-06-121-1/+0
| | | | | | | | | - 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-121-0/+7
| | | | | | | | | | - 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>
* printusage should show binaryending under windowsTim Jenssen2012-04-231-11/+21
| | | | | | | | - and added some correction code if that .exe ending is missing Change-Id: Id8d4ed0962d8cb3a0bdb277dfce6f9e6014aec33 Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com> Reviewed-by: Niels Weber <niels.2.weber@nokia.com>
* add missing config.xml to one exampleTim Jenssen2012-04-131-4/+5
| | | | | | | - and added seperator instead of hardcoded "/" Change-Id: I26fa9b0dac5d0e0d131b628ef78ff8eca3a5fb2a Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
* Change usage message to reflect changed config handling.Niels Weber2012-04-031-1/+1
| | | | | Change-Id: Ia3287e48faa5b0efa575602933a1d965081b6f28 Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
* Remove leftover comment.Niels Weber2012-04-031-1/+0
| | | | | Change-Id: I750d3488ef6913e96332a3582a44e047cc76eea8 Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
* Specify config file instead of hardcoding config.xmlNiels Weber2012-04-021-20/+23
| | | | | | | Fixes Task-number: QTIFW-83 Change-Id: I706e08492355e3502e76377f232c94ded5437029 Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
* binarycreator shouldn't exit with error code if it can't clean up correctlyTim Jenssen2012-03-301-1/+1
| | | | | | | | - in case there is something but ignoreErrors==true it is showing a warning message Change-Id: I9c09a310960a56432975757496984bbe36fe5028 Reviewed-by: Niels Weber <niels.2.weber@nokia.com> Reviewed-by: Oliver Wolff <oliver.wolff@nokia.com>
* changed binarycreator to use the new option syntax onlyTim Jenssen2012-03-271-30/+28
| | | | | | Change-Id: If78009c9364a4eda9f5219e892b4adaf57ae4354 Reviewed-by: Niels Weber <niels.2.weber@nokia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
* introduce general humanReadableSize methodTim Jenssen2012-03-271-2/+2
| | | | | Change-Id: I4731be424cf2207e8cc2320ab9e442d02c29aeda Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
* let repogen validate install scriptskh12012-03-271-1/+2
| | | | | | Change-Id: I4d08e4c33c3d967d4cf45ef5cdb5f3c3e066cf67 Reviewed-by: Niels Weber <niels.2.weber@nokia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
* Reorganize the tree, have better ifw.pri. Shadow build support.kh12012-03-1910-0/+2359
Change-Id: I01fb12537f863ed0744979973c7e4153889cc5cb Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>