28 Commits

Author SHA1 Message Date
Matthieu Gautier
c0ec9c44b8 Rename option --target-platform to --config
The target_platform option has always be wrongly named.
This is not the platform we are targeted but how we compile.

This was ok at beginning as specifying how we compile somehow define
for what we compile but this is not a one to one mapping.
2024-02-05 18:03:11 +01:00
Matthieu Gautier
20ca39145d Remove backend (internal) option.
This is not used and it is a good things as it is broken..
2024-02-05 11:42:04 +01:00
Matthieu Gautier
5a1175cf2d Format our code with black 2024-02-05 11:41:09 +01:00
Matthieu Gautier
c99a9bd91f Run the command without using shell=True.
It mainly allow to run command in directory containing space.
(Hello, `C:\Program Files\...`)
It would also allow to work on directory containning spaces
(`C:\Users\John Doe`) but xapian configure (at least) expressly doesn't
support it :/

- Run the command without shell=True
- The command must be a list instead of a string.
- All options must also be a list (or an iterable).
2023-12-01 11:11:24 +01:00
Matthieu Gautier
8b9b74d577 Better flatpak command options.
This mainly add the option `--nointeractive` when installing the sdk.
2022-03-10 16:21:14 +01:00
Matthieu Gautier
afd17b2986 Make kiwix-desktop flatpak use last version of Qt (5.15).
Adapt flatpack_builder to generate the same manifest than PR
flathub/org.kiwix.desktop#6
2021-06-23 17:59:25 +02:00
Matthieu Gautier
99226e0c6a Build zstd in flatpak.
Revert 10c767e8ce933f3fe3d26ed9188cd517c79d8808
2020-04-20 15:14:31 +02:00
Matthieu Gautier
10c767e8ce Do not compile zstd on flatpak.
The meson.build file of meson is not in the main directory.
We have to update kiwix-build to handle this.

For now, compile flatpak without zstd.
We will need to do a new build on flatpak with zstd soon.
2020-04-08 18:09:39 +02:00
Matthieu Gautier
7b6c79482a Make the dependency responsible to set the compilation env.
Instead of having the run_command function setting the
env from the buildEnv, this is the dependency that create the
env and then pass it to the run_command function.

This way, each dependency will be able to set a specific env.
2020-02-21 16:29:23 +01:00
Matthieu Gautier
7d659baa37 Package kiwix-serve within kiwix-desktop.
Now that kiwix-desktop use kiwix-serve to serve the content, we need to
compile and package kiwix-serve (kiwix-tools).
2019-07-24 11:17:39 +02:00
luddens
f090551d13 fix unordered flatpak's manifest
dictionnaries aren't ordered with python 3.5, OrderDict() fixes that.
2019-04-09 17:03:33 +02:00
Matthieu Gautier
c61570fc08 [flatpak] Add the exact commit sha in the manifest.
As requested here
https://github.com/flathub/flathub/pull/768#discussion_r245727043

See flathub/flathub#768
2019-01-23 18:25:22 +01:00
Matthieu Gautier
50167460dc Move the version of org.kde in the versions.py file. 2019-01-23 16:04:02 +01:00
Matthieu Gautier
4160673c3a Correctly raise StopBuild in case of error when building flatpak. 2019-01-15 14:50:06 +01:00
Matthieu Gautier
c4a3da03c3 Correctly install mustache in flatpak.
We need a simple buildsystem to "build" mustache" as we simply need to
copy the header.
2019-01-15 14:44:02 +01:00
Matthieu Gautier
2980075ce0 Update flatpak_builder to new version of kiwix-desktop
- app-id is now ork.kiwix.desktop
- No need to rename the desktop-file
- `--filesystem=xdg-data` is useless.
2018-12-14 17:00:39 +01:00
Matthieu Gautier
f9610ce3b3 Move the sources at the end of the modules.
It is the usage to have `sources` attribute at the end of the module
definition in flatpak manifest. Let's follow it.
2018-12-12 11:31:50 +01:00
Matthieu Gautier
ac0685877b Do not keep "empty" modules (without sources).
`org.kde` dependency has no source. It used by kiwix-build to install the
correct sdk/platform.
2018-12-12 11:30:04 +01:00
Matthieu Gautier
abf0e639e1 The manifest file must be named as the app-id. 2018-12-12 11:28:08 +01:00
Matthieu Gautier
e11247c18a builddir is already default to True for meson. 2018-12-12 11:25:02 +01:00
Matthieu Gautier
6b5df23b03 no-autogen is already default to false.
We don't need to add it by default.
2018-12-12 11:24:40 +01:00
Matthieu Gautier
9679c01254 Run docker with all privileges. 2018-11-30 11:37:23 +01:00
Matthieu Gautier
92d637ad99 Better flatpak build.
- Print the name of the module instead of the builder.
- Do not try to build the kiwix-desktop dependencies in the flatpak.
- Correct the path of the created flatpak.
2018-11-30 11:37:23 +01:00
Matthieu Gautier
a3ce2e0126 Fix the flatpak manifest.
- Rename the .desktop file and the icons for desktop integration.
- Fix finish-args for the right permissions
- Remove curl binary, not aria2c.
2018-11-27 17:22:47 +01:00
Matthieu Gautier
a18c28b168 Build the flatpak as user, not system. 2018-11-27 17:22:47 +01:00
Matthieu Gautier
feec272d1f Use the correct key app-id instead of id. 2018-11-27 17:22:47 +01:00
Matthieu Gautier
d375cc06bc Do not try to compiled dependencies already in the org.kde.Platform. 2018-11-27 10:11:08 +01:00
birros
8d58d8d7cb First version of a flatpak builder.
This commit add a first version code to build a flatpak of kiwix-desktop.
It is mainly based on the PR #254 of @birros (hence he is the author of this commit)

However there is some differences :
- I (@mgautier) create a new builder to run the flatpak build instead of using a new
  dependency.
- Use the flatpak platform to install org.kde.Platform and org.kde.Sdk

This code version doesn't correctly work but I wanted to commit the birros' code
without too many modification (even if there is a lot).
2018-11-27 09:43:52 +01:00