summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTristan Van Berkom <tristan.vanberkom@codethink.co.uk>2017-01-18 11:29:03 -0500
committerTristan Van Berkom <tristan.vanberkom@codethink.co.uk>2017-01-18 11:29:03 -0500
commitdddbcaf0a14df13a1c5ea27556278d073fe607bd (patch)
treeac06e3d5915747ad5f421f02dc9e1acc52f42283
parent1b6d50dd22aa9c91880cf43091a1a019a8e0bf8d (diff)
downloaddefinitions-dddbcaf0a14df13a1c5ea27556278d073fe607bd.tar.gz
Face lift: Now we actually build some things
-rw-r--r--build.bst19
-rw-r--r--dep-one.bst16
-rw-r--r--dep-two.bst18
-rw-r--r--eog-plugins.bst15
-rw-r--r--eog.bst14
-rw-r--r--glade.bst18
-rw-r--r--gnome-desktop.bst7
-rw-r--r--gnome-platform.bst10
-rw-r--r--gnome-sdk.bst (renamed from build-build.bst)3
-rw-r--r--libpeas.bst18
-rw-r--r--project.conf12
-rw-r--r--run-build.bst5
-rw-r--r--run.bst5
-rw-r--r--target.bst11
14 files changed, 91 insertions, 80 deletions
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/build-build.bst b/gnome-sdk.bst
index 7a4ad38c..f5d8396e 100644
--- a/build-build.bst
+++ b/gnome-sdk.bst
@@ -7,4 +7,5 @@ sources:
gpg-key: keys/gnome-sdk.gpg
ref: 7cb7ec7286e0d70183c61183da2cd9e837299d615e1fa8674cb2806047994928
config:
- collect: files
+ 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