[gtranslator: 2/2] Merge branch 'meson' into 'master'



commit 5b4f5a2ad28fe937de8548bb291b30e01d1e9d97
Merge: 2b0a33bb 8a7d122e
Author: Daniel Mustieles García <daniel mustieles gmail com>
Date:   Wed Sep 5 14:44:46 2018 +0000

    Merge branch 'meson' into 'master'
    
    Port to meson build system
    
    See merge request GNOME/gtranslator!4

 .gitignore                                         |   2 +
 autogen.sh                                         |  21 --
 build-aux/flatpak/org.gnome.Gtranslator.json       | 106 ++++++++++
 build-aux/meson.build                              |   1 +
 build-aux/meson/meson.build                        |   1 +
 build-aux/meson/meson_post_install.py              |  15 ++
 data/Makefile.am                                   |  38 ----
 data/desktop/Makefile.am                           |  14 --
 data/desktop/gtranslator.ico                       | Bin 9662 -> 0 bytes
 data/desktop/icons/Makefile.am                     |  40 ----
 .../hicolor/16x16/apps/org.gnome.Gtranslator.png}  | Bin
 .../hicolor/22x22/apps/org.gnome.Gtranslator.png}  | Bin
 .../hicolor/24x24/apps/org.gnome.Gtranslator.png}  | Bin
 .../hicolor/32x32/apps/org.gnome.Gtranslator.png}  | Bin
 .../hicolor/48x48/apps/org.gnome.Gtranslator.png}  | Bin
 .../apps/org.gnome.Gtranslator-symbolic.svg}       |   0
 .../scalable/apps/org.gnome.Gtranslator.svg}       |   0
 data/icons/meson.build                             |  20 ++
 .../src/gtranslator-16.svg}                        |   0
 .../src/gtranslator-22.svg}                        |   0
 .../src/gtranslator-24.svg}                        |   0
 .../src/gtranslator-32.svg}                        |   0
 .../src/gtranslator-48.svg}                        |   0
 data/meson.build                                   |  51 +++++
 ...xml.in => org.gnome.Gtranslator.appdata.xml.in} |   0
 ...desktop.in => org.gnome.Gtranslator.desktop.in} |   0
 ...xml.in => org.gnome.Gtranslator.gschema.xml.in} |   0
 data/pixmaps/Makefile.am                           |  15 --
 data/pixmaps/meson.build                           |  13 ++
 doc/reference/Makefile.am                          |  88 --------
 doc/reference/meson.build                          |  43 ++++
 meson.build                                        | 165 +++++++++++++++
 meson_options.txt                                  |   2 +
 po/meson.build                                     |   1 +
 src/Makefile.am                                    | 228 ---------------------
 src/gtr-dirs.c                                     |   8 +-
 src/gtr-language.c                                 |   4 +-
 src/meson.build                                    | 134 ++++++++++++
 src/toolbareditor/Makefile.am                      | 107 ----------
 src/toolbareditor/meson.build                      |  46 +++++
 40 files changed, 606 insertions(+), 557 deletions(-)
---


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]