[gnome-builder] build: drop with_ from with_channel in meson_options.txt
- From: Christian Hergert <chergert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-builder] build: drop with_ from with_channel in meson_options.txt
- Date: Wed, 13 Mar 2019 03:47:16 +0000 (UTC)
commit 3382a5157487b5f5d0c6a1bd46a1f23c77cf1da9
Author: Christian Hergert <chergert redhat com>
Date: Tue Mar 12 20:46:31 2019 -0700
build: drop with_ from with_channel in meson_options.txt
build-aux/flatpak/org.gnome.Builder.json | 2 +-
meson_options.txt | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/build-aux/flatpak/org.gnome.Builder.json b/build-aux/flatpak/org.gnome.Builder.json
index 3e1709ff9..648684768 100644
--- a/build-aux/flatpak/org.gnome.Builder.json
+++ b/build-aux/flatpak/org.gnome.Builder.json
@@ -560,8 +560,8 @@
"-Dpython_libprefix=python3.7",
"-Denable_tracing=true",
"-Dwith_help=true",
- "-Dwith_channel=flatpak-nightly",
"-Dwith_deviced=true"
+ "-Dchannel=flatpak-nightly",
],
"cleanup" : [
"/share/gnome-builder/gir-1.0",
diff --git a/meson_options.txt b/meson_options.txt
index 3028c49bb..57fe9301c 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -5,7 +5,7 @@ option('tcmalloc', type: 'boolean', value: false, description: 'Use tcmalloc for
option('with_safe_path', type: 'string', value: '', description: 'PATH variable to run build commands
(default: platform-specific)')
-option('with_channel',
+option('channel',
type: 'combo',
choices: [ 'other', 'flatpak-stable', 'flatpak-beta', 'flatpak-nightly' ],
description: 'The distribution channel for Builder',
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]