29 Commits

Author SHA1 Message Date
kh1
5bb70f3676 Small cleanup.
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>
2013-03-21 19:10:04 +01:00
Niels Weber
7e9b2651d0 Compile on Mac
Change-Id: Ib0aac416971bc3c73b0905d404f1c1620ddfa708
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2013-03-21 16:57:02 +01:00
Niels Weber
44fc5acd5c Deprecate Icon, introduce replacements.
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>
2013-03-21 13:32:31 +01:00
Niels Weber
bbebc83ebf Replace child in place instead of deleting and appending.
Change-Id: Idb8463d3728d2cdbaff59c7c27ec7d2044ea2bf0
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2013-03-14 15:55:06 +01:00
Niels Weber
98a9496395 Improve variable names in createMetaDataDirectory()
Split out of https://codereview.qt-project.org/#change,48710

Change-Id: Ia0f09818debaf43dcd9d12cef70361575258f89b
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2013-03-14 15:23:42 +01:00
Tim Jenssen
f1aa02d1dd Introduce QInstallerTools::copyWithException function
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>
2013-03-14 14:02:35 +01:00
Niels Weber
05b2b268bd Whitespace fixes
Change-Id: Ibd38a8e477bbf7a03fc6e7a69479b401d4a37f78
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
2013-03-01 15:45:15 +01:00
Niels Weber
fad480d031 binarycreator still needs config option
Change-Id: Ied61160ee377bf48b2f1a80ca71cdd1e24798a55
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
2013-03-01 15:27:44 +01:00
Niels Weber
0eb397ba65 Fix incorrect error message in binarycreator.
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>
2013-02-27 17:25:00 +01:00
Kai Koehne
bf2300a1cd Don't hard-code version in sources
Change-Id: I1a1f3a22d7360f9a9e8036c76b721aa740e612e9
Reviewed-by: Niels Weber <niels.weber@digia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
2013-02-14 13:11:55 +01:00
kh1
8633d999d6 Make IFW compile with mingw.
Change-Id: I0336e02ef701a2bc392bd385d1822bc51cee0c5c
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-01-29 11:12:24 +01:00
Sergio Ahumada
8f4053db30 Change copyright headers from Nokia to Digia
Change-Id: Id55a71a6ee24b234739b6066e11e9c1f2e389f73
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
2012-12-21 22:25:29 +01:00
kh1
40b40e6274 Finally IFW compiles with Qt5 (use private headers)
Change-Id: I2604c77418e4a930bd0f76092db581fef1e45817
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2012-12-07 13:15:35 +01:00
kh1
ad57af7345 Compile with Qt5.
Change-Id: Ied9886d589d7b3c3928f29c8363eb66e1634819a
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2012-11-21 17:01:06 +01:00
tjenssen
c266f5bdd6 no matter which verbose mode - warnings should be shown
- 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>
2012-10-01 11:46:33 +02:00
tjenssen
51767479de emphasize the dynamic values in outputs
- 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>
2012-10-01 11:46:22 +02:00
tjenssen
a66d7bf15a add executableExtension to default templateBinary on windows
- 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>
2012-09-28 13:44:37 +02:00
Pasi Matilainen
830522f3a2 Store installer data in a separate file on Mac to support code signing
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>
2012-09-26 14:42:45 +02:00
Niels Weber
3feb0423be Show a real version in the version info on Mac.
Issue: QTIFW-123

Change-Id: Ie2f5f663e394eb1c55e2ae578f4f735309e57ebc
Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
2012-08-02 11:15:45 +02:00
Tim Jenssen
cf6ac7ea81 add the installer create datetime to --version
- 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>
2012-06-12 09:54:09 +02:00
Tim Jenssen
8a037af84c printusage should show binaryending under windows
- 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>
2012-04-23 19:41:04 +02:00
Tim Jenssen
6f929b707a add missing config.xml to one example
- and added seperator instead of hardcoded "/"

Change-Id: I26fa9b0dac5d0e0d131b628ef78ff8eca3a5fb2a
Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
2012-04-13 14:56:47 +02:00
Niels Weber
93dc2c072f Change usage message to reflect changed config handling.
Change-Id: Ia3287e48faa5b0efa575602933a1d965081b6f28
Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
2012-04-03 12:14:39 +02:00
Niels Weber
d0f6762b8b Remove leftover comment.
Change-Id: I750d3488ef6913e96332a3582a44e047cc76eea8
Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
2012-04-03 12:14:33 +02:00
Niels Weber
22e6708d99 Specify config file instead of hardcoding config.xml
Fixes Task-number: QTIFW-83

Change-Id: I706e08492355e3502e76377f232c94ded5437029
Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
2012-04-02 16:34:13 +02:00
Tim Jenssen
66db6e0a4d binarycreator shouldn't exit with error code if it can't clean up correctly
- 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>
2012-03-30 14:40:05 +02:00
Tim Jenssen
6df4c5d7d7 changed binarycreator to use the new option syntax only
Change-Id: If78009c9364a4eda9f5219e892b4adaf57ae4354
Reviewed-by: Niels Weber <niels.2.weber@nokia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
2012-03-27 15:46:24 +02:00
Tim Jenssen
520d98028f introduce general humanReadableSize method
Change-Id: I4731be424cf2207e8cc2320ab9e442d02c29aeda
Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
2012-03-27 15:04:31 +02:00
kh1
be3b47d0d5 Reorganize the tree, have better ifw.pri. Shadow build support.
Change-Id: I01fb12537f863ed0744979973c7e4153889cc5cb
Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
2012-03-19 16:14:04 +01:00