GNOME.org
 

[gnome-apps-nightly] Support building apps from git

commit 30479ba391a362fb7078e31ca58520d51992f56d
Author: Alexander Larsson <alexl redhat com>
Date:   Wed Feb 22 15:25:43 2017 +0100

    Support building apps from git
    
    We now take a .app file as argument, and the app file
    has the name of the app and the json file for it.
    Additionally it can have a git uri and branch, which means
    the json is taken from that repo.

 build.sh                  |   24 ++++++++--
 build_all.sh              |    4 +-
 ca.desrt.dconf-editor.app |    2 +
 org.flatpak.Builder.app   |    2 +
 org.gnome.Books.app       |    2 +
 org.gnome.Builder.app     |    2 +
 org.gnome.Calculator.app  |    2 +
 org.gnome.Calendar.app    |    3 +
 org.gnome.Calendar.json   |  102 ---------------------------------------------
 org.gnome.Characters.app  |    2 +
 org.gnome.Devhelp.app     |    2 +
 org.gnome.Dictionary.app  |    2 +
 org.gnome.Documents.app   |    2 +
 org.gnome.Epiphany.app    |    2 +
 org.gnome.Evince.app      |    2 +
 org.gnome.Games.app       |    2 +
 org.gnome.Geary.app       |    2 +
 org.gnome.Glade.app       |    2 +
 org.gnome.Maps.app        |    2 +
 org.gnome.Nautilus.app    |    2 +
 org.gnome.News.app        |    2 +
 org.gnome.Photos.app      |    2 +
 org.gnome.Polari.app      |    2 +
 org.gnome.Rhythmbox3.app  |    2 +
 org.gnome.Software.app    |    2 +
 org.gnome.Todo.app        |    2 +
 org.gnome.Totem.app       |    2 +
 org.gnome.TweakTool.app   |    2 +
 org.gnome.Weather.app     |    2 +
 org.gnome.bijiben.app     |    2 +
 org.gnome.clocks.app      |    2 +
 org.gnome.eog.app         |    2 +
 org.gnome.frogr.app       |    2 +
 org.gnome.gedit.app       |    2 +
 org.gnome.gitg.app        |    2 +
 org.gnome.iagno.app       |    2 +
 36 files changed, 88 insertions(+), 109 deletions(-)
---
diff --git a/build.sh b/build.sh
index d5d74f6..166a499 100755
--- a/build.sh
+++ b/build.sh
@@ -2,10 +2,24 @@
 
 FILE=$1
 
-APPID=`basename $FILE .json`
+shift
 
-# Only use this on master branch
-NIGHTLY_ARGS=--rebuild-on-sdk-change
+ID=
+JSON=
+GITURL=
+GITBRANCH=master
 
-echo ========== Building $APPID ================
-flatpak-builder --force-clean --ccache --require-changes --repo=repo --subject="Nightly build of ${APPID}, 
`date`" ${NIGHTLY_ARGS-} ${EXPORT_ARGS-} app $FILE
+. ./$FILE
+
+if [ x$ID == x ]; then
+    echo invalid app
+    exit 1
+fi
+
+GIT_ARGS=""
+if [ x$GITURL != x ]; then
+    GIT_ARGS="--from-git=$GITURL --from-git-branch=$GITBRANCH"
+fi
+
+echo ========== Building $ID ================
+flatpak-builder --force-clean --ccache --require-changes --repo=repo --subject="Build of ${ID}, `date`" 
${EXPORT_ARGS-} ${GIT_ARGS-} "$@" app $JSON
diff --git a/build_all.sh b/build_all.sh
index 90ed38d..eef3f69 100755
--- a/build_all.sh
+++ b/build_all.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-for i in *.json; do
-    ./build.sh $i
+for i in *.app; do
+    ./build.sh $i "$@"
 done
 
 ./build_update_repo.sh
diff --git a/ca.desrt.dconf-editor.app b/ca.desrt.dconf-editor.app
new file mode 100644
index 0000000..f767dfe
--- /dev/null
+++ b/ca.desrt.dconf-editor.app
@@ -0,0 +1,2 @@
+ID=ca.desrt.dconf-editor
+JSON=ca.desrt.dconf-editor.json
diff --git a/org.flatpak.Builder.app b/org.flatpak.Builder.app
new file mode 100644
index 0000000..164c264
--- /dev/null
+++ b/org.flatpak.Builder.app
@@ -0,0 +1,2 @@
+ID=org.flatpak.Builder
+JSON=org.flatpak.Builder.json
diff --git a/org.gnome.Books.app b/org.gnome.Books.app
new file mode 100644
index 0000000..434a997
--- /dev/null
+++ b/org.gnome.Books.app
@@ -0,0 +1,2 @@
+ID=org.gnome.Books
+JSON=org.gnome.Books.json
diff --git a/org.gnome.Builder.app b/org.gnome.Builder.app
new file mode 100644
index 0000000..4e05d12
--- /dev/null
+++ b/org.gnome.Builder.app
@@ -0,0 +1,2 @@
+ID=org.gnome.Builder
+JSON=org.gnome.Builder.json
diff --git a/org.gnome.Calculator.app b/org.gnome.Calculator.app
new file mode 100644
index 0000000..297210f
--- /dev/null
+++ b/org.gnome.Calculator.app
@@ -0,0 +1,2 @@
+ID=org.gnome.Calculator
+JSON=org.gnome.Calculator.json
diff --git a/org.gnome.Calendar.app b/org.gnome.Calendar.app
new file mode 100644
index 0000000..1ef6b58
--- /dev/null
+++ b/org.gnome.Calendar.app
@@ -0,0 +1,3 @@
+ID=org.gnome.Calendar
+JSON=org.gnome.Calendar.json
+GITURL=git://git.gnome.org/gnome-calendar
diff --git a/org.gnome.Characters.app b/org.gnome.Characters.app
new file mode 100644
index 0000000..3affeca
--- /dev/null
+++ b/org.gnome.Characters.app
@@ -0,0 +1,2 @@
+ID=org.gnome.Characters
+JSON=org.gnome.Characters.json
diff --git a/org.gnome.Devhelp.app b/org.gnome.Devhelp.app
new file mode 100644
index 0000000..db5799b
--- /dev/null
+++ b/org.gnome.Devhelp.app
@@ -0,0 +1,2 @@
+ID=org.gnome.Devhelp
+JSON=org.gnome.Devhelp.json
diff --git a/org.gnome.Dictionary.app b/org.gnome.Dictionary.app
new file mode 100644
index 0000000..42784dc
--- /dev/null
+++ b/org.gnome.Dictionary.app
@@ -0,0 +1,2 @@
+ID=org.gnome.Dictionary
+JSON=org.gnome.Dictionary.json
diff --git a/org.gnome.Documents.app b/org.gnome.Documents.app
new file mode 100644
index 0000000..2bb60e1
--- /dev/null
+++ b/org.gnome.Documents.app
@@ -0,0 +1,2 @@
+ID=org.gnome.Documents
+JSON=org.gnome.Documents.json
diff --git a/org.gnome.Epiphany.app b/org.gnome.Epiphany.app
new file mode 100644
index 0000000..92fac72
--- /dev/null
+++ b/org.gnome.Epiphany.app
@@ -0,0 +1,2 @@
+ID=org.gnome.Epiphany
+JSON=org.gnome.Epiphany.json
diff --git a/org.gnome.Evince.app b/org.gnome.Evince.app
new file mode 100644
index 0000000..e6038e3
--- /dev/null
+++ b/org.gnome.Evince.app
@@ -0,0 +1,2 @@
+ID=org.gnome.Evince
+JSON=org.gnome.Evince.json
diff --git a/org.gnome.Games.app b/org.gnome.Games.app
new file mode 100644
index 0000000..97c4219
--- /dev/null
+++ b/org.gnome.Games.app
@@ -0,0 +1,2 @@
+ID=org.gnome.Games
+JSON=org.gnome.Games.json
diff --git a/org.gnome.Geary.app b/org.gnome.Geary.app
new file mode 100644
index 0000000..f3bb7b2
--- /dev/null
+++ b/org.gnome.Geary.app
@@ -0,0 +1,2 @@
+ID=org.gnome.Geary
+JSON=org.gnome.Geary.json
diff --git a/org.gnome.Glade.app b/org.gnome.Glade.app
new file mode 100644
index 0000000..6d3d1f5
--- /dev/null
+++ b/org.gnome.Glade.app
@@ -0,0 +1,2 @@
+ID=org.gnome.Glade
+JSON=org.gnome.Glade.json
diff --git a/org.gnome.Maps.app b/org.gnome.Maps.app
new file mode 100644
index 0000000..0bffaa4
--- /dev/null
+++ b/org.gnome.Maps.app
@@ -0,0 +1,2 @@
+ID=org.gnome.Maps
+JSON=org.gnome.Maps.json
diff --git a/org.gnome.Nautilus.app b/org.gnome.Nautilus.app
new file mode 100644
index 0000000..3337c31
--- /dev/null
+++ b/org.gnome.Nautilus.app
@@ -0,0 +1,2 @@
+ID=org.gnome.Nautilus
+JSON=org.gnome.Nautilus.json
diff --git a/org.gnome.News.app b/org.gnome.News.app
new file mode 100644
index 0000000..9684198
--- /dev/null
+++ b/org.gnome.News.app
@@ -0,0 +1,2 @@
+ID=org.gnome.News
+JSON=org.gnome.News.json
diff --git a/org.gnome.Photos.app b/org.gnome.Photos.app
new file mode 100644
index 0000000..3ffcadb
--- /dev/null
+++ b/org.gnome.Photos.app
@@ -0,0 +1,2 @@
+ID=org.gnome.Photos
+JSON=org.gnome.Photos.json
diff --git a/org.gnome.Polari.app b/org.gnome.Polari.app
new file mode 100644
index 0000000..45241e3
--- /dev/null
+++ b/org.gnome.Polari.app
@@ -0,0 +1,2 @@
+ID=org.gnome.Polari
+JSON=org.gnome.Polari.json
diff --git a/org.gnome.Rhythmbox3.app b/org.gnome.Rhythmbox3.app
new file mode 100644
index 0000000..a706fcb
--- /dev/null
+++ b/org.gnome.Rhythmbox3.app
@@ -0,0 +1,2 @@
+ID=org.gnome.Rhythmbox3
+JSON=org.gnome.Rhythmbox3.json
diff --git a/org.gnome.Software.app b/org.gnome.Software.app
new file mode 100644
index 0000000..d584180
--- /dev/null
+++ b/org.gnome.Software.app
@@ -0,0 +1,2 @@
+ID=org.gnome.Software
+JSON=org.gnome.Software.json
diff --git a/org.gnome.Todo.app b/org.gnome.Todo.app
new file mode 100644
index 0000000..88fd9f2
--- /dev/null
+++ b/org.gnome.Todo.app
@@ -0,0 +1,2 @@
+ID=org.gnome.Todo
+JSON=org.gnome.Todo.json
diff --git a/org.gnome.Totem.app b/org.gnome.Totem.app
new file mode 100644
index 0000000..750494a
--- /dev/null
+++ b/org.gnome.Totem.app
@@ -0,0 +1,2 @@
+ID=org.gnome.Totem
+JSON=org.gnome.Totem.json
diff --git a/org.gnome.TweakTool.app b/org.gnome.TweakTool.app
new file mode 100644
index 0000000..690f569
--- /dev/null
+++ b/org.gnome.TweakTool.app
@@ -0,0 +1,2 @@
+ID=org.gnome.TweakTool
+JSON=org.gnome.TweakTool.json
diff --git a/org.gnome.Weather.app b/org.gnome.Weather.app
new file mode 100644
index 0000000..6969cdc
--- /dev/null
+++ b/org.gnome.Weather.app
@@ -0,0 +1,2 @@
+ID=org.gnome.Weather
+JSON=org.gnome.Weather.json
diff --git a/org.gnome.bijiben.app b/org.gnome.bijiben.app
new file mode 100644
index 0000000..b95c00c
--- /dev/null
+++ b/org.gnome.bijiben.app
@@ -0,0 +1,2 @@
+ID=org.gnome.bijiben
+JSON=org.gnome.bijiben.json
diff --git a/org.gnome.clocks.app b/org.gnome.clocks.app
new file mode 100644
index 0000000..8dab498
--- /dev/null
+++ b/org.gnome.clocks.app
@@ -0,0 +1,2 @@
+ID=org.gnome.clocks
+JSON=org.gnome.clocks.json
diff --git a/org.gnome.eog.app b/org.gnome.eog.app
new file mode 100644
index 0000000..1a6a3fd
--- /dev/null
+++ b/org.gnome.eog.app
@@ -0,0 +1,2 @@
+ID=org.gnome.eog
+JSON=org.gnome.eog.json
diff --git a/org.gnome.frogr.app b/org.gnome.frogr.app
new file mode 100644
index 0000000..f2c41c2
--- /dev/null
+++ b/org.gnome.frogr.app
@@ -0,0 +1,2 @@
+ID=org.gnome.frogr
+JSON=org.gnome.frogr.json
diff --git a/org.gnome.gedit.app b/org.gnome.gedit.app
new file mode 100644
index 0000000..5920340
--- /dev/null
+++ b/org.gnome.gedit.app
@@ -0,0 +1,2 @@
+ID=org.gnome.gedit
+JSON=org.gnome.gedit.json
diff --git a/org.gnome.gitg.app b/org.gnome.gitg.app
new file mode 100644
index 0000000..1fad11d
--- /dev/null
+++ b/org.gnome.gitg.app
@@ -0,0 +1,2 @@
+ID=org.gnome.gitg
+JSON=org.gnome.gitg.json
diff --git a/org.gnome.iagno.app b/org.gnome.iagno.app
new file mode 100644
index 0000000..6c32422
--- /dev/null
+++ b/org.gnome.iagno.app
@@ -0,0 +1,2 @@
+ID=org.gnome.iagno
+JSON=org.gnome.iagno.json
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]