Commit Graph

475 Commits

Author SHA1 Message Date
probonopd f6664faaf9 Update shared.cpp 2017-05-20 14:58:51 +02:00
Martin Höher a3a6376573 Allow the qmake executable to be passed on CLI
This change adds a new command line option `qmake` to the tool which
allows the user to specify the qmake executable to be used. By default,
if that option is omitted, the behavior is unchanged (i.e. the tool first
searches for the `qmake` executable and - if this is not successful -
then for either `qmake-qt5` or `qmake-qt4`. If the new option is used,
no search takes place and instead the executable provided is used as-is.

This implements a part of the functionality as discussed in issue #94.
2017-05-17 21:30:22 +02:00
probonopd d199bb95b2 Update BUILDING.md
[ci skip]
2017-05-07 18:39:28 +02:00
probonopd bb39214b0c Update BUILDING.md
[ci skip]
2017-05-07 18:38:20 +02:00
probonopd 6dd15c61b7 Update tests-ci.sh 2017-05-07 14:20:13 +02:00
probonopd 84f063dc80 For now skip the tests, since we are getting an unexplainable segfault 2017-05-07 13:04:27 +02:00
probonopd 29b51782c6 Do not nest an AppImage inside the AppImage to facilitate --appimage-extract
Closes #107
2017-05-07 12:40:03 +02:00
probonopd cc66407204 Update tests-environment.sh
[ci skip]
2017-05-07 12:37:55 +02:00
probonopd 4ec6a18986 labpowerqt
[ci skip]
2017-05-03 23:54:34 +02:00
probonopd 18e4e38540 Update README.md 2017-04-22 21:02:43 +02:00
probonopd 5f2d450c50 Update README.md
[ci skip]
2017-04-07 00:06:39 +02:00
probonopd ea673893db Stop on ldd not found errors; use qmake-qt5 if needed
Closes #101
2017-04-06 22:12:08 +02:00
probonopd 3848993c42 sudo not needed for local make install?
[ci skip]
2017-04-06 08:13:00 +02:00
probonopd 5fe2c8abd4 No need to be root when installing locally?
[ci skip]
2017-04-06 08:11:59 +02:00
probonopd bace185665 See whether this makes any difference for setting the rpath of plugins 2017-04-03 21:13:18 +02:00
probonopd 7904b3ce19 trigger rebuild 2017-04-03 20:37:04 +02:00
probonopd b71bd4d587 Deploy libraries in QML imports 2017-04-03 18:23:07 +02:00
probonopd 57799ed9d3 glabels-qt
[ci skip]
2017-04-03 07:26:51 +02:00
probonopd 67774737a8 Update README.md
[ci skip]
2017-04-02 17:24:29 +02:00
probonopd d4862201da DESTDIR
[ci skip]
2017-04-02 17:18:17 +02:00
probonopd 4d5b4690f2 Update README.md
[ci skip]
2017-04-02 15:27:21 +02:00
probonopd 8f87719a32 Revert move, not sure if it makes a difference 2017-04-02 14:56:30 +02:00
probonopd e00472f2d8 Update README.md
[ci skip]
2017-04-02 14:19:30 +02:00
probonopd 5f3b45bb2a Update README.md 2017-04-02 10:18:26 +02:00
probonopd 6e8bdab10f Only copy to .DirIcon if it does not exist yet 2017-03-28 07:32:14 +02:00
probonopd 038ea01bdc Add NeoTheFox/RepRaptor
[ci skip]
2017-03-27 19:55:51 +02:00
probonopd 8e95f095dc Remove non-working code 2017-03-27 18:41:11 +02:00
probonopd 6926e89d15 Workaround for OBS builds 2017-03-27 18:01:53 +02:00
probonopd 2897666c50 Add verbosity concerning non-properly deployed libs 2017-03-26 22:33:25 +02:00
probonopd 60725dec9a Fix string patching 2017-03-26 21:16:29 +02:00
probonopd 8acc1cb3d9 Patch hardcoded paths for Arch Linux Qt
Partially addresses https://github.com/probonopd/linuxdeployqt/issues/98
2017-03-26 20:38:32 +02:00
probonopd a8515d1bda Patch all qt_* strings in libQt5Core.so that exist (#97)
Closes https://github.com/probonopd/linuxdeployqt/issues/79
2017-03-26 16:59:38 +02:00
probonopd edf48fd228 https://github.com/electronpass/electronpass-desktop
[ci skip]
2017-03-26 13:00:02 +00:00
probonopd c8fb47f246 Add lirios/browser
[ci skip]
2017-03-21 23:57:36 +01:00
probonopd d9423640f7 Add FeedTheMonkey
[ci skip]
2017-03-21 22:57:23 +01:00
probonopd af8d32bb8f Also exclude libnssutil3.so
As per https://github.com/lirios/browser/issues/44#issuecomment-287635212
2017-03-19 19:13:09 +01:00
Àlex Fiestas 4c33c5ed97 Make running the tests like in travis-ci easier (#92)
* Move testing logic from travis.yml to tests-ci.sh script

This way we can share this logic between travis CI and other systems
like for example a docker container.

* Move logic to create a testing environment to tests-environment.sh

As with the logic to execute the tests, this way we can share this logic
with other systems to tests linuxdeployqt.

* Install Qt also in tests-environment.sh

No reason to keep it separate from the rest as far as I know

* Wait until the X server is up and running

Otherwise we get into a racy situation.

* Add Dockerfile to create a testing container

This container tries to emulate the environment we have in travis-ci,
this way we can test whatever is failing on the CI locally.
2017-03-17 18:45:30 +01:00
probonopd 585f487180 Merge pull request #91 from afiestas/master
Remove or replace all uses of qmlImportsPath by qtToBeBundledInfo and exclude /usr/local from distro shipped Qt
2017-03-17 17:50:58 +01:00
Àlex Fiestas 0fea9e03d2 Fix a typo in "QT_INSTALL_QML" key usage (removing extra space)
The key with a space at the end does not seem to exists neither in my
testing environment (container reproducing current travis.yml file) nor
on my main system.
2017-03-17 17:41:28 +01:00
Àlex Fiestas a1a4923ba3 Exclude /usr/local from being detected as "Distribution Qt"
/usr/local is the canonical place to put self built applications and
libraries so it should be exlucded from the logic to detect distribution
shipped Qt.
2017-03-16 12:04:09 +01:00
Àlex Fiestas ac9e9db2d0 Remove or replace all uses of qmlImportsPath by qtToBeBundledInfo
It seems that the removal of qmlImportsPath was half-done and there were
still some uses of it around.
2017-03-16 11:56:08 +01:00
probonopd fc571daf7b Always use qtToBeBundledInfo.value("QT_INSTALL_QML ") 2017-03-12 18:38:17 +01:00
probonopd 1d265dc78a Add UEFITool
[ci skip]
2017-03-09 19:00:01 +01:00
probonopd c21b17174d it2.fileInfo().isFile() 2017-03-07 00:44:28 +01:00
probonopd 12f43f60d1 Check isFile in order not to find usr/share/appname
https://travis-ci.org/probonopd/QOwnNotes/builds/208396925
2017-03-07 00:29:41 +01:00
probonopd 9359693d9f Do not exit because this could be a script that patchelf can't work on 2017-03-02 21:21:20 +01:00
probonopd b3072213a3 Merge pull request #86 from uwehermann/compiler_warnings
Fix two compiler warnings.
2017-03-02 08:00:47 +01:00
Uwe Hermann a6e35bc727 Fix two compiler warnings.
../shared/shared.cpp: In function ‘LibraryInfo parseLddLibraryLine(const QString&, const QString&, const QSet<QString>&)’:
../shared/shared.cpp:220:102: warning: unused parameter ‘rpaths’ [-Wunused-parameter]
 LibraryInfo parseLddLibraryLine(const QString &line, const QString &appDirPath, const QSet<QString> &rpaths)
                                                                                                      ^~~~~~
../shared/shared.cpp: In function ‘void stripAppBinary(const QString&)’:
../shared/shared.cpp:681:36: warning: unused parameter ‘bundlePath’ [-Wunused-parameter]
 void stripAppBinary(const QString &bundlePath)
                                    ^~~~~~~~~~
2017-03-01 19:48:11 +01:00
probonopd 3a18286bb0 Merge pull request #85 from uwehermann/typos
README.md: Fix two typos.
2017-03-01 17:49:34 +01:00
Uwe Hermann acda87b929 README.md: Fix two typos. 2017-03-01 12:47:43 +01:00