summaryrefslogtreecommitdiffstats
path: root/tools/binarycreator
Commit message (Collapse)AuthorAgeFilesLines
...
* Rename pathes -> pathsjkobus2014-07-031-3/+3
| | | | | | Change-Id: I9ad2e5eba7df180dec63ec171d5260c01d9715b2 Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Replace Q_OS_MAC with Q_OS_OSXNiels Weber2014-07-031-7/+7
| | | | | | | | Q_OS_MAC also refers to iOS. Change-Id: I91603d0add90a0f3948453a6b9628814b0d9f80c Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Fix broken tools after switching to QFileDevice.kh12014-07-021-15/+23
| | | | | | | | | | | Follow up on 924ebcdbc9b9e590a5f0905941e2d05ac34d4be2 (Part 1). Get rid of KDSaveFile, reuse QTemporaryFile. After changing KDSaveFile to inherit from QFileDevice, it turns out to be not working properly anymore and crashing e.g. binarycreator while using it. To save fixing it we just switch to QTemporaryFile. Change-Id: I785a04db91b431f5e122f193ecf2ef3c54e34b1c Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Fix build with Qt 5.4.0 or newerKai Koehne2014-06-301-1/+3
| | | | | | | qtaccessiblewidgets plugin got removed in Qt 5.4.0. Change-Id: I597c8aabea7d3548851136263f8d77bbd439baba Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Split out the file IO stuff and adjust other files respectively.kh12014-06-241-19/+20
| | | | | | | | | 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>
* binarycreator: add qico and qtaccessiblewidgets as QTPLUGINsRay Donnelly2014-06-201-1/+1
| | | | | | | | | | | Commit 807de076f4fee6c relies on the autoplugs mechanism (added in qtbase commit 4255ba40ab073af) to add the needed statically linked plugins; however because binarycreator is a console app it doesn't depend on gui (QT -= gui) this mechanism fails to add the plugins. Change-Id: If96b0e2c03d229ad1026602b8e8117babda03481 Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Replace script with js engine.kh12014-06-031-1/+1
| | | | | Change-Id: Ic9c88e27dca1e936ba09a3776df3df7ec166c606 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Use QTemporaryDir instead of our homemade solution.kh12014-06-031-1/+4
| | | | | | Change-Id: Ia584a9b2f954df5c29a2f0aa5f12b201b2bfbcc4 Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Merge remote-tracking branch 'origin/1.6'Oswald Buddenhagen2014-06-021-5/+5
|\ | | | | | | | | | | | | | | | | | | Conflicts: dist/config/config.xml dist/packages/org.qtproject.ifw.binaries/meta/package.xml dist/packages/org.qtproject.ifw/meta/package.xml installerfw.pri Change-Id: I32a2a17b8fd7dc0f1f9c12272fc5f814ea5d86cb
| * Mac: Do not require Xcode command line toolsEike Ziller2014-04-161-5/+5
| | | | | | | | | | | | | | | | | | | | | | /usr/bin/xcrun is the tool to use for running build tools from the current Xcode installation, without the need to install anything beside it. Task-number: QTBUG-38015 Change-Id: I32ba8bfac2f2c49e863fe8aeeecaf3df80afb8c8 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com> Reviewed-by: Niels Weber <niels.weber@digia.com>
* | Cleanup to support Qt5 only.kh12014-06-021-8/+0
|/ | | | | Change-Id: Ib8f61229ce2f07e52c22a15e10dc817aca860ead Reviewed-by: Niels Weber <niels.weber@digia.com>
* Name .dmg files after the application bundle on Mac OS XSascha Cunz2013-11-081-1/+1
| | | | | | | | | Use the name of the application bundle (input.outputPath) to give the disc image a volume name instead of using the file name of the .dat file ("out" is set to 'installer.dat' at construction time). Change-Id: I0f53ca7fcafb83353f4fea61b62037f48281375e Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Merge remote-tracking branch 'origin/1.4' into 1.5Tim Jenssen2013-11-061-1/+3
|\ | | | | | | Change-Id: I2725f9bacbe04240dc3f97062c5ebc50884822c8
| * Mac: Fix Info.plist for installerEike Ziller2013-11-061-1/+1
| | | | | | | | | | Change-Id: I7a0199c3001395356e96c0ef5a0c5104144b9cb2 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
| * Make installer apps retina-ready.Eike Ziller2013-10-241-1/+3
| | | | | | | | | | | | | | | | Also fixes the generator note. Change-Id: Ic9a9a033d74320221563c46611122d0fef216c23 Reviewed-by: Iikka Eklund <iikka.eklund@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* | Merge remote-tracking branch 'origin/1.4' into 1.5Tim Jenssen2013-10-231-10/+27
|\| | | | | | | Change-Id: Ib2d382d1aa398b642dc15f4df7c03b19bf638546
| * Option parser, rcc works for current path -> no target expectedMichal Klocek2013-10-161-1/+1
| | | | | | | | | | Change-Id: I93bc6613203e1e879b18e7a8d6ef8849870835ee Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
| * Implement a way to replace the default resource.kh12013-10-161-9/+24
| | | | | | | | | | | | Change-Id: I2e362d255bf2526f216cbb872bbb64d37383d229 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com> Reviewed-by: Michal Klocek <michal.klocek@digia.com>
* | Merge remote-tracking branch 'origin/1.4'Tim Jenssen2013-08-261-2/+2
|\| | | | | | | Change-Id: I9ee4395291754fd5a56555e1dd974df19ee39376
| * fix online only installer creationTim Jenssen2013-08-011-1/+1
| | | | | | | | | | | | | | | | Task-number: QTIFW-319 Change-Id: I1f66f80b952742e7ff21ee6960120271e1579fb9 Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
| * rename copiedArchives to copiedFilesTim Jenssen2013-07-301-1/+1
| | | | | | | | | | | | | | | | - 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>
* | Merge remote-tracking branch 'origin/1.4'Tim Jenssen2013-06-271-1/+1
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: installerfw.pri tools/binarycreator/binarycreator.cpp tools/common/repositorygen.cpp tools/common/repositorygen.h tools/repogen/repogen.cpp Change-Id: I97767b2e4ef9b7afd5ce368d99c6a7d38dfbd947
| * Lists packages not found that were given explicitly.Niels Weber2013-06-201-1/+1
| | | | | | | | | | | | | | | | | | | | 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>
* | Do not use don't, can't ... in outputKai Koehne2013-06-201-1/+1
| | | | | | | | | | | | | | | | | | | | 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>
* | Allow multiple package directories.Niels Weber2013-06-111-8/+9
|/ | | | | | | Task-number: QTIFW-24 Change-Id: I4e6e31457ecd63de7a2de98e35a7be00616151a5 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* binarycreator tries to copy qt_menu.nib dirTim Jenssen2013-05-271-2/+9
| | | | | Change-Id: I86ae6eb2c1129537939fc797a88b5c5b8619fbf7 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* introduce no_app_bundle.priTim Jenssen2013-05-271-0/+2
| | | | | | | - it tries to copy the needed qt_menu.nib dir Change-Id: I04fe564f62e16847a417e47c9a0719c043c1f027 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Some minor Nokia -> Qt Project changesSergio Ahumada2013-04-301-1/+1
| | | | | | | | | - Updating the supported platforms link - changing com.nokia -> org.qt-project Change-Id: Ib74fda09f177a989b79288b967423ef04c16786e Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-11 02:18:30 +0000