| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
| |
Split out of https://codereview.qt-project.org/#change,48710
Change-Id: Ia0f09818debaf43dcd9d12cef70361575258f89b
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
|
|
|
|
|
|
|
|
|
| |
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>
|
|\
| |
| |
| | |
Change-Id: I4059551829cd42ebde7706057d8f4cca57901037
|
| |
| |
| |
| |
| |
| |
| | |
Task-number: QTIFW-186
Change-Id: I0ad1bb5c28a40cba98850aba2d45b622891bcae6
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
|
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| | |
Change-Id: Icf975d0cc546ddc69e35b42a0d4d546e05bfe795
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
|
| |
| |
| |
| |
| |
| |
| |
| | |
As recommended by krazy run.
Change-Id: If4acdf487e998d0c52b5443322cbde95b6e961fa
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
|
|/
|
|
|
| |
Change-Id: I66b289bafc510e85c2845f235fb7f324aac84377
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
|
|
|
|
|
| |
Change-Id: Ibd38a8e477bbf7a03fc6e7a69479b401d4a37f78
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
|
|
|
|
|
| |
Change-Id: Ied61160ee377bf48b2f1a80ca71cdd1e24798a55
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
| |
Change-Id: I54b9e59ad5d9d4092996fe5fd58157631c552f3f
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
|
|
|
|
|
| |
Change-Id: I58e00fe25f4b423b0c3517eff4f160706792ed6d
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
Call m_vars value function directly.
1; To prevent recursive calls in case of key "Default".
2; To avoid the extra function call to fetch values from m_vars in
case of other values set in the object.
Change-Id: I8f40b53704d1f314071d7060d0c92829310c262d
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
Reviewed-by: Niels Weber <niels.weber@digia.com>
|
|
|
|
|
|
| |
Change-Id: I1a1f3a22d7360f9a9e8036c76b721aa740e612e9
Reviewed-by: Niels Weber <niels.weber@digia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
|
|
|
|
|
|
|
| |
Task-number: QTIFW-184
Change-Id: I5b5fdda255cffe3dcd5b46b8eb4334fa3410f869
Reviewed-by: Niels Weber <niels.weber@digia.com>
|
|
|
|
|
| |
Change-Id: I0336e02ef701a2bc392bd385d1822bc51cee0c5c
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
|
|
|
|
|
| |
Change-Id: Id55a71a6ee24b234739b6066e11e9c1f2e389f73
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
|
|
|
|
|
| |
Change-Id: I4b463cab41f6ed8ac04b06240e87fb255a5748b5
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
|
|
|
|
|
| |
Change-Id: I1e737164436e7eea94d9fd5b561f3c9e1cf828ad
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
|
|
|
|
|
| |
Change-Id: I2604c77418e4a930bd0f76092db581fef1e45817
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
|
|
|
|
|
| |
Change-Id: Ied9886d589d7b3c3928f29c8363eb66e1634819a
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
|
|
|
|
|
| |
Change-Id: I4b59b7563b3da5507d779e04fe6599f7954050c8
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
|
|
|
|
|
| |
Change-Id: I8e08618bcc88cc445c317c79d93cdf9f1f2ca5e8
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
|
|
|
|
|
| |
Change-Id: Id26c7fed5ee155ab971b2a81aa9beb0589411c56
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
|
|
|
|
|
|
|
|
|
|
| |
Task-number: QTIFW-136
Task-number: QTIFW-137
Do not advance the dir iterator while recursing thru directories.
Change-Id: I14a69c7a154c9ff0268ad63c3a926cfefe4f4a11
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
|
|
|
|
|
| |
Change-Id: I294038888bd47a139b8c3df68e298e66e5ec2202
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
|
|
|
|
|
|
|
|
|
| |
- 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>
|
|
|
|
|
|
|
|
| |
- 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>
|
|
|
|
|
|
| |
Change-Id: Ie1e187038378ddc6b4fa446b2f0b526cf65f40ad
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
Reviewed-by: Niels Weber <niels.weber@digia.com>
|
|
|
|
|
|
|
|
| |
- 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>
|
|
|
|
|
|
|
|
| |
- this makes moving of components much easier
Change-Id: Ie26daedd5f293b361761e14e370d6b01b55c12b6
Reviewed-by: Niels Weber <niels.weber@digia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Task-number: QTIFW-136
This is now needed as we put the version number in front of
all content inside the data folder. This however results in
unexpected file name changes once the files are put inside the
repository and later are installed on the target system. If
we keep all files in zips, we can version them and install it
with the original name.
Change-Id: Ia700386c3f77de33818395a07d418c5ec40a0a14
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
Reviewed-by: Niels Weber <niels.weber@digia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
|
|
|
|
|
|
|
| |
Issue: QTIFW-123
Change-Id: Ie2f5f663e394eb1c55e2ae578f4f735309e57ebc
Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
|
|
|
|
|
|
|
|
|
| |
- 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>
|
|
|
|
|
|
|
|
|
|
| |
- 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>
|
|
|
|
|
| |
Change-Id: I5e7b6740d6df1b858cee091a1174e8fd64e477a7
Reviewed-by: Niels Weber <niels.2.weber@nokia.com>
|
|
|
|
|
| |
Change-Id: I01edf5ee396ea61526dce52d7b7f4fd02721c220
Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
|
|
|
|
|
| |
Change-Id: I484e20fd53c2710595c5d4eb28878932eebafe35
Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
|
|
|
|
|
|
|
|
| |
- 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>
|
|
|
|
|
|
|
| |
- and added seperator instead of hardcoded "/"
Change-Id: I26fa9b0dac5d0e0d131b628ef78ff8eca3a5fb2a
Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
|
|
|
|
|
| |
Change-Id: Ia3287e48faa5b0efa575602933a1d965081b6f28
Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
|
|
|
|
|
| |
Change-Id: I750d3488ef6913e96332a3582a44e047cc76eea8
Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
|
|
|
|
|
|
|
| |
Fixes Task-number: QTIFW-83
Change-Id: I706e08492355e3502e76377f232c94ded5437029
Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
|
|
|
|
|
|
|
|
| |
- 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>
|
|
|
|
|
|
| |
Change-Id: I70a67d7217580e6d292d210c9f832bbfe44f96b9
Reviewed-by: Niels Weber <niels.2.weber@nokia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
|
|
|
|
|
| |
Change-Id: If754c5885e3c1bf2b15773d39b14d3a7edfe6039
Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
|
|
|
|
|
|
| |
Change-Id: If78009c9364a4eda9f5219e892b4adaf57ae4354
Reviewed-by: Niels Weber <niels.2.weber@nokia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
|
|
|
|
|
| |
Change-Id: Ie7594516cd59c493ad29a40f92661843844dd7b6
Reviewed-by: Niels Weber <niels.2.weber@nokia.com>
|