[gnome-build-meta/doraskayo/core-developer-tools: 12/12] Move gnome-builder.bst to core



commit c4b5f366771f7230cc36ee6c1fe4723ce4e0822b
Author: Dor Askayo <dor askayo gmail com>
Date:   Tue Apr 14 18:22:32 2020 +0300

    Move gnome-builder.bst to core
    
    Also move its dependencies from world to core-deps:
    - jsonrpc-glib.bst
    - libgit2-glib.bst
    - libgit2.bst
    - libssh2.bst
    - libportal.bst
    - template-glib.bst

 elements/core-deps.bst                            | 6 ++++++
 elements/{world => core-deps}/jsonrpc-glib.bst    | 0
 elements/{world => core-deps}/libgit2-glib.bst    | 4 ++--
 elements/{world => core-deps}/libgit2.bst         | 2 +-
 elements/{world => core-deps}/libportal.bst       | 0
 elements/{world => core-deps}/libssh2.bst         | 0
 elements/{world => core-deps}/template-glib.bst   | 0
 elements/{world => core}/gnome-builder.bst        | 8 ++++----
 elements/core/meta-gnome-core-developer-tools.bst | 1 +
 elements/world.bst                                | 7 -------
 elements/world/gitg.bst                           | 2 +-
 11 files changed, 15 insertions(+), 15 deletions(-)
---
diff --git a/elements/core-deps.bst b/elements/core-deps.bst
index 486f7297..0d4842a7 100644
--- a/elements/core-deps.bst
+++ b/elements/core-deps.bst
@@ -51,6 +51,7 @@ depends:
 - core-deps/intltool.bst
 - core-deps/iptables.bst
 - core-deps/json-c.bst
+- core-deps/jsonrpc-glib.bst
 - core-deps/libatasmart.bst
 - core-deps/libbytesize.bst
 - core-deps/libcanberra.bst
@@ -58,6 +59,8 @@ depends:
 - core-deps/libcue.bst
 - core-deps/libdaemon.bst
 - core-deps/libdazzle.bst
+- core-deps/libgit2.bst
+- core-deps/libgit2-glib.bst
 - core-deps/libdvdread.bst
 - core-deps/libevdev.bst
 - core-deps/libgdata.bst
@@ -82,9 +85,11 @@ depends:
 - core-deps/libosinfo.bst
 - core-deps/libostree.bst
 - core-deps/libpeas.bst
+- core-deps/libportal.bst
 - core-deps/libqmi.bst
 - core-deps/librest.bst
 - core-deps/libsigcplusplus-2.0.bst
+- core-deps/libssh2.bst
 - core-deps/libusb.bst
 - core-deps/libvirt-glib.bst
 - core-deps/libvirt.bst
@@ -123,6 +128,7 @@ depends:
 - core-deps/spice-gtk.bst
 - core-deps/spice-protocol.bst
 - core-deps/startup-notification.bst
+- core-deps/template-glib.bst
 - core-deps/tepl.bst
 - core-deps/totem-pl-parser.bst
 - core-deps/tracker-miners.bst
diff --git a/elements/world/jsonrpc-glib.bst b/elements/core-deps/jsonrpc-glib.bst
similarity index 100%
rename from elements/world/jsonrpc-glib.bst
rename to elements/core-deps/jsonrpc-glib.bst
diff --git a/elements/world/libgit2-glib.bst b/elements/core-deps/libgit2-glib.bst
similarity index 86%
rename from elements/world/libgit2-glib.bst
rename to elements/core-deps/libgit2-glib.bst
index 615745c7..0e549954 100644
--- a/elements/world/libgit2-glib.bst
+++ b/elements/core-deps/libgit2-glib.bst
@@ -6,10 +6,10 @@ sources:
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 depends:
+- core-deps/libgit2.bst
+- core-deps/libssh2.bst
 - sdk/glib.bst
 - sdk/gobject-introspection.bst
 - sdk/pygobject.bst
 - sdk/vala.bst
-- world/libgit2.bst
-- world/libssh2.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/world/libgit2.bst b/elements/core-deps/libgit2.bst
similarity index 92%
rename from elements/world/libgit2.bst
rename to elements/core-deps/libgit2.bst
index cf1b4a54..d39ba141 100644
--- a/elements/world/libgit2.bst
+++ b/elements/core-deps/libgit2.bst
@@ -5,7 +5,7 @@ sources:
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-cmake.bst
 depends:
-- world/libssh2.bst
+- core-deps/libssh2.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
 variables:
   cmake-local: >-
diff --git a/elements/world/libportal.bst b/elements/core-deps/libportal.bst
similarity index 100%
rename from elements/world/libportal.bst
rename to elements/core-deps/libportal.bst
diff --git a/elements/world/libssh2.bst b/elements/core-deps/libssh2.bst
similarity index 100%
rename from elements/world/libssh2.bst
rename to elements/core-deps/libssh2.bst
diff --git a/elements/world/template-glib.bst b/elements/core-deps/template-glib.bst
similarity index 100%
rename from elements/world/template-glib.bst
rename to elements/core-deps/template-glib.bst
diff --git a/elements/world/gnome-builder.bst b/elements/core/gnome-builder.bst
similarity index 85%
rename from elements/world/gnome-builder.bst
rename to elements/core/gnome-builder.bst
index dafa83d0..4d5271d4 100644
--- a/elements/world/gnome-builder.bst
+++ b/elements/core/gnome-builder.bst
@@ -15,6 +15,10 @@ depends:
 - core-deps/libdazzle.bst
 - core-deps/libpeas.bst
 - core-deps/vte.bst
+- core-deps/jsonrpc-glib.bst
+- core-deps/libgit2-glib.bst
+- core-deps/libportal.bst
+- core-deps/template-glib.bst
 - core/devhelp.bst
 - sdk/gjs.bst
 - sdk/glib.bst
@@ -24,10 +28,6 @@ depends:
 - sdk/librsvg.bst
 - sdk/pygobject.bst
 - sdk/vala.bst
-- world/jsonrpc-glib.bst
-- world/libgit2-glib.bst
-- world/libportal.bst
-- world/template-glib.bst
 - freedesktop-sdk.bst:components/llvm.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
 variables:
diff --git a/elements/core/meta-gnome-core-developer-tools.bst 
b/elements/core/meta-gnome-core-developer-tools.bst
index 0ecfb505..681d8bbf 100644
--- a/elements/core/meta-gnome-core-developer-tools.bst
+++ b/elements/core/meta-gnome-core-developer-tools.bst
@@ -5,4 +5,5 @@ kind: stack
 depends:
 - core/dconf-editor.bst
 - core/devhelp.bst
+- core/gnome-builder.bst
 - core/sysprof.bst
diff --git a/elements/world.bst b/elements/world.bst
index efd0dfba..979b3c17 100644
--- a/elements/world.bst
+++ b/elements/world.bst
@@ -18,7 +18,6 @@ depends:
 - world/glade.bst
 - world/glibmm.bst
 - world/geary.bst
-- world/gnome-builder.bst
 - world/gnome-chess.bst
 - world/gnome-code-assistance.bst
 - world/gnome-devel-docs.bst
@@ -48,14 +47,11 @@ depends:
 - world/ibus-anthy.bst
 - world/ibus-hangul.bst
 - world/ibus-libpinyin.bst
-- world/jsonrpc-glib.bst
 - world/kyotocabinet.bst
 - world/libbluray.bst
 - world/libcdio.bst
 - world/libcdio-paranoia.bst
 - world/libgepub.bst
-- world/libgit2.bst
-- world/libgit2-glib.bst
 - world/libgnome-games-support.bst
 - world/libgphoto2.bst
 - world/libgrss.bst
@@ -65,9 +61,7 @@ depends:
 - world/libmtp.bst
 - world/libnfs.bst
 - world/libpinyin.bst
-- world/libportal.bst
 - world/libsigcplusplus.bst
-- world/libssh2.bst
 - world/libusbmuxd.bst
 - world/lightsoff.bst
 - world/network-manager-applet.bst
@@ -83,4 +77,3 @@ depends:
 - world/telepathy-glib.bst
 - world/telepathy-logger.bst
 - world/telepathy-mission-control.bst
-- world/template-glib.bst
diff --git a/elements/world/gitg.bst b/elements/world/gitg.bst
index 029a9601..36dd7ad1 100644
--- a/elements/world/gitg.bst
+++ b/elements/world/gitg.bst
@@ -6,6 +6,7 @@ sources:
 depends:
 - core-deps/gspell.bst
 - core-deps/libdazzle.bst
+- core-deps/libgit2-glib.bst
 - core-deps/libpeas.bst
 - sdk/glib.bst
 - sdk/gobject-introspection.bst
@@ -18,6 +19,5 @@ depends:
 - sdk/libsoup.bst
 - sdk/pygobject.bst
 - sdk/vala.bst
-- world/libgit2-glib.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 - freedesktop-sdk.bst:bootstrap-import.bst


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