38 Commits

Author SHA1 Message Date
Tim Jenssen
2b10d950fb add a location hint to a warning
Change-Id: Ieaa10ff2e7f20dbdccbddf707923619756fea35e
Reviewed-by: Niels Weber <niels.weber@digia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
2013-07-26 12:56:52 +02:00
Niels Weber
dc3f0a459d Lists packages not found that were given explicitly.
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>
2013-06-20 12:31:40 +02:00
Niels Weber
17401372c0 Remove broken repogen -u functionality.
Change-Id: I5199dac61e05278e85ef44e72bd30dd281881d28
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
2013-06-06 12:54:17 +02:00
kh1
a2371edc51 Properly calculate the file size for symlinks.
Task-number: QTIFW-137

Change-Id: I8a39094228bbb82ff99adfa814cda79634f71274
Reviewed-by: Niels Weber <niels.weber@digia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2013-05-30 16:28:12 +02:00
Tim Jenssen
06449248ab introduce installerscriptengine
- 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>
2013-05-16 16:12:52 +02:00
Tim Jenssen
8ae8ef94ce Merge remote-tracking branch 'origin/1.3'
Change-Id: Iabd77388834a27ace28587ded37c66b4c9a9cbd3
2013-04-11 15:22:36 +02:00
Tim Jenssen
ea504b9f84 adding the OS attribute to be compatible with old sdks
Change-Id: Ia9d9e3371008c77cfcdac04c6da40cd4b9a34fb6
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
2013-04-09 13:53:56 +02:00
kh1
083df53feb Cleanup.
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>
2013-03-25 22:01:22 +01:00
kh1
3224fa9834 Change function names (to what they actually do) and signature.
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>
2013-03-25 21:59:53 +01:00
kh1
53bc7f0e16 Reuse existing make absolute.
Change-Id: I9ad7287db0539e3fb6819220a3648244c10f1869
Reviewed-by: Niels Weber <niels.weber@digia.com>
2013-03-25 15:14:30 +01:00
kh1
d1f3e120a5 Adjust to match coding guidelines.
Change-Id: I1904dc6bd8706b7cf93d67cad497becbe480f1f2
Reviewed-by: Niels Weber <niels.weber@digia.com>
2013-03-25 14:18:45 +01:00
kh1
a7722385c3 Remove unused/ duplicated function.
Change-Id: Ic4412244ee9c5e7ff1d96a1d5d86924c7e1fcd1a
Reviewed-by: Niels Weber <niels.weber@digia.com>
2013-03-25 14:18:39 +01:00
kh1
3a81ca00f3 Small cleanup, no functional change.
Change-Id: I339d99d86ab71af785a9fa7b221d255d0e1f1f9b
Reviewed-by: Niels Weber <niels.weber@digia.com>
2013-03-25 09:17:39 +01:00
kh1
0249980607 Use Q_GLOBAL_STATIC{_WITH_ARGS} following Qt coding conventions.
Move the regexp into its own compilation unit, so we get it only
once and use a accessor to fetch the value. I guess we should do
the same with the constants file, as all strings get compiled in
the file including it. At least Ossi wasn't satisfied currently.

Change-Id: Ic495a82f4b3cfe7810523b12cd3ef255eb15f149
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
2013-03-18 11:39:18 +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
Tim Jenssen
de8d24fa6c Merge remote-tracking branch 'origin/1.3'
Change-Id: I4059551829cd42ebde7706057d8f4cca57901037
2013-03-12 15:10:15 +01:00
Niels Weber
59ac7890bd Fix various minor issues reported by krazy.
Change-Id: Icf975d0cc546ddc69e35b42a0d4d546e05bfe795
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
2013-03-11 16:14:27 +01:00
Niels Weber
1acc2e0b11 Fallback to Name if no DisplayName is provided
Task-number: QTIFW-186

Change-Id: I0ad1bb5c28a40cba98850aba2d45b622891bcae6
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
2013-03-08 13:41:59 +01:00
Niels Weber
9561e4cd61 remove configfile use for repogen
Change-Id: I54b9e59ad5d9d4092996fe5fd58157631c552f3f
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
2013-02-25 11:44:25 +01:00
Niels Weber
4af5c850bd Some String fixes.
Change-Id: I58e00fe25f4b423b0c3517eff4f160706792ed6d
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2013-02-22 14:42:26 +01:00
Tim Jenssen
5c2d700cb1 Make Virtual and Default tag mutually exclusive.
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>
2013-02-20 11:17:42 +01:00
kh1
96bfbec76b Check for all needed tags in package.xml (missing release date).
Task-number: QTIFW-184

Change-Id: I5b5fdda255cffe3dcd5b46b8eb4334fa3410f869
Reviewed-by: Niels Weber <niels.weber@digia.com>
2013-02-01 14:12:56 +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
Niels Weber
1c4caf160d Fix typo
Change-Id: I4b463cab41f6ed8ac04b06240e87fb255a5748b5
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2012-12-14 11:18:15 +01:00
kh1
2f4c977cd6 Compress symlinks instead of resolving them.
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>
2012-11-08 15:48:10 +01:00
kh1
c8cc7d5b52 Merge "buffered" calculateHash function and reuse.
Change-Id: I294038888bd47a139b8c3df68e298e66e5ec2202
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2012-10-01 12:13:06 +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
05d5250857 remove unused arch dependend filesize info
Change-Id: Ie1e187038378ddc6b4fa446b2f0b526cf65f40ad
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
Reviewed-by: Niels Weber <niels.weber@digia.com>
2012-09-28 13:44:51 +02:00
tjenssen
b27243a997 ignore <Name> tag and use the subdirectory name
- 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>
2012-09-28 11:36:45 +02:00
kh1
bc77a40ae8 Compress all content, except already compressed files.
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>
2012-09-25 10:43:59 +02:00
Tim Jenssen
2957e28288 remove the limitation that archivegen could handle directories only
Change-Id: I5e7b6740d6df1b858cee091a1174e8fd64e477a7
Reviewed-by: Niels Weber <niels.2.weber@nokia.com>
2012-05-14 16:39:00 +02:00
Tim Jenssen
f5f76be1f5 use QHash where it is possible
Change-Id: I01edf5ee396ea61526dce52d7b7f4fd02721c220
Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
2012-05-03 13:54:38 +02:00
Tim Jenssen
c862c2820e use scCommaRegExp where ever we can
Change-Id: I484e20fd53c2710595c5d4eb28878932eebafe35
Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
2012-04-27 16:23:36 +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
kh1
564ef62688 let repogen validate install scripts
Change-Id: I4d08e4c33c3d967d4cf45ef5cdb5f3c3e066cf67
Reviewed-by: Niels Weber <niels.2.weber@nokia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
2012-03-27 14:57:48 +02:00
Niels Weber
0203bc6e1e small cleanup in debug output
Change-Id: Ia74a334d5c08f9bf83ca20d003cf3b8a83e2776b
Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
2012-03-20 16:55:39 +01:00
Niels Weber
df5ccaa64a Improve usage output format
Change-Id: Ide21fa802060593c657491861f043ac53c0bb701
Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
2012-03-20 16:55:33 +01: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