From e00df90b4110ac563524332700295ec3122087bf Mon Sep 17 00:00:00 2001 From: Nico Alt <nicoalt@posteo.org> Date: Sat, 14 Dec 2019 22:19:34 +0100 Subject: [PATCH] Modify remaining Briar GTK code for briar-wrapper Because the two independent Briar projects briar_repl and Briar GTK combine forces, the api wrapper part that used to be part of Briar GTK now becomes a new project on its own: python-briar-wrapper. With this commit, everything remaining from Briar GTK gets modified to match python-briar-wrapper's needs. --- .gitignore | 2 -- .gitlab-ci.yml | 2 +- README.md | 42 ++++-------------------------------------- meson.build | 8 +------- src/meson.build | 10 ---------- 5 files changed, 6 insertions(+), 58 deletions(-) diff --git a/.gitignore b/.gitignore index 9cb596a..7a7e68f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,2 @@ -builddir .coverage -.flatpak-builder __pycache__ diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8438300..c4fd66b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,7 +5,7 @@ image: debian:buster before_script: - - apt update && apt install --no-install-recommends -y gir1.2-gtk-3.0 python3-gi python3-pip python3-setuptools + - apt update && apt install --no-install-recommends -y python3-pip python3-setuptools - pip3 install -r requirements-dev.txt stages: diff --git a/README.md b/README.md index 70d5e58..215076d 100644 --- a/README.md +++ b/README.md @@ -1,51 +1,17 @@ -# Briar GTK +# Briar Wrapper -[](https://code.briarproject.org/NicoAlt/briar-gtk/commits/master) -[](https://code.briarproject.org/NicoAlt/briar-gtk/commits/master) +[](https://code.briarproject.org/briar/python-briar-wrapper/commits/master) +[](https://code.briarproject.org/briar/python-briar-wrapper/commits/master) -_Warning: This is still in a very early state and should be considered as prototype._ - -A simple GTK app for [Briar](https://briar.app), built with Python and GNOME Builder. +A wrapper library for Briar to run on Python platforms. It uses the [Briar REST API](https://code.briarproject.org/briar/briar/blob/master/briar-headless/README.md) and therefore requires Java. -## Installation - -So far, there is no official installation method and -you have to build it from source. - -## Developers - -The easiest and most convenient way is to build _briar-gtk_ using -[Builder](https://wiki.gnome.org/Apps/Builder). -In _Builder_, click "Clone Repository" at the bottom and -enter the URL to this Git project. - -You can also call this: -```bash -flatpak remote-add --user --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo -flatpak-builder builddir --install-deps-from=flathub --user --install --force-clean --ccache app.briar.gtk.json -flatpak run app.briar.gtk -``` - -Additionally, you are able to run Briar GTK without Flatpak. -For this, you have to install Java, the -[Python dependencies](requirements.txt) and -[Briar headless](https://code.briarproject.org/briar/briar/blob/master/briar-headless/README.md). -Once you've done this, change the path of the Briar headless -jar in [src/briar/gtk/define.py](src/briar/gtk/define.py), -build it with _meson_ and start Briar GTK. - ## Design Goals -* Intuitive UI, similar to Briar Android client * Main platform is GNU/Linux, but should also support (at least) Windows and macOS * Analogously, main platform is x86, but should also support (at least) arm -* Follows [GNOME Human Interface Guidelines](https://developer.gnome.org/hig/stable/) -* Adaptive to different screen sizes (desktop and mobile devices) -* Has [phone constraints](https://developer.puri.sm/Librem5/Apps/Guides/Design/Constraints.html) in mind -* Strictly separates API wrapper from GTK stuff, making former a solid base for other (commandline) clients ## FAQ diff --git a/meson.build b/meson.build index 4732c35..e8f8a28 100644 --- a/meson.build +++ b/meson.build @@ -3,15 +3,9 @@ # License-Filename: LICENSE.md project( - 'briar-gtk', + 'briar-wrapper', version: '0.1.0', meson_version: '>= 0.50.0', ) -i18n = import('i18n') - -subdir('data') subdir('src') -subdir('po') - -meson.add_install_script('src/meson_post_install.py') diff --git a/src/meson.build b/src/meson.build index 744ca3a..a85b92f 100644 --- a/src/meson.build +++ b/src/meson.build @@ -10,16 +10,6 @@ python3 = import('python3') conf = configuration_data() conf.set('PYTHON', python3.find_python().path()) conf.set('VERSION', meson.project_version()) -conf.set('LOCALE_DIR', join_paths(get_option('prefix'), get_option('localedir'))) conf.set('PACKAGE_DATA_DIR', PACKAGE_DATA_DIR) -configure_file( - input: 'briar-gtk.in', - output: 'briar-gtk', - configuration: conf, - install: true, - install_dir: get_option('bindir') -) - install_subdir('briar/api', install_dir: MODULE_DIR) -install_subdir('briar/gtk', install_dir: MODULE_DIR) -- GitLab