Commit Graph

157 Commits

Author SHA1 Message Date
Alexander Larsson
d950ed338f Merge pull request #65 from matthiasclasen/builder-messages
Add another status message to flatpak-builder
2016-06-02 09:12:08 +02:00
Alexander Larsson
4805d49bdf Merge pull request #37 from matthiasclasen/command-check
flatpak-builder: Ensure after build that the binary listed in "command" is installed
2016-06-02 08:58:30 +02:00
matthiasclasen
5e2be3cb10 builder: Some consistency fixes for output (#64)
* builder: Some consistency fixes for output

Capitalize all error messages.
2016-06-02 08:50:58 +02:00
Matthias Clasen
7794a70f50 builder: Check that command exists after build
This keeps us from creating a non-working flatpak.
2016-06-01 23:31:57 -04:00
Matthias Clasen
c7594e5515 Add another status message to flatpak-builder
Add a message for the 'rewriting the desktop file' step.
This helps in providing context for error messages when something
goes wrong.
2016-06-01 16:21:25 -04:00
Alexander Larsson
c7c9505e90 Always initialize autofree variable 2016-05-27 09:19:45 +02:00
Alexander Larsson
8362d9cafe Merge pull request #36 from matthiasclasen/module-errors
flatpak-builder: Print name of failed module on error
2016-05-27 09:02:44 +02:00
Alexander Larsson
f9cbcc3996 Merge pull request #49 from jsoref/spelling
spelling fixes
2016-05-27 09:02:14 +02:00
Josh Soref
37409c4095 spelling: sections 2016-05-27 06:46:23 +00:00
Alexander Larsson
6b65972434 Merge pull request #47 from matthiasclasen/build-error
builder: Avoid a confusing error
2016-05-27 08:45:21 +02:00
Matthias Clasen
5f928b30ac builder: Prefix module errors
Sprinkle g_prefix_error calls in builder-module.c, to make
sure that module-specific errors get a "module foo:" prefix.
This is not quite perfect, since callers tend to impose their
own prefix as well, but at least it clearly identifies the
module in which the error ocurred.
2016-05-27 00:25:28 -04:00
Matthias Clasen
6d1d9724c5 builder: Warn about bad module names
Putting spaces or slashes in module names is a recipe for
cryptic error from one of the many constructed flatpak
commandlines. Better warn early on, as soon as we see such
a name.
2016-05-27 00:05:55 -04:00
Matthias Clasen
c89a610a91 builder: Avoid a confusing error
When the sdk is not specified in the manifest, we get a confusing
error from running flatpak info with an invalid commandline.
Avoid that by checking for the the sdk string beforehand.
2016-05-26 23:35:41 -04:00
Alexander Larsson
e9e92b79fe builder: Support argument to the command with --run
For instance, this lets you do:

  flatpak-builder app foo.json ls -l

Without flatpak-builder complaining about not knowing "-l".
2016-05-26 12:44:51 +02:00
Alexander Larsson
33c0d49212 builder: Support permission ops with --run 2016-05-26 12:24:43 +02:00
Alexander Larsson
f6b4e8ead6 builder: Make the options and help output for --run a bit nicer
We now pre-process for the --run argument in order to only show
related arguments.
2016-05-26 11:20:23 +02:00
Stephan Bergmann
3b6b0da108 exec* returns -1 on error
...so use the == -1 idiom as already used in common/flatpak-run.c
(another fix would be to drop the if completely, as exec* doesn't
return on success)
2016-05-24 17:44:33 +02:00
Simon McVittie
a4641280a7 Fix various spelling mistakes
Mostly detected by Debian's Lintian tool.

Signed-off-by: Simon McVittie <smcv@debian.org>
2016-05-17 11:43:32 +01:00
Alexander Larsson
9d6bc99649 builder: Untar with --no-same-owner
Without this if you run as root (which is generally a poor idea) it will
extract the sources with the user/group specified on the archive, which
is never what you want when building code.
2016-05-12 19:35:32 +02:00
Alexander Larsson
28c1c65d8f Builder: Support disabled=true to not build a module
This is a simple way to "comment out" a module.
2016-05-09 17:24:42 +02:00
Alexander Larsson
8abbc0186e Rename everything but the on-disk location to flatpak 2016-05-09 11:11:55 +02:00
Alexander Larsson
ba37b22d78 Rename library to libflatpak 2016-05-09 09:46:26 +02:00
Alexander Larsson
c24528d369 Rename source files to flatpak 2016-05-09 09:00:20 +02:00
Alexander Larsson
6a613d1fab Rename all non-autogenerated symbols to flatpak 2016-05-09 09:00:20 +02:00
Alexander Larsson
1ffdf27d92 uncruftify: Initial run, all non-problematic changes 2016-05-06 16:03:27 +02:00
Alexander Larsson
098e3e426d build: Look for files in the same dir as the manifest, not in the CWD
This makes more sense, the CWD is not necessary a useful place.
2016-05-04 08:47:38 +02:00
Tristan Van Berkom
51e387159b build-export: Add --arch option
This patch adds the --arch option to the build-export builtin command.

Previously build-export derives this from the metadata and then falls back
to xdg_app_get_arch(), except that this does not work when the metadata does
not specify an arch (such as with extensions like .Debug or .Locale).

https://bugs.freedesktop.org/show_bug.cgi?id=95226
2016-05-03 09:05:56 +02:00
Tristan Van Berkom
aa69c1afef xdg-app-builder: Add --arch command line option
This is only useful for building for architectures which are
compatible with the build host, e.g. building i686 binaries on
an x86_64 build host.
2016-05-02 08:46:52 +02:00
Tristan Van Berkom
bc7bfeef6f BuilderSourceFile: Delete destination file
Sometimes you want to replace an existing file, like a config.sub,
and sometimes that existing config.sub does not have the writable
bits set. Just delete the file if we intend to replace it anyway.
2016-04-27 14:15:05 +02:00
Alexander Larsson
9171c94662 builder: Fix unused return value warnings
This just adds a (void) cast to avoid the warnings.
2016-04-21 09:49:24 +02:00
Alexander Larsson
af03d2f5b4 Remove unused local variables reported by clang 2016-04-21 09:48:56 +02:00
Joaquim Rocha
f112d117da builder: Do not repeat the separate locales path
These changes replace all occurrences of 'share/runtime/locale' with a
define so it will avoid possible mistakes when having to be replaced
one day.
2016-04-20 12:32:02 +02:00
Joaquim Rocha
39279c8b8b builder: Skip separate locales exportation if directory doesn't exist
This will avoid errors when separate_locales is set to true but the
locales directory does not exist. This is the case of many apps that do
not support separate locales but haven't specifically set
separate_locales to false in the configuration.
2016-04-20 12:32:02 +02:00
Alexander Larsson
265ba5e528 Merge pull request #128 from matthiasclasen/run-fixes
Some fixes for xdg-app-builder --run
2016-04-15 11:50:34 +02:00
Tristan Van Berkom
401c7b2dea BuilderModule: Use builder_options_get_config_opts()
The configure arguments are now a combination of the
default config-opts plus the accumulative sum of the config-opts
specified in the build-options that are active for a given build
context.

https://bugs.freedesktop.org/show_bug.cgi?id=94940
2016-04-15 10:25:55 +02:00
Tristan Van Berkom
17ec9ef3b0 BuilderOptions: Added 'config-opts' option.
Allows conditional configure arguments.

https://bugs.freedesktop.org/show_bug.cgi?id=94940
2016-04-15 10:25:55 +02:00
Matthias Clasen
9426438c0b Fix --run
I have a manifest which has --command=terminix in the finish-args,
and xdg-app build doesn't like that option, so filter it out.
2016-04-14 19:11:48 -04:00
Alexander Larsson
416ad53878 Fix typo for no-debuginfo properly 2016-04-14 19:28:08 +02:00
Matthias Clasen
838d109e58 builder: Add an option to erase app dir
Having to run rm -rf yourself before every new build attempt
gets old. Lets add an option to have xdg-app-builder do it
for us.
2016-04-13 23:06:59 -04:00
Alexander Larsson
d52cb3b378 builder: better error messages if failing to find desktop file 2016-04-11 11:20:45 +02:00
Alexander Larsson
545a699698 builder: Only create one locale extension
Given that each app can have 100 locates, ostree just doesn't scale
to having a branch per app/locale combo. For 100 apps and 100 locales
that would be 10000 branches.

Also, things like xdg-app remote-list doesn't properly handle that
either.

We need to handle this by e.g. supporting subsetting the pull of
the locale extension.
2016-04-07 13:02:36 +02:00
Alexander Larsson
7e6b18eddc builder: Actually respect the defined branch 2016-03-23 16:42:40 +01:00
Alexander Larsson
d32b13a695 builder: Checksum metadata-platform contents for cache too 2016-03-23 14:54:47 +01:00
Alexander Larsson
d6f9e03a61 builder: Use the right field for the platform cache checksum
It was looking at metadata, instead of metadata_platform
2016-03-23 14:49:59 +01:00
Alexander Larsson
b3f9da3648 builder: Build single every-locale extension
This is useful for testing, as well as makes building derived runtimes
easier.
2016-03-21 16:37:51 +01:00
Alexander Larsson
08959b4373 xdg-app-builder: Don't export if --build-only specified 2016-03-17 20:55:55 +01:00
Alexander Larsson
728e7a89e1 xdg-app-buildeR: Remove unnecessary spew 2016-03-14 11:57:06 +01:00
Alexander Larsson
6c5e1a8a92 Fix some compiler warning (unused vars) 2016-02-25 16:09:49 +01:00
Alexander Larsson
467e8bf4db builder: Add sources referenced from debuginfo into Debug runtime 2016-02-23 14:13:36 +01:00
Alexander Larsson
90aaed7f7b builder: Build runtimes in /run/build-runtime
This way we the runtime build dir doesn't conflict with the app dir.
Which is good if we want debuginfo with sources for both.
2016-02-23 14:12:20 +01:00