Commit Graph

279 Commits

Author SHA1 Message Date
TheAssassin
de363bc90b Merge branch 'master' into apprun-hooks 2019-08-14 15:14:02 +02:00
TheAssassin
8e9114b7c5 Improve generated AppRun script 2019-08-14 14:36:06 +02:00
TheAssassin
72e4fb49e0 Don't try to move if there's no need to do so 2019-08-14 14:35:53 +02:00
TheAssassin
abdefbc0ff Use a custom variable to support test runs from IDE better
When your IDE is running as an AppImage, the $APPRUN variable is
already set in the built-in terminal. Now of course you could just
calculate the path of $APPRUN yourself and force-overwrite it in that
script; however that's more effort and more likely to break.

Therefore it's easier to just introduce and use a custom variable.
2019-08-14 14:33:25 +02:00
TheAssassin
58845cee8f Support for AppRun hooks installed by plugins, mk. 1 2019-08-14 04:13:30 +02:00
TheAssassin
5bc8840003 Mark methods const where possible 2019-08-14 04:11:36 +02:00
TheAssassin
1cb5a742db Break up deployment algorithm into independent methods
That makes maintenance easier.
2019-08-14 02:28:21 +02:00
TheAssassin
142facd986 Improve method 2019-08-14 01:35:31 +02:00
TheAssassin
aced62378a Move AppDir root deployment into separate class
Makes adding more features easier, as there's a clear defined interface
to the class and the mechanism can be split into more methods more
easily without bloating the AppDir class further.
2019-08-14 01:35:23 +02:00
TheAssassin
3fd595a63b Expose file copying helper in public interface 2019-08-14 01:33:09 +02:00
TheAssassin
9dc10fc0fc Method can be static 2019-08-14 01:08:20 +02:00
TheAssassin
3183ee2f4f Mark methods const where possible 2019-07-27 16:37:16 +02:00
TheAssassin
3d766446d9 Improve log message 2019-07-25 17:47:34 +02:00
TheAssassin
e24b46d291 Change method name to something more meaningful 2019-07-25 17:44:50 +02:00
TheAssassin
47b8370751 Method can be static 2019-07-25 17:43:45 +02:00
darealshinji
ce5aecead5 remove all comments
Otherwise the generated header contains entries like this:
``` c
    "libxcb-dri2.so.0",
    "#",
    "https://github.com/probonopd/linuxdeployqt/issues/331#issuecomment-442276277",
    "libxcb-dri3.so.0",
    "#",
    "https://github.com/AppImage/AppImages/issues/348",
```
2019-07-06 20:21:16 +02:00
Harmen Stoppels
0e95f19a75 Make deployLibrary deploy its dependencies by default, and avoid unnecessary recursion by making deployElfDependencies not deploy its deps of deps 2019-06-10 20:12:30 +02:00
Harmen Stoppels
159b082658 Remove recursion of ELF deployment since ldd already does that for us 2019-06-09 14:43:59 +02:00
TheAssassin
2a1127d7e8 Show acceptable icon sizes in error message
CC #75.
2019-05-24 23:25:03 +02:00
TheAssassin
3f81577b04 Fix missing newline in error messages 2019-05-24 22:49:19 +02:00
TheAssassin
834b467a41 Fix data printed in error message 2019-05-24 22:48:53 +02:00
TheAssassin
46ccb8965d Add missing valid resolutions (CC #75) 2019-05-24 16:19:36 +02:00
TheAssassin
77c52883f1 Remove deprecated debug code 2019-03-20 17:25:13 +01:00
TheAssassin
157861d236 Make symlinking work for older versions of ln, too 2019-03-20 17:23:14 +01:00
TheAssassin
1f498772b4 Properly handle nonexisting files 2019-02-23 18:01:47 +01:00
TheAssassin
f9fc51a832 Improve search for patchelf
CC https://github.com/linuxdeploy/linuxdeploy-plugin-qt/issues/24.
2019-02-20 13:13:34 +01:00
TheAssassin
a3e06e0024 Statically link desktopfile library 2019-02-07 00:46:59 +01:00
TheAssassin
956a253428 Return final deployment path
deployFile allows for specifying a directory as destination, and copies
files into there, simulating the behavior of tools like cp. To do that,
it creates the directory, then appends the filename of the input file
to it and uses that as destination for the "copy file" call.

It's pretty handy for some applications to get the full path of the
new file returned by this method directly (doesn't have to implement
this concatenation more than once).
2019-02-06 23:23:48 +01:00
TheAssassin
ce6597fb9d Better handle debug-symbols-only ELF files 2019-01-29 01:00:36 +01:00
TheAssassin
8df605cb19 Use shared pointer to manage PImpl object 2019-01-29 00:02:49 +01:00
TheAssassin
7c8ab1c773 Fix desktop file deployment 2018-12-22 23:26:28 +01:00
TheAssassin
5374e7ece9 Switch to extracted desktop file library 2018-12-22 23:09:04 +01:00
TheAssassin
78f33a7190 Move linuxdeploy-specific helper out of desktop file class 2018-12-22 23:02:15 +01:00
TheAssassin
cddefc3806 Validate some constraints on localized keys 2018-12-06 12:09:18 +01:00
TheAssassin
1f5315926d Increase readability 2018-12-06 12:08:51 +01:00
TheAssassin
a12f3ac0fe Improve error message 2018-12-06 11:56:21 +01:00
TheAssassin
640b756a7f Temporarily allow localization brackets in key names
Must be revised when introducing proper localization support.
2018-12-06 11:49:14 +01:00
TheAssassin
ef90b09c79 Fix remaining issues with usage of assert 2018-11-23 20:52:54 +01:00
TheAssassin
ce097235f2 Note for self: -O1+ strips out expressions surrounded by assert() 2018-11-23 18:05:56 +01:00
TheAssassin
b974f44ffd Debug desktop file unit tests, mk.1
They're only broken on non-debug builds, so it's quite likely the
optimizations break the code.
2018-11-21 00:03:20 +01:00
TheAssassin
ccfd05b5e0 Improve DesktopFile's comparison operators 2018-11-19 22:12:14 +01:00
TheAssassin
6cf9bc55a7 Fix comparison editor 2018-11-19 22:06:29 +01:00
TheAssassin
1e3e074f35 Properly copy desktop file reader 2018-11-19 22:06:08 +01:00
TheAssassin
7b16864dbe Add missing return statement 2018-11-19 21:51:26 +01:00
TheAssassin
0b5ab2fc36 Fix return type of setter 2018-11-19 21:51:26 +01:00
TheAssassin
132931772c Fix directory check 2018-11-19 20:52:45 +01:00
TheAssassin
6f7a2fd54a Reduce verbosity of debug logging related to plugin detection 2018-11-19 20:50:09 +01:00
TheAssassin
c4258759b4 Make sure directories aren't falsely recognized as plugins 2018-11-19 20:48:04 +01:00
TheAssassin
92a1370b30 Be able to use EXPECT_EQ with DesktopFile objects
GoogleTest internally uses operator==(first, second) instead of
first.operator==(second). By implementing the operators outside the
classes, GoogleTest can be made happy.
2018-11-15 23:36:04 +01:00
TheAssassin
6a951558ce Use assert to check for impossible scenarios 2018-11-15 21:23:43 +01:00