[pitivi] Get rid of the Makefile
- From: Alexandru Băluț <alexbalut src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pitivi] Get rid of the Makefile
- Date: Sun, 13 Aug 2017 17:29:57 +0000 (UTC)
commit 05b3aee5ffded84d2c7d4a7f9e2dca4eda8942ef
Author: Alexandru Băluț <alexandru balut gmail com>
Date: Fri Aug 11 02:03:37 2017 +0200
Get rid of the Makefile
Reviewed-by: Thibault Saunier <tsaunier gnome org>
Differential Revision: https://phabricator.freedesktop.org/D1826
build/flatpak/pitivi-flatpak | 18 +++++---
configure | 95 ------------------------------------------
docs/release.md | 3 +-
3 files changed, 12 insertions(+), 104 deletions(-)
---
diff --git a/build/flatpak/pitivi-flatpak b/build/flatpak/pitivi-flatpak
index bffb7ae..f1c34d7 100755
--- a/build/flatpak/pitivi-flatpak
+++ b/build/flatpak/pitivi-flatpak
@@ -227,7 +227,7 @@ class FlatpakRepos(FlatpakObject):
for name, tmprepo in self.repos.items():
if repo.url == tmprepo.url:
return tmprepo
- elif repo.name == name:
+ if repo.name == name:
same_name = tmprepo
if same_name:
@@ -446,7 +446,7 @@ class PitiviFlatpak: # pylint: disable=too-many-instance-attributes
self.update_all()
if self.devel:
- self.setup_dev_env()
+ self.setup_sandbox()
if self.check:
self.run_in_sandbox("gst-validate-launcher",
@@ -464,7 +464,7 @@ class PitiviFlatpak: # pylint: disable=too-many-instance-attributes
def update_bundle(self):
if not os.path.exists(self.prefix):
- self.setup_dev_env()
+ self.setup_sandbox()
if not os.path.exists(self.repodir):
os.mkdir(self.repodir)
@@ -501,7 +501,8 @@ class PitiviFlatpak: # pylint: disable=too-many-instance-attributes
except subprocess.CalledProcessError:
self.exit(1)
- def setup_dev_env(self):
+ def setup_sandbox(self):
+ """Creates the sandbox."""
if not os.path.exists(self.prefix) or self.update:
self.install_all()
Console.message("Building Pitivi %s and dependencies in %s",
@@ -526,10 +527,13 @@ class PitiviFlatpak: # pylint: disable=too-many-instance-attributes
self.exit(1)
subprocess.check_call(builder_args, cwd=self.scriptdir)
- configure_args = ["./configure", "--prefix=/app", "--libdir=lib"]
- self.run_in_sandbox(*configure_args, exit_on_failure=True,
+ meson_args = ["meson", "mesonbuild/", "--prefix=/app",
+ "--libdir=lib", "-Ddisable_gtkdoc=true",
+ "-Ddisable_doc=true"]
+ self.run_in_sandbox(*meson_args, exit_on_failure=True,
cwd=self.topdir)
- self.run_in_sandbox("make", exit_on_failure=True,
+ ninja_args = ["ninja", "-C", "mesonbuild/"]
+ self.run_in_sandbox(*ninja_args, exit_on_failure=True,
cwd=self.topdir)
else:
Console.message("Using Pitivi prefix in %s", self.prefix)
diff --git a/docs/release.md b/docs/release.md
index be0c81d..1674141 100644
--- a/docs/release.md
+++ b/docs/release.md
@@ -25,7 +25,6 @@ Most of the steps below should be done in the [development environment](HACKING.
3. Check your local repository:
* Make sure your sandbox is using the latest GStreamer release: `$ ptvenv --update
--gst-version=<gst-version>`
* Check `$ git status` does not show any change
- * Check `$ ptvenv ./configure` is all green
4. Make sure the tests pass:
```
@@ -57,7 +56,7 @@ If there are new maintainers.
$ cd /tmp
$ asp checkout pitivi
$ cd /tmp/pitivi/repos/community-x86_64/
- $ rm -rf .git # Without this, ./configure is confused re version number.
+ $ rm -rf .git # Required to get the version number correctly.
$ cp .../pitivi-X.YY.Z.tar.gz .
$ vim PKGBUILD
... Update "pkgver",
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]