summaryrefslogtreecommitdiffstats
path: root/src/libs/installer/lib7z_facade.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/2.0'Katja Marttila2017-01-301-17/+12
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * License header update to GPL-EXCEPTKatja Marttila2017-01-261-17/+12
| | | | | | | | | | Change-Id: I6426c4e8f932cf26c6c638dec18d0c12e22972d1 Reviewed-by: Janne Anttila <janne.anttila@theqtcompany.com>
| * Fix the exception message because missing a space.Takayuki ORITO2016-04-291-1/+1
| | | | | | | | | | | | | | Added space between 'convert' from 'path'. Change-Id: I25f4eedc7d322d29c8c93dd7dd80fc13232de0b7 Reviewed-by: Niels Weber <niels.weber@qt.io>
* | Doc: added namespace statement for lib7zNico Vertriest2016-01-281-1/+7
| | | | | | | | | | | | Change-Id: I0783917628f0f2608f20b00f90b6a68db7a86253 Task-number: QTBUG-43810 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* | Merge remote-tracking branch 'origin/2.0'Iikka Eklund2016-01-201-4/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Update license headersIikka Eklund2015-12-291-4/+3
| | | | | | | | | | | | | | | | | | 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>
* | Fix timezone issue, simply keep the UTC time.Karsten Heimrich2016-01-041-27/+5
| | | | | | | | | | | | | | | | | | | | Since we're the only user of the list archive function, do not convert from UTC. Though once we document the function it should be mentioned that the user needs to convert it (e.g. for display purposes etc...). Change-Id: Icbf8372ddff4f34e3c5a426b983ff25a117d74eb Reviewed-by: Katja Marttila <katja.marttila@theqtcompany.com>
* | Fixed compiling lib7z_facade.cpp with Visual Studio 2013Frerich Raabe2015-12-091-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit c43f3f0c683841f7b2bd62ce8c1556f2e5412d4d introduced a usage of localtime_s for non-MinGW Windows builds. Visual Studio 2013 complained about this, saying ..\..\..\..\source\src\libs\installer\lib7z_facade.cpp(331) : error C3861: 'localtime_s': identifier not found The MSDN explains that <time.h> should be included, so let's do that to make the build succeed. Change-Id: I8447ed0c97480485e4219f6e413b05d80be6ef63 Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
* | Fixed running binarycreator if the temporary directory name contains spacesFrerich Raabe2015-12-081-14/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The binarycreator program fails to generate an archive if the temporary directory name contains spaces. This is not uncommon on Windows since the temporary directory is beneath the home directory, e.g. C:\Users\<username>\AppData\Local\Temp. If the user name contains spaces (as it does in my case, the user name is "Frerich Raabe") binarycreator fails with [64] Warning: QFile::remove: Empty or null file name (C:\Qt\MSVC12\5.5.0-src\qtbase\src\corelib\io\qfile.cpp:498, bool __thiscall QFile::remove(void)) Caught exception: Cannot create archive "C:\Users\Frerich": internal code: E_FAIL This was caused by createArchive() assembling a command line without escaping either the 'target' or any of the 'sources' values. Instead of adding escaping only to split the command line again, let's drop the approach of constructing a command and then splitting it completely. Instead, let's build an array of arguments right away. Change-Id: I284c1b5a27e9edd3717243ea7979149ab2033d64 Task-number: QTIFW-787 Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
* | Fix violated assertion in error handling of binarycreatorFrerich Raabe2015-12-081-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The errorMessageFrom7zResult() function asserts (via a qFatal) that the given status code is indeed an error, i.e. not S_OK. However, the condition 'res != S_OK || !tempFile.exists()' permitted that the function is called with S_OK (in case !tempFile.exists() is true), violating an assertion. This patch adjusts the error handling such that the details of the error returned by errorMessageFrom7zResult() are only included in the exception message if the status code is not S_OK. Change-Id: I15d686cd35c918093ec90c56a7bcc3f0e6638cfb Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
* | Fix broken daylight saving time check.Karsten Heimrich2015-11-231-0/+16
| | | | | | | | | | Change-Id: I9fd27cd014d3b1f13b176dc0d4e8af1a93c37ff5 Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
* | Fix missing filename conversion on UNIX systems.Karsten Heimrich2015-06-251-0/+15
| | | | | | | | | | | | | | Task-number: QTIFW-643 Change-Id: If6df557d09b23dce99caed8f7b00dd726a6d42e6 Reviewed-by: Niels Weber <niels.weber@theqtcompany.com> Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | Unify translated error messagesKai Koehne2015-06-241-31/+36
| | | | | | | | | | | | | | | | | | | | | | | | * 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>
* | Cleanup time handling, some minor changes.Karsten Heimrich2015-06-231-45/+22
| | | | | | | | | | Change-Id: I830ff58673efe76c47dcb0c5839bf44bbd2f42a8 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | Fix usage of Lib7z::createArchive(), do not use static.Karsten Heimrich2015-06-161-1/+1
| | | | | | | | | | Change-Id: I749fefeafc924540a8c6119f669685895a69e07d Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
* | Implement option to pass compression level, update documentation.Karsten Heimrich2015-06-101-8/+11
| | | | | | | | | | Change-Id: Iaffbd0de5590131287f5e9414f13d3906b8b3d14 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | Split the huge header file in more dedicated ones.Karsten Heimrich2015-06-101-0/+4
| | | | | | | | | | Change-Id: I35a1500d5a9bb8986765488660cf0487c32d9720 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | Update source tree with version 9.38.beta of LZMA SDK.Karsten Heimrich2015-06-101-890/+613
| | | | | | | | | | | | | | | | | | | | - Remove unused files. - Split in .pri files. - Add HEADERS section. - Adjust lib7z_facade. Change-Id: I31e7bafbfe1a9346364bd58c391601955f98ad3a Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | Update documentation and adjust some code to match.Karsten Heimrich2015-06-091-15/+45
| | | | | | | | | | Change-Id: I3a8d9afb79628135051e4133bea9fc66e14a514a Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | Merge remote-tracking branch 'origin/2.0'Kai Koehne2015-06-041-6/+7
|\| | | | | | | | | | | | | Conflicts: src/libs/installer/packagemanagercore.cpp Change-Id: Ie3d94fe3a633e189c260bf20682c00a2bb901bc8
| * Fix archivegen recursive include of directories with filter.Karsten Heimrich2015-05-121-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | Never pass recursive with true even if path is a directory, otherwise the path containing the file name part of the path is used as path to recurse and the actual file name is used as filter. For example: /path/to/doc -> Directory: /path/to -> Filter: doc Task-number: QTIFW-639 Change-Id: I60972eab0b34073b4c81a815ee83058df09d1eab Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com> Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
* | Coding style cleanup.Karsten Heimrich2015-06-031-123/+138
| | | | | | | | | | Change-Id: I5761d98c88df72915195f0e004e7d380e6403eb9 Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
* | Remove unused and unmaintained code.Karsten Heimrich2015-06-031-245/+1
| | | | | | | | | | Change-Id: Ieeac37893bf25279c5b0b7d3861eaec7caead120 Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
* | Merge remote-tracking branch 'origin/2.0'Kai Koehne2015-02-261-7/+7
|\| | | | | | | Change-Id: I962f4f19909c06e1da03c14072b15f97de02a07d
| * Update CopyrightKai Koehne2015-02-181-7/+7
| | | | | | | | | | Change-Id: I8dde6629cfd461104364d5cdc255cb54b58283fa Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
* | Fix messagesjkobus2015-02-111-4/+4
|/ | | | | | Change-Id: I3cfa75df0d4da9c818b3341b1a422f845a056ae0 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com> Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
* Add LGPLv3 as new licenseKai Koehne2014-10-161-14/+7
| | | | | | | 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>
* Fix some std::cout usage.kh12014-09-051-2/+1
| | | | | | | Fixes missing timestamps and some propably wrong conversion. Change-Id: I6106e1ea61d0840d132dd3b44cd746f023e795af Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Calm down warnings.kh12014-07-091-7/+4
| | | | | | | | [-Wunused-private-field] and file has no symbols Change-Id: Ie9c9f53041711ee2ba42909fb88e0b9a8a8ebac9 Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Don't use QObject::tr().kh12014-06-241-79/+103
| | | | | Change-Id: Icefbff9851a4e096a4b800adea7d17db756abe99 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Split out the file IO stuff and adjust other files respectively.kh12014-06-241-23/+24
| | | | | | | | | 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>
* Replace auto_ptrKai Koehne2014-06-191-12/+12
| | | | | | | | auto_ptr is deprecated in C++11. Use QScopedPointer instead. Change-Id: I63fd4de0a6edb329046ed9433e295407d95a9f95 Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Implementation of time and date functions related to 7z.Niels Weber2013-05-301-10/+2
| | | | | | Change-Id: Icb706d829f8470d8cc3cc50925c99255cf5f2b26 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* disable getFileTimeFromProperty on Unix systemsTim Jenssen2013-05-221-0/+4
| | | | | | | - it is not working correctly at the moment and will be fixed later Change-Id: I0527410f09fbdff33e6851558482bf329ba80de6 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Remove local filetime.Niels Weber2013-05-071-2/+6
| | | | | | | | | | | | This leads to time being wrong by a couple of hours depending on usage of local time vs UTC. This has been deemed acceptable for now. Also skip the test failing because of that difference. Needs to be re-enabled when all time functionality has been rewritten. Change-Id: I23d78371df65878d16e0e428c9fca9387e29a908 Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Add 7z facade auto test and fix bug in out stream.kh12013-05-061-16/+17
| | | | | | Change-Id: Idd046e09da0ee0fe49eb305296181f969b42e393 Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Rename and document functions to be more clear what they do.kh12013-05-061-5/+6
| | | | | | Change-Id: Ic31df64c4eff8aa19b58d4dcd26b7f99c9e90d3c Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Add missing copyright header.kh12013-05-031-0/+40
| | | | | Change-Id: If8c39cd519ca1103b2643f262cea14dcc2866887 Reviewed-by: Niels Weber <niels.weber@digia.com>
* reformat initialize list of classesTim Jenssen2013-04-241-12/+12
| | | | | Change-Id: I4107c571497a98b962716bd7915c29fb50d70108 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Merge remote-tracking branch 'origin/1.3'Tim Jenssen2013-04-231-58/+178
|\ | | | | | | | | | | | | Conflicts: src/libs/installer/lib7z_facade.h Change-Id: I045ca5e4a2a76e5e651bbedc613f086bd60d563d
| * fix error handling in 7z libTim Jenssen2013-04-191-58/+177
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - remove an already existing symlink at extraction, because it uses QFile to get the io device and that would be the symlink target which was wrong. - try to get better 7z error output - an error would be now: "There was a problem while performing the operation: Error while extracting 'C:\Qt\qtcreator-2.7.0_test.7z': Cannot open file: D:/test/qtcreator-2.7.0_test/bin/sqldrivers/qsqlite4.dll (Access is denied.)" - move setPermissions to the end so read only files are getting the right timestamp Change-Id: I8881144660296618d443568e6974bf2721328991 Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* | Get rid of some superfluous includes.kh12013-03-041-5/+5
|/ | | | | | Change-Id: Id2d6252d8e7be5bcd2bcf82962d293e8de7e2563 Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Make IFW compile with mingw.kh12013-01-291-1/+1
| | | | | Change-Id: I0336e02ef701a2bc392bd385d1822bc51cee0c5c Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Fix unexpected symlink link, triggered thru broken 7z code.kh12013-01-241-0/+7
| | | | | Change-Id: I6bb996d2b44b208137d5c1d1d558b42fb9cf7b43 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Fix some warnings in our code after Idcfec77.kh12013-01-231-2/+7
| | | | | | Change-Id: Ied8ffad416ae058a45fa2d46f8ff304ff5b4a392 Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Remove some superfluous include and source files.kh12013-01-231-32/+4
| | | | | Change-Id: I5f4d83efd6195bb6e139de49c1a17d0c61907dbf Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Preserve timestamps while packaging. Extract them if available.kh12013-01-221-21/+75
| | | | | | | | | | Manual archiving needs -mtc=on -mta=on as command line arguments. Task-number: QTIFW-146 Task-number: QTIFW-174 Change-Id: I13c9c64fd31794f98b975d7235b5d43a2f866d59 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* remove unreadable throwIfNotOK methodkh12012-06-131-28/+35
| | | | | Change-Id: I5ae011a1151886fbf04eecb9ad202d5e0fd78ab0 Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
* Fix create archive with files only. See code comment.kh12012-06-131-4/+6
| | | | | Change-Id: Iba14d0a895cebd2a212221309dfbcd521db3e75e Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
* remove the limitation that archivegen could handle directories onlyTim Jenssen2012-05-141-14/+13
| | | | | Change-Id: I5e7b6740d6df1b858cee091a1174e8fd64e477a7 Reviewed-by: Niels Weber <niels.2.weber@nokia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-09 16:45:43 +0000