From dddbcaf0a14df13a1c5ea27556278d073fe607bd Mon Sep 17 00:00:00 2001 From: Tristan Van Berkom Date: Wed, 18 Jan 2017 11:29:03 -0500 Subject: Face lift: Now we actually build some things --- build-build.bst | 10 ---------- build.bst | 19 ------------------- dep-one.bst | 16 ---------------- dep-two.bst | 18 ------------------ eog-plugins.bst | 15 +++++++++++++++ eog.bst | 14 ++++++++++++++ glade.bst | 18 ++++++++++++++++++ gnome-desktop.bst | 7 ++++--- gnome-platform.bst | 10 ++++++++++ gnome-sdk.bst | 11 +++++++++++ libpeas.bst | 18 ++++++++++++++++++ project.conf | 12 ++++++++++-- run-build.bst | 5 ----- run.bst | 5 ----- target.bst | 11 ----------- 15 files changed, 100 insertions(+), 89 deletions(-) delete mode 100644 build-build.bst delete mode 100644 build.bst delete mode 100644 dep-one.bst delete mode 100644 dep-two.bst create mode 100644 eog-plugins.bst create mode 100644 eog.bst create mode 100644 glade.bst create mode 100644 gnome-platform.bst create mode 100644 gnome-sdk.bst create mode 100644 libpeas.bst delete mode 100644 run-build.bst delete mode 100644 run.bst delete mode 100644 target.bst diff --git a/build-build.bst b/build-build.bst deleted file mode 100644 index 7a4ad38c..00000000 --- a/build-build.bst +++ /dev/null @@ -1,10 +0,0 @@ -kind: import -description: Import the GNOME SDK -sources: -- kind: ostree - url: https://sdk.gnome.org/repo/ - track: runtime/org.gnome.Sdk/x86_64/3.22 - gpg-key: keys/gnome-sdk.gpg - ref: 7cb7ec7286e0d70183c61183da2cd9e837299d615e1fa8674cb2806047994928 -config: - collect: files diff --git a/build.bst b/build.bst deleted file mode 100644 index ae134bae..00000000 --- a/build.bst +++ /dev/null @@ -1,19 +0,0 @@ -kind: autotools -description: Some kinda autotools element -sources: -- kind: git - url: gnome:glade - track: glade-3-18 - ref: 1f6639f981a36fba45ba5bc4dc24b79df1935208 -- kind: git - url: gnome:folks - track: master - ref: a2d0a75044c85003344e82b296915858f4ab6c2e -config: - configure-commands: - - pony -depends: -- filename: build-build.bst - type: build -- filename: run-build.bst - type: runtime diff --git a/dep-one.bst b/dep-one.bst deleted file mode 100644 index 453ad9c6..00000000 --- a/dep-one.bst +++ /dev/null @@ -1,16 +0,0 @@ -kind: autotools -description: Some kinda autotools element -sources: -- kind: git - url: gnome:gedit - track: master - submodules: - libgd: - url: gnome:libgd - ref: 3bdfa5764deb9909dae9ef041a7e9b6d6297341a -config: - configure-commands: - - pony -depends: -- filename: build.bst - type: build diff --git a/dep-two.bst b/dep-two.bst deleted file mode 100644 index 9b31adb3..00000000 --- a/dep-two.bst +++ /dev/null @@ -1,18 +0,0 @@ -kind: autotools -description: Some kinda autotools element -config: - configure-commands: - - pony -depends: -- filename: build.bst - type: build -- filename: run.bst - type: runtime -sources: -- kind: git - url: gnome:nautilus - track: master - submodules: - libgd: - url: gnome:libgd - ref: 4484f67b7fd29587c6a8ee787e6b7721ee518e7a diff --git a/eog-plugins.bst b/eog-plugins.bst new file mode 100644 index 00000000..7c3e7f09 --- /dev/null +++ b/eog-plugins.bst @@ -0,0 +1,15 @@ +kind: autotools +description: eog plugins +sources: +- kind: git + url: gnome:eog-plugins + track: 3.16.5 + ref: d643bb4a4215a700d62b977742ea1041fa0ffdbf +depends: +- libpeas.bst +- gnome-desktop.bst +- eog.bst +- filename: gnome-sdk.bst + type: build +- filename: gnome-platform.bst + type: build diff --git a/eog.bst b/eog.bst new file mode 100644 index 00000000..03e92237 --- /dev/null +++ b/eog.bst @@ -0,0 +1,14 @@ +kind: autotools +description: eog module +sources: +- kind: git + url: gnome:eog + track: gnome-3-20 + ref: 3126ebacfb9e265570df04510bf2608ea8ce0823 +depends: +- libpeas.bst +- gnome-desktop.bst +- filename: gnome-sdk.bst + type: build +- filename: gnome-platform.bst + type: build diff --git a/glade.bst b/glade.bst new file mode 100644 index 00000000..9d3018c8 --- /dev/null +++ b/glade.bst @@ -0,0 +1,18 @@ +kind: autotools +description: Glade Interface Designer +sources: +- kind: git + url: gnome:glade + track: glade-3-20 + ref: f53fade6d12ece7b64142977c3a6d781fd37cc8e +depends: +- filename: gnome-sdk.bst + type: build +- filename: gnome-platform.bst + type: build +config: + configure-commands: + - | + %{autogen} + - | + %{configure} --disable-man-pages diff --git a/gnome-desktop.bst b/gnome-desktop.bst index e53c6905..a68be968 100644 --- a/gnome-desktop.bst +++ b/gnome-desktop.bst @@ -1,11 +1,10 @@ kind: autotools description: GNOME Desktop module - sources: - kind: git url: gnome:gnome-desktop - track: master - + track: gnome-3-22 + ref: b9e03c705253b1a35bd59c7a7f7ffc54d011342f config: configure-commands: - | @@ -16,3 +15,5 @@ config: depends: - filename: gnome-sdk.bst type: build +- filename: gnome-platform.bst + type: build diff --git a/gnome-platform.bst b/gnome-platform.bst new file mode 100644 index 00000000..28f46b5f --- /dev/null +++ b/gnome-platform.bst @@ -0,0 +1,10 @@ +kind: import +description: Import the GNOME Platform +sources: +- kind: ostree + url: https://sdk.gnome.org/repo/ + track: runtime/org.gnome.Platform/x86_64/3.22 + gpg-key: keys/gnome-sdk.gpg + ref: 3f3912c71d02ff77cca9e9f806c18bb8dc7e6ec6835f5e4b0e80a0af34597cf3 +config: + source: files diff --git a/gnome-sdk.bst b/gnome-sdk.bst new file mode 100644 index 00000000..f5d8396e --- /dev/null +++ b/gnome-sdk.bst @@ -0,0 +1,11 @@ +kind: import +description: Import the GNOME SDK +sources: +- kind: ostree + url: https://sdk.gnome.org/repo/ + track: runtime/org.gnome.Sdk/x86_64/3.22 + gpg-key: keys/gnome-sdk.gpg + ref: 7cb7ec7286e0d70183c61183da2cd9e837299d615e1fa8674cb2806047994928 +config: + source: files + target: usr diff --git a/libpeas.bst b/libpeas.bst new file mode 100644 index 00000000..cab3b027 --- /dev/null +++ b/libpeas.bst @@ -0,0 +1,18 @@ +kind: autotools +description: libpeas module +sources: +- kind: git + url: gnome:libpeas + track: 1.20 + ref: 42a16ccb89e36733ba7339386f36cda3a15742ac +depends: +- filename: gnome-sdk.bst + type: build +- filename: gnome-platform.bst + type: build +config: + configure-commands: + - | + autoreconf -ivf + - | + %{configure} diff --git a/project.conf b/project.conf index 28dc1075..acbcf22f 100644 --- a/project.conf +++ b/project.conf @@ -1,6 +1,14 @@ -# Basic project configuration that doesnt override anything +# Eye of GNOME flatpak demo # -name: pony +name: eog aliases: gnome: git://git.gnome.org/ + +variables: + prefix: /app + +environment: + CFLAGS: "-O2 -g" + CXXFLAGS: "-O2 -g" + V: "1" diff --git a/run-build.bst b/run-build.bst deleted file mode 100644 index cd1f7396..00000000 --- a/run-build.bst +++ /dev/null @@ -1,5 +0,0 @@ -kind: autotools -description: Some kinda autotools element -config: - configure-commands: - - pony diff --git a/run.bst b/run.bst deleted file mode 100644 index f6d5c0bb..00000000 --- a/run.bst +++ /dev/null @@ -1,5 +0,0 @@ -kind: autotools -description: Some kinda autotools element -config: - install-commands: - - pony diff --git a/target.bst b/target.bst deleted file mode 100644 index f843064f..00000000 --- a/target.bst +++ /dev/null @@ -1,11 +0,0 @@ -kind: autotools -description: Some kinda autotools element -config: - pony-dict: - - # Has a comment ! - - pony: cheese - thisone: 5 -depends: -- dep-one.bst -- dep-two.bst -- cgit v1.2.1