4
0
mirror of https://github.com/QuasarApp/installer-framework.git synced 2025-05-12 12:59:33 +00:00

78 Commits

Author SHA1 Message Date
Katja Marttila
fff2c98f4a Merge remote-tracking branch 'origin/3.0' into master
Change-Id: I8d0c8b9faa9537b50e989ec264ed7bfe8d2e358b
2018-02-08 12:55:47 +02:00
Andy Shaw
9d00a5a957 Add line number information when throwing an Error regarding the script
Change-Id: I5bc3ca4779ed12d927c3a6a041a81d8e39d5bd1f
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
2018-01-24 07:13:18 +00:00
Konstantin Podsvirov
977610bfb4 Add support dash (-) symbol in component name
Add colon (:) symbol as alternative separator beetwen
component name and version to use dash (-) symbol in
component name.

For names with dash (-) symbol use colon (:) symbol
as separator in dependencies between name and version,
even if you do not specify a version.

Requirement example: package-with-dash:>=1.2.3, stable:1.x,
demo:v1.0-rc1, backward-compatibility:.

Also add test 'tst_ComponentIdentifier' for check new feature.

Task-number: QTIFW-948
Change-Id: I6340c8001dec369ed8d33fcc4a92c7bce660aec1
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
2017-12-05 07:26:41 +00:00
Konstantin Podsvirov
1f3eded578 Allow comparing non-numeric versions
Changes:
- Improve KDUpdater::compareVersion method;
- Add tst_CompareVersion test.

Task-number: QTIFW-948
Change-Id: If64f807cfb04e56d2bdd5fa250f456631df3f239
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
2017-11-13 14:50:07 +00:00
Konstantin Podsvirov
38aeba4936 Fix adding SHA1 node
Searching existing sha1sum node and keep/replace/add it if needed.

These changes correct the adding of two SHA1 nodes when the packages
are repackaged (option --repository via repogen and binarycreator)

Change-Id: Ide99946644fd73fadc63f23d34d7aec16b0399a2
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
2017-06-07 09:05:51 +00:00
Katja Marttila
a42a15779a Merge remote-tracking branch 'origin/3.0'
Change-Id: Ic3c8005de03b2cc71436aaa18486085a845dca78
2017-03-30 10:34:22 +03:00
Katja Marttila
7e91db5b1e Merge remote-tracking branch 'origin/2.0' into 3.0
Conflicts:
	src/libs/installer/downloadfiletask.cpp

Change-Id: Ie4b07c402a63c7a12ecf24e52e197507bbb2c5df
2017-03-30 09:02:33 +03:00
Samuel Gaist
aca7f1fb7e QRegExp include cleanup
This patch adds the missing include statements for QRegExp.

Change-Id: I05fed3e83514af895b95a3df746b0ae1e6b31828
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-03-13 20:56:02 +00:00
Konstantin Podsvirov
2385184b8b Teach 'binarycreator' and 'repogen' to repack packages from repository
To both tools added options:
--repository                  The directory containing the available repository.
--ignore-invalid-repositories Ignore all invalid repositories instead of aborting.

Documentation added to ifw-tools.html page.

Task-number: QTIFW-925
Change-Id: I36519385df6166d0e450c0ef9d7df44c8611d6a6
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
2017-03-13 05:11:47 +00:00
Katja Marttila
9772474dd9 Merge remote-tracking branch 'origin/2.0'
Conflicts:
	Changelog
	dist/config/config.xml
	dist/packages/org.qtproject.ifw.binaries/meta/package.xml
	dist/packages/org.qtproject.ifw/meta/package.xml
	installerfw.pri
	src/libs/installer/lib7z_create.h
	src/libs/kdtools/kdgenericfactory.cpp
	src/libs/kdtools/kdgenericfactory.h
	src/libs/kdtools/kdupdaterapplication.cpp
	src/libs/kdtools/kdupdaterapplication.h
	src/libs/kdtools/kdupdaterupdatesourcesinfo.cpp
	src/libs/kdtools/kdupdaterupdatesourcesinfo.h
	src/libs/kdtools/localpackagehub.cpp
	src/libs/kdtools/localpackagehub.h
	src/libs/kdtools/updatefinder.cpp
	src/libs/kdtools/updatefinder.h
	tools/binarycreator/resources/mkdmg.sh

Change-Id: Iab2513f549832d2e750e77131c673457ab265af4
2017-01-30 14:40:26 +02:00
Katja Marttila
c9d11cc991 License header update to GPL-EXCEPT
Change-Id: I6426c4e8f932cf26c6c638dec18d0c12e22972d1
Reviewed-by: Janne Anttila <janne.anttila@theqtcompany.com>
2017-01-26 10:02:56 +00:00
Iikka Eklund
2af57eb8c8 Merge remote-tracking branch 'origin/2.0'
Conflicts:
	installerfw.pri
	src/libs/kdtools/kdgenericfactory.cpp
	src/libs/kdtools/kdgenericfactory.h
	src/libs/kdtools/kdupdaterapplication.cpp
	src/libs/kdtools/kdupdaterapplication.h
	src/libs/kdtools/kdupdaterupdatesourcesinfo.cpp
	src/libs/kdtools/kdupdaterupdatesourcesinfo.h
	sync.profile

Change-Id: Ifdc8b065f89b7e241bd3788ed79768e21888161f
2016-01-20 14:18:30 +02:00
Katja Marttila
ba1209000a Allow defining non-checkable items
This change will introduce new element 'Checkable' for package.
Setting checkable to false will hide checkbox. Useful if use case
is to install one sub item instead of all sub items.

Change-Id: I8c731e77353b6da539dddcecdc8495b28ef5f7ea
Task-number: QTIFW-773
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
Reviewed-by: Iikka Eklund <iikka.eklund@theqtcompany.com>
2016-01-18 12:01:50 +00:00
Iikka Eklund
6ba58b42ab Update license headers
Update existing license headers. LGPL -> LGPLv21.
Update copyright year as well.

Change-Id: Ie1d71f8c68186b8f625f409ddf94691f178093c9
Reviewed-by: Katja Marttila <katja.marttila@theqtcompany.com>
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2015-12-29 07:31:11 +00:00
Karsten Heimrich
de8b7ede25 Rename files. Remove {kd} prefix. Remove {kdupdater} prefix.
Change-Id: I88c93cab718f4659296d5f7f562beefd747a366f
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
2015-07-14 12:37:58 +00:00
Kai Koehne
b2a65ce68b Sanitize QDebug output
Prefer using the stream operator logic instead of using
QString::fromLatin1. Add a noquote() where a QString should be printed
without any quotes/escapes.

This also fixes the tests with Qt 5.5, where QString's are further
escaped.

Change-Id: Ie3afd14b9355101d3c0b52f30f66ec759c76526c
Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
2015-07-09 13:38:42 +00:00
Kai Koehne
1e589e37a9 Unify translated error messages
* Enclose file paths in ""
* Localize file paths with QDir::toNativeSeparators.
* Make sure sentences end with a '.'
* Append error details always by ':', e.g.
    tr("Failed to copy file '%1': %2").(...)
* Use 'directory' instead of 'folder' everywhere

Change-Id: Ie045f429f72ad5045c96537465c5fb9d2e99d250
Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
2015-06-24 09:22:42 +00:00
Kai Koehne
80b2694aed Remove %0 from tr() calls
The placeholder of the first argument to QString::tr() is %1, not %0.

Change-Id: I69fcddb42ddbfda27dfb4430f03ebef156280c64
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
2015-06-15 13:22:59 +00:00
Karsten Heimrich
02f1c6cde8 Split the huge header file in more dedicated ones.
Change-Id: I35a1500d5a9bb8986765488660cf0487c32d9720
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
2015-06-10 08:15:45 +00:00
Karsten Heimrich
4677d36298 Update source tree with version 9.38.beta of LZMA SDK.
- Remove unused files.
- Split in .pri files.
- Add HEADERS section.
- Adjust lib7z_facade.

Change-Id: I31e7bafbfe1a9346364bd58c391601955f98ad3a
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
2015-06-10 08:15:38 +00:00
Kai Koehne
be481e3af7 Merge remote-tracking branch 'origin/2.0'
Change-Id: I2c66fe453db03b833a57a4a400cf859096f81165
2015-04-30 15:49:54 +02:00
kh1
32221180df Fix dubious warning about RequiresAdminRights tag.
The tag was added once component script is parsed and we did
know that addElevatedOperation is called from script. However,
the initial commit 7ccd0acdcf35b957e9e7d04cd81902bac362ad04 did
not append the node to the parent package update node. Now we
decided to have the option statically and declarative available,
so we can remove the warning.

Task-number: QTIFW-670
Change-Id: I8cd8f702391d7bf80fc4c42074e1fd6d2d4abc57
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
2015-04-27 10:55:37 +00:00
Kai Koehne
ffed7d2b6d Merge remote-tracking branch 'origin/2.0'
Conflicts:
	Changelog

Change-Id: Idd7d569f97fba75b05bfc006c7a5b0b9cf8ccf73
2015-04-21 14:18:07 +02:00
kh
c6c815e3d0 Compile with Qt 5.5
Change-Id: Iaab5bd3821bc4f1d4a826c9fee0c2a8c75d06bba
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
2015-04-13 13:13:26 +00:00
Kai Koehne
c3f5744d2e Don't mix iterator and const_iterator
Add QT_STRICT_ITERATORS to disallow implicit conversions
between iterator and const_iterator. This avoids potential
detaches of the Qt containers.

Change-Id: I79d381f531ddda9ac402c6f5c63cdc7c6808a0bd
Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
2015-04-08 08:36:57 +00:00
Kai Koehne
99996591e0 Update Copyright
Change-Id: I8dde6629cfd461104364d5cdc255cb54b58283fa
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
2015-02-18 10:33:48 +00:00
jkobus
41e58eb4a4 Introduce scScript constant and use whenever needed
Change-Id: Icdbd110f4778bbf8fa75cf54a564fcd0bc8f7a49
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
2014-11-18 15:38:13 +01:00
Kai Koehne
4ebfecf411 Add LGPLv3 as new license
Change-Id: I61158f956894e209dccf83744b4753774676099d
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
Reviewed-by: Niels Weber <niels.weber@digia.com>
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@digia.com>
2014-10-16 15:17:56 +02:00
kh1
924ebcdbc9 Split out the file IO stuff and adjust other files respectively.
Also adjust the API to use QFileDevice instead of QIODevice to
make clear we just operate on files here and not on any possible
device like sockets, processes etc...

Change-Id: I4ecbb6e244fe4bb666ed12e62f9f5586bc1347f0
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-06-24 10:31:08 +02:00
kh1
8addcf763b Replace script with js engine.
Change-Id: Ic9c88e27dca1e936ba09a3776df3df7ec166c606
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-06-03 10:51:51 +02:00
kh1
f91f630fa2 Make sure we read the script content as UTF8.
Task-number: QTIFW-485

Change-Id: Id09365207c6f5b1312fb85ad67443f7e51a1944e
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-04-23 13:35:53 +02:00
kh1
ea25dca5ea Fix strange error message.
Task-number: QTIFW-309

If a component script file is empty or misses the component class
constructor, bail out during binary create or installer execution.

Change-Id: I422c64186652a52122d54b5b042139803c24ba10
Reviewed-by: Niels Weber <niels.weber@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-04-04 11:09:07 +02:00
kh1
a042131948 Add a current date as release date fallback.
Change-Id: Ib42ef38b8b47e3a7f0cf3beec1c1c16a7c51cf26
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
2014-02-11 12:03:31 +01:00
Tim Jenssen
d8d93f85d6 Merge remote-tracking branch 'origin/1.4'
Change-Id: I9ee4395291754fd5a56555e1dd974df19ee39376
2013-08-26 12:24:11 +02:00
Tim Jenssen
550de62138 adding archives automatically to updates.xml
Task-number: QTIFW-210
Task-number: QTIFW-248

Change-Id: I6deeade922dfe796df4223dae9e4a4744b7d6724
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
2013-08-01 19:15:14 +02:00
Tim Jenssen
9407b86794 fix online only installer creation
Task-number: QTIFW-319

Change-Id: I1f66f80b952742e7ff21ee6960120271e1579fb9
Reviewed-by: Niels Weber <niels.weber@digia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
2013-08-01 15:57:14 +02:00
Tim Jenssen
af045e1321 rename copiedArchives to copiedFiles
- they are including the sha1 files so the old name was misleading

Change-Id: I6156b5590bc98ed319a093c82be32d9f79699d28
Reviewed-by: Niels Weber <niels.weber@digia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
2013-07-30 09:49:33 +02:00
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
Tim Jenssen
72dfa6df1e Merge remote-tracking branch 'origin/1.4'
Conflicts:
	installerfw.pri
	tools/binarycreator/binarycreator.cpp
	tools/common/repositorygen.cpp
	tools/common/repositorygen.h
	tools/repogen/repogen.cpp

Change-Id: I97767b2e4ef9b7afd5ce368d99c6a7d38dfbd947
2013-06-27 11:20:29 +02:00
Kai Koehne
b38573f2da Do not use don't, can't ... in output
Don't, Can't, etc abbreviations are used in informal speech. This is
okay in code comments etc, but user output should use the correct,
non-abbreviated terms.

Change-Id: I53c0dfa91596c151bfa7ef7b65f57d5084ceccde
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2013-06-20 12:36:03 +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
3ddfcacc51 Allow multiple package directories.
Task-number: QTIFW-24

Change-Id: I4e6e31457ecd63de7a2de98e35a7be00616151a5
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
2013-06-11 16:29:27 +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