Merge branch 'mainline' of https://github.com/GNOME/meld

Author: Youssef Abou-Kewik

.gitlab-ci.yml

@@ -1,45 +1,49 @@
+include: 'https://gitlab.gnome.org/GNOME/citemplates/raw/master/flatpak/flatpak_ci_initiative.yml'
+
 image: registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master
 
 stages:
   - check
+  - test
   - build
+  - deploy
 
 variables:
-  DEPENDENCIES: python3
-                python3-pip
-                python3-pytest
-                python3-gobject
-                gobject-introspection
-                gtk3
-                gtksourceview4
-                intltool
-                glib2-devel
+    BUNDLE: "meld-dev.flatpak"
 
-.linux-common: &linux-common
-  before_script:
-    - dnf update -y
-    - dnf install -y $DEPENDENCIES
+flatpak:
+    extends: .flatpak
+    stage: build
+    variables:
+        MANIFEST_PATH: "data/org.gnome.MeldDevel.json"
+        MESON_ARGS: "-Dprofile=Devel"
+        FLATPAK_MODULE: "meld"
+        RUNTIME_REPO: "https://nightly.gnome.org/gnome-nightly.flatpakrepo"
+        APP_ID: "org.gnome.MeldDevel"
 
-lint:
-  stage: check
-  script:
-    - dnf install -y git
-    - pip3 install -r dev-requirements.txt
-    - pre-commit run --all-files --show-diff-on-failure
+nightly:
+  extends: '.publish_nightly'
+  dependencies:
+    - 'flatpak'
 
-linux-pytest:
+.pythonchecks:
   stage: check
+  tags: # test in the same org.gnome.Sdk environment that is used for creating flatpaks
+    - flatpak
   script:
-    - py.test-3 test/
-  <<: *linux-common
+    - flatpak run --share=network --filesystem=`pwd` --env=PATH=$PATH:/var/data/python/bin --command=sh org.gnome.Sdk -c 'pip3 install --user -r dev-requirements.txt; $PYTHON_CHECK_COMMAND'
 
-linux-build:
-  stage: build
-  script:
-    - python3 setup.py build
-  <<: *linux-common
+lint:
+  extends: .pythonchecks
+  variables:
+      PYTHON_CHECK_COMMAND: "pre-commit run --all-files --show-diff-on-failure"
+
+pytest:
+  extends: .pythonchecks
+  variables:
+      PYTHON_CHECK_COMMAND: "pytest"
 
-.mingw-common: &mingw-common
+.mingw-common:
   stage: build
   tags: # select gitlab runners with specific tag (unrelated to git repo tags)
     - win32
@@ -58,13 +62,13 @@ linux-build:
   allow_failure: true
 
 mingw64-dist:
+  extends: .mingw-common
   variables:
     MSYS2_ARCH: x86_64
     MSYSTEM: MINGW64
-  <<: *mingw-common
 
 mingw32-dist:
+  extends: .mingw-common
   variables:
     MSYS2_ARCH: i686
     MSYSTEM: "MINGW32"
-  <<: *mingw-common

MANIFEST.in

@@ -5,12 +5,11 @@ recursive-include data/icons/hicolor/symbolic *.svg
 
 recursive-include help *.page *.xml *.po
 
-recursive-include meld/resources README *.ui *.xml *.png
+recursive-include meld/resources README *.ui *.xml *.png *.css
 
 include MANIFEST.in
 include meld.doap
 include data/org.gnome.meld.appdata.xml.in
-include data/meld.css
 include data/org.gnome.meld.desktop.in
 include data/mime/org.gnome.meld.xml.in
 include data/org.gnome.meld.gschema.xml

README.md

@@ -23,7 +23,7 @@ Requirements
 
 And following packages with GObject introspection:
 
-* GLib 2.36 (meld install also needs GLib binaries like glib-compile-schemas)
+* GLib 2.36
 * Pango
 * PangoCairo
 * GTK+ 3.20
@@ -33,77 +33,61 @@ And following packages with GObject introspection:
 Build requirements
 ------------------
 
-System packages:
-
-* intltool
-* itstool
-* xmllint
-
-Python packages:
-
-* distro
+* Python 3.6
+* Meson 0.48
+* Ninja
+* gettext
+* GLib 2.36 and its development utilities such as `glib-compile-schemas`
 
-Building Windows MSIs requires:
+For Windows build requirements, see `mingw-common` section `.gitlab-ci.yml`
 
-* cx_Freeze 5
-* pywin32/pypiwin32 (optional, for storing version info in Meld.exe)
 
 Running
 -------
 
-Meld can be run directly from this source tree directory. Just type:
-
- * `bin/meld`
-
-Alternatively, you can install Meld system-wide by running:
+You *do not* need to build Meld in order to run it. Meld can be run directly
+from this source directory by running:
 
- * `python3 setup.py install`
+```sh
+$ bin/meld
+```
 
-or if you're on Ubuntu, instead try:
+Unix users should get Meld from their distribution package manager, or from
+[Flathub](https://flathub.org/).
 
- * `python3 setup.py install --prefix=/usr`
+Windows users should download the provided MSIs on the
+[Meld home page](https://meldmerge.org/).
 
-...but you should probably just get a RPM/deb/installer instead, depending on
-your system. Meld packages are available for just about every \*nix
-distribution.
-
-For Windows users, MSIs are available from the Meld home page. Also if all
-dependencies are installed manually, running from source tree is supported:
- * `python3.exe bin/meld`
-
-For OSX users, Meld can be installed on OSX using MacPorts/Fink/etc. There are
-also unofficial native builds available for older releases. See the wiki for
-details.
+OSX users can install Meld using Homebrew (or Macports, Fink, etc.), or there
+are unofficial native builds available from the
+[Meld for OSX](https://yousseb.github.io/meld/) project.
 
 
 Building
 --------
 
-Meld uses standard distutils for building. It supports anything that distutils
-supports, and little else.
-
-Additional hacks are added to make life easier for packagers where required,
-such as:
-
-* Passing `--no-update-icon-cache` will stop Meld from running
-  `gtk-update-icon-cache` post-install
-* Passing `--no-compile-schemas` will stop Meld from trying to compile
-  gsettings schemas post-install
-
-These arguments need to be passed to `setup.py` itself, *not* to the install
-command. In other words, do this:
+Meld uses [meson](https://mesonbuild.com/) build system. Use the following
+commands to build Meld from the source directory:
 
-    python3 setup.py --no-compile-schemas install
+```sh
+$ meson _build
+$ cd _build
+$ ninja
+```
 
-**not** this:
+You can then install Meld system-wide by running:
 
-    python3 setup.py install --no-compile-schemas
+```sh
+$ ninja install
+```
 
-Windows installer can be built with command
+A Windows installer can be built with command
 
-    C:\Python34\python.exe setup_win32.py bdist_msi
+```powershell
+C:\Python34\python.exe setup_win32.py bdist_msi
+```
 
-that creates file `dist/Meld-VERSION-ARCH.msi`
+which will create the file `dist/Meld-VERSION-ARCH.msi`.
 
 
 Developing