From: Hans-Christoph Steiner <hans@eds.org>
Date: Thu, 23 Feb 2017 17:54:33 +0000 (+0100)
Subject: normalize Build TYPE_LIST data based on .txt
X-Git-Tag: 0.8~121^2~3
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=c178cfb84368cc400984f86cb2b10d48a32c68ae;p=fdroidserver.git

normalize Build TYPE_LIST data based on .txt

In the future, we should have better internal datatypes for this stuff,
i.e. instead of gradle: ['yes'] for True, actually use a boolean.  For now,
make the YAML and JSON metadata produce the same internal data as .txt.
---

diff --git a/fdroidserver/metadata.py b/fdroidserver/metadata.py
index 0d446f54..924d7d87 100644
--- a/fdroidserver/metadata.py
+++ b/fdroidserver/metadata.py
@@ -818,6 +818,15 @@ def post_metadata_parse(app):
         for build in app['builds']:
             if not isinstance(build, Build):
                 build = Build(build)
+            for k, v in build.items():
+                if flagtype(k) == TYPE_LIST:
+                    if isinstance(v, str):
+                        build[k] = [v]
+                    elif isinstance(v, bool):
+                        if v:
+                            build[k] = ['yes']
+                        else:
+                            build[k] = []
             builds.append(build)
 
     if not app.get('Description'):
diff --git a/tests/metadata/dump/org.adaway.yaml b/tests/metadata/dump/org.adaway.yaml
index c028e297..2be4c114 100644
--- a/tests/metadata/dump/org.adaway.yaml
+++ b/tests/metadata/dump/org.adaway.yaml
@@ -61,7 +61,8 @@ builds:
 - androidupdate: []
   antcommands: []
   build: ''
-  buildjni: true
+  buildjni:
+  - 'yes'
   commit: ea5378a94ee0dc1d99d2cec95fae7e6d81afb2b9
   disable: false
   encoding: null
@@ -92,7 +93,8 @@ builds:
 - androidupdate: []
   antcommands: []
   build: ''
-  buildjni: true
+  buildjni:
+  - 'yes'
   commit: 4128e59da2eac5c2904c7c7568d298ca51e79540
   disable: false
   encoding: null
@@ -124,7 +126,8 @@ builds:
 - androidupdate: []
   antcommands: []
   build: ''
-  buildjni: true
+  buildjni:
+  - 'yes'
   commit: 0b9985398b9eef7baf6aadd0dbb12002bc199d2e
   disable: false
   encoding: null
@@ -156,7 +159,8 @@ builds:
 - androidupdate: []
   antcommands: []
   build: ''
-  buildjni: true
+  buildjni:
+  - 'yes'
   commit: ab27f4dab5f3ea5e228cfb4a6b0e1fbf53695f22
   disable: false
   encoding: null
@@ -188,7 +192,8 @@ builds:
 - androidupdate: []
   antcommands: []
   build: ''
-  buildjni: true
+  buildjni:
+  - 'yes'
   commit: 695e3801e4081026c8f7213a2345fc451d5eb89c
   disable: false
   encoding: null
@@ -220,7 +225,8 @@ builds:
 - androidupdate: []
   antcommands: []
   build: ''
-  buildjni: true
+  buildjni:
+  - 'yes'
   commit: 65138c11cc8b6affd28b68e125fbc1dff0886a4e
   disable: false
   encoding: null
@@ -283,7 +289,8 @@ builds:
 - androidupdate: []
   antcommands: []
   build: ''
-  buildjni: true
+  buildjni:
+  - 'yes'
   commit: f811e53e1e1d2ee047b18715fd7d2072b90ae76b
   disable: false
   encoding: null
@@ -314,7 +321,8 @@ builds:
 - androidupdate: []
   antcommands: []
   build: ''
-  buildjni: true
+  buildjni:
+  - 'yes'
   commit: ff97932761cdee68638dc2550751a64b2cbe18e7
   disable: false
   encoding: null
@@ -345,7 +353,8 @@ builds:
 - androidupdate: []
   antcommands: []
   build: ''
-  buildjni: true
+  buildjni:
+  - 'yes'
   commit: 33d4d80998f30bafc88c04c80cbae00b03916f99
   disable: false
   encoding: null
@@ -376,7 +385,8 @@ builds:
 - androidupdate: []
   antcommands: []
   build: ''
-  buildjni: true
+  buildjni:
+  - 'yes'
   commit: 743d25a7e287505461f33f4b8e57e4cf988fffea
   disable: false
   encoding: null
@@ -407,7 +417,8 @@ builds:
 - androidupdate: []
   antcommands: []
   build: ''
-  buildjni: true
+  buildjni:
+  - 'yes'
   commit: eaa07f4
   disable: false
   encoding: null
@@ -438,7 +449,7 @@ builds:
 - androidupdate: []
   antcommands: []
   build: ''
-  buildjni: false
+  buildjni: []
   commit: 71ced3f
   disable: false
   encoding: null
@@ -470,7 +481,7 @@ builds:
 - androidupdate: []
   antcommands: []
   build: ''
-  buildjni: false
+  buildjni: []
   commit: 9d63c18
   disable: false
   encoding: null
@@ -501,7 +512,7 @@ builds:
 - androidupdate: []
   antcommands: []
   build: ''
-  buildjni: false
+  buildjni: []
   commit: f2568b1
   disable: false
   encoding: null
@@ -533,7 +544,7 @@ builds:
 - androidupdate: []
   antcommands: []
   build: ''
-  buildjni: false
+  buildjni: []
   commit: 7442d5d
   disable: false
   encoding: null
@@ -565,7 +576,7 @@ builds:
 - androidupdate: []
   antcommands: []
   build: ''
-  buildjni: false
+  buildjni: []
   commit: 83fc713
   disable: false
   encoding: null
@@ -597,7 +608,7 @@ builds:
 - androidupdate: []
   antcommands: []
   build: ''
-  buildjni: false
+  buildjni: []
   commit: 70da32b567122b701cdcb1609b780eb85732028f
   disable: false
   encoding: null
@@ -633,7 +644,8 @@ builds:
   - android-libs/HtmlSpanner/htmlspanner
   antcommands: []
   build: ''
-  buildjni: true
+  buildjni:
+  - 'yes'
   commit: v2.1
   disable: false
   encoding: null
@@ -676,7 +688,8 @@ builds:
   - android-libs/HtmlSpanner/htmlspanner
   antcommands: []
   build: ''
-  buildjni: true
+  buildjni:
+  - 'yes'
   commit: v2.3
   disable: false
   encoding: null
@@ -715,14 +728,16 @@ builds:
 - androidupdate: []
   antcommands: []
   build: ''
-  buildjni: true
+  buildjni:
+  - 'yes'
   commit: v2.6
   disable: false
   encoding: null
   extlibs: []
   forcevercode: false
   forceversion: false
-  gradle: true
+  gradle:
+  - 'yes'
   gradleprops: []
   init: ''
   kivy: false
@@ -747,14 +762,16 @@ builds:
 - androidupdate: []
   antcommands: []
   build: ''
-  buildjni: true
+  buildjni:
+  - 'yes'
   commit: v2.7
   disable: false
   encoding: null
   extlibs: []
   forcevercode: false
   forceversion: false
-  gradle: true
+  gradle:
+  - 'yes'
   gradleprops: []
   init: ''
   kivy: false
@@ -779,14 +796,16 @@ builds:
 - androidupdate: []
   antcommands: []
   build: ''
-  buildjni: true
+  buildjni:
+  - 'yes'
   commit: v2.8
   disable: false
   encoding: null
   extlibs: []
   forcevercode: false
   forceversion: false
-  gradle: true
+  gradle:
+  - 'yes'
   gradleprops: []
   init: ''
   kivy: false
@@ -811,14 +830,16 @@ builds:
 - androidupdate: []
   antcommands: []
   build: ''
-  buildjni: true
+  buildjni:
+  - 'yes'
   commit: v2.8.1
   disable: false
   encoding: null
   extlibs: []
   forcevercode: false
   forceversion: false
-  gradle: true
+  gradle:
+  - 'yes'
   gradleprops: []
   init: ''
   kivy: false
@@ -843,14 +864,16 @@ builds:
 - androidupdate: []
   antcommands: []
   build: ''
-  buildjni: true
+  buildjni:
+  - 'yes'
   commit: v2.9
   disable: false
   encoding: null
   extlibs: []
   forcevercode: false
   forceversion: false
-  gradle: true
+  gradle:
+  - 'yes'
   gradleprops: []
   init: ''
   kivy: false
@@ -875,14 +898,16 @@ builds:
 - androidupdate: []
   antcommands: []
   build: ''
-  buildjni: true
+  buildjni:
+  - 'yes'
   commit: v2.9.1
   disable: false
   encoding: null
   extlibs: []
   forcevercode: false
   forceversion: false
-  gradle: true
+  gradle:
+  - 'yes'
   gradleprops: []
   init: ''
   kivy: false
@@ -907,14 +932,16 @@ builds:
 - androidupdate: []
   antcommands: []
   build: ''
-  buildjni: true
+  buildjni:
+  - 'yes'
   commit: v2.9.2
   disable: false
   encoding: null
   extlibs: []
   forcevercode: false
   forceversion: false
-  gradle: true
+  gradle:
+  - 'yes'
   gradleprops: []
   init: ''
   kivy: false
@@ -939,14 +966,16 @@ builds:
 - androidupdate: []
   antcommands: []
   build: ''
-  buildjni: true
+  buildjni:
+  - 'yes'
   commit: v3.0
   disable: false
   encoding: null
   extlibs: []
   forcevercode: false
   forceversion: false
-  gradle: true
+  gradle:
+  - 'yes'
   gradleprops: []
   init: ''
   kivy: false
diff --git a/tests/metadata/dump/org.videolan.vlc.yaml b/tests/metadata/dump/org.videolan.vlc.yaml
index 801b56f7..aa51aab8 100644
--- a/tests/metadata/dump/org.videolan.vlc.yaml
+++ b/tests/metadata/dump/org.videolan.vlc.yaml
@@ -63,7 +63,7 @@ builds:
   - ../java-libs/ActionBarSherlock
   antcommands: []
   build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release
-  buildjni: false
+  buildjni: []
   commit: 0.0.11
   disable: false
   encoding: null
@@ -97,7 +97,7 @@ builds:
   - ../java-libs/ActionBarSherlock
   antcommands: []
   build: cd ../ && ANDROID_ABI=armeabi ./compile.sh release
-  buildjni: false
+  buildjni: []
   commit: 0.0.11
   disable: false
   encoding: null
@@ -131,7 +131,7 @@ builds:
   - ../java-libs/ActionBarSherlock
   antcommands: []
   build: cd ../ && ANDROID_ABI=x86 ./compile.sh release
-  buildjni: false
+  buildjni: []
   commit: unknown - see disabled
   disable: ffmpeg error 0.0.11
   encoding: null
@@ -165,7 +165,7 @@ builds:
   - ../java-libs/ActionBarSherlock
   antcommands: []
   build: cd ../ && ANDROID_ABI=mips ./compile.sh release
-  buildjni: false
+  buildjni: []
   commit: 0.0.11
   disable: false
   encoding: null
@@ -196,7 +196,7 @@ builds:
 - androidupdate: []
   antcommands: []
   build: cd ../ && ANDROID_ABI=mips ./compile.sh release
-  buildjni: false
+  buildjni: []
   commit: 0.1.3
   disable: build failing (at 0.1.3)
   encoding: null
@@ -229,7 +229,7 @@ builds:
 - androidupdate: []
   antcommands: []
   build: cd ../ && ANDROID_ABI=x86 ./compile.sh release
-  buildjni: false
+  buildjni: []
   commit: 0.1.3
   disable: false
   encoding: null
@@ -262,7 +262,7 @@ builds:
 - androidupdate: []
   antcommands: []
   build: cd ../ && ANDROID_ABI=armeabi ./compile.sh release
-  buildjni: false
+  buildjni: []
   commit: 0.1.3
   disable: false
   encoding: null
@@ -295,7 +295,7 @@ builds:
 - androidupdate: []
   antcommands: []
   build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release
-  buildjni: false
+  buildjni: []
   commit: 0.1.3
   disable: false
   encoding: null
@@ -328,7 +328,7 @@ builds:
 - androidupdate: []
   antcommands: []
   build: cd ../ && ANDROID_ABI=x86 ./compile.sh release
-  buildjni: false
+  buildjni: []
   commit: 0.9.0
   disable: false
   encoding: null
@@ -360,7 +360,7 @@ builds:
 - androidupdate: []
   antcommands: []
   build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release
-  buildjni: false
+  buildjni: []
   commit: 0.9.0
   disable: false
   encoding: null
@@ -392,7 +392,7 @@ builds:
 - androidupdate: []
   antcommands: []
   build: cd ../ && ANDROID_ABI=x86 ./compile.sh release
-  buildjni: false
+  buildjni: []
   commit: 0.9.1
   disable: false
   encoding: null
@@ -424,7 +424,7 @@ builds:
 - androidupdate: []
   antcommands: []
   build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release
-  buildjni: false
+  buildjni: []
   commit: 0.9.1
   disable: false
   encoding: null
@@ -456,7 +456,7 @@ builds:
 - androidupdate: []
   antcommands: []
   build: cd ../ && ANDROID_ABI=x86 ./compile.sh release
-  buildjni: false
+  buildjni: []
   commit: 0.9.5
   disable: can't download gmp
   encoding: null
@@ -488,7 +488,7 @@ builds:
 - androidupdate: []
   antcommands: []
   build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release
-  buildjni: false
+  buildjni: []
   commit: 0.9.5
   disable: can't download gmp
   encoding: null
@@ -520,7 +520,7 @@ builds:
 - androidupdate: []
   antcommands: []
   build: cd ../ && ANDROID_ABI=x86 ./compile.sh release
-  buildjni: false
+  buildjni: []
   commit: 0.9.6
   disable: false
   encoding: null
@@ -552,7 +552,7 @@ builds:
 - androidupdate: []
   antcommands: []
   build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release
-  buildjni: false
+  buildjni: []
   commit: 0.9.6
   disable: false
   encoding: null
@@ -584,7 +584,7 @@ builds:
 - androidupdate: []
   antcommands: []
   build: cd ../ && ANDROID_ABI=x86 ./compile.sh release
-  buildjni: false
+  buildjni: []
   commit: 0.9.7
   disable: false
   encoding: null
@@ -616,7 +616,7 @@ builds:
 - androidupdate: []
   antcommands: []
   build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release
-  buildjni: false
+  buildjni: []
   commit: 0.9.7
   disable: false
   encoding: null
@@ -648,7 +648,7 @@ builds:
 - androidupdate: []
   antcommands: []
   build: cd ../ && ANDROID_ABI=mips ./compile.sh release
-  buildjni: false
+  buildjni: []
   commit: 0.9.7.1
   disable: build fails
   encoding: null
@@ -680,7 +680,7 @@ builds:
 - androidupdate: []
   antcommands: []
   build: cd ../ && ANDROID_ABI=x86 ./compile.sh release
-  buildjni: false
+  buildjni: []
   commit: 0.9.7.1
   disable: false
   encoding: null
@@ -712,7 +712,7 @@ builds:
 - androidupdate: []
   antcommands: []
   build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release
-  buildjni: false
+  buildjni: []
   commit: 0.9.7.1
   disable: false
   encoding: null
@@ -744,7 +744,7 @@ builds:
 - androidupdate: []
   antcommands: []
   build: cd ../ && ANDROID_ABI=x86 ./compile.sh release
-  buildjni: false
+  buildjni: []
   commit: 0.9.8
   disable: false
   encoding: null
@@ -776,7 +776,7 @@ builds:
 - androidupdate: []
   antcommands: []
   build: cd ../ && ANDROID_ABI=armeabi ./compile.sh release
-  buildjni: false
+  buildjni: []
   commit: 0.9.8
   disable: false
   encoding: null
@@ -808,7 +808,7 @@ builds:
 - androidupdate: []
   antcommands: []
   build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release
-  buildjni: false
+  buildjni: []
   commit: 0.9.8
   disable: false
   encoding: null
@@ -840,7 +840,7 @@ builds:
 - androidupdate: []
   antcommands: []
   build: cd ../ && ANDROID_ABI=x86 ./compile.sh release
-  buildjni: false
+  buildjni: []
   commit: 0.9.9
   disable: false
   encoding: null
@@ -872,7 +872,7 @@ builds:
 - androidupdate: []
   antcommands: []
   build: cd ../ && ANDROID_ABI=armeabi ./compile.sh release
-  buildjni: false
+  buildjni: []
   commit: 0.9.9
   disable: false
   encoding: null
@@ -904,7 +904,7 @@ builds:
 - androidupdate: []
   antcommands: []
   build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release
-  buildjni: false
+  buildjni: []
   commit: 0.9.9
   disable: false
   encoding: null
@@ -936,7 +936,7 @@ builds:
 - androidupdate: []
   antcommands: []
   build: cd ../ && ANDROID_ABI=x86 ./compile.sh release
-  buildjni: false
+  buildjni: []
   commit: 0.9.10
   disable: false
   encoding: null
@@ -968,7 +968,7 @@ builds:
 - androidupdate: []
   antcommands: []
   build: cd ../ && ANDROID_ABI=armeabi ./compile.sh release
-  buildjni: false
+  buildjni: []
   commit: 0.9.10
   disable: false
   encoding: null
@@ -1000,7 +1000,7 @@ builds:
 - androidupdate: []
   antcommands: []
   build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release
-  buildjni: false
+  buildjni: []
   commit: 0.9.10
   disable: false
   encoding: null
@@ -1032,7 +1032,7 @@ builds:
 - androidupdate: []
   antcommands: []
   build: cd ../ && ANDROID_ABI=x86 ./compile.sh release
-  buildjni: false
+  buildjni: []
   commit: 1.0.0
   disable: doesn't build
   encoding: null
@@ -1064,7 +1064,7 @@ builds:
 - androidupdate: []
   antcommands: []
   build: cd ../ && ANDROID_ABI=armeabi ./compile.sh release
-  buildjni: false
+  buildjni: []
   commit: 1.0.0
   disable: doesn't build
   encoding: null
@@ -1096,7 +1096,7 @@ builds:
 - androidupdate: []
   antcommands: []
   build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release
-  buildjni: false
+  buildjni: []
   commit: 1.0.0
   disable: doesn't build
   encoding: null
@@ -1128,7 +1128,7 @@ builds:
 - androidupdate: []
   antcommands: []
   build: cd ../ && ANDROID_ABI=x86 ./compile.sh release
-  buildjni: false
+  buildjni: []
   commit: 1.0.1
   disable: false
   encoding: null
@@ -1160,7 +1160,7 @@ builds:
 - androidupdate: []
   antcommands: []
   build: cd ../ && ANDROID_ABI=armeabi ./compile.sh release
-  buildjni: false
+  buildjni: []
   commit: 1.0.1
   disable: false
   encoding: null
@@ -1192,7 +1192,7 @@ builds:
 - androidupdate: []
   antcommands: []
   build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release
-  buildjni: false
+  buildjni: []
   commit: 1.0.1
   disable: false
   encoding: null
@@ -1224,7 +1224,7 @@ builds:
 - androidupdate: []
   antcommands: []
   build: cd ../ && ./compile.sh -a "armeabi" --release
-  buildjni: false
+  buildjni: []
   commit: 1.1.3
   disable: false
   encoding: null
@@ -1258,7 +1258,7 @@ builds:
 - androidupdate: []
   antcommands: []
   build: cd ../ && ./compile.sh -a "armeabi-v7a" --release
-  buildjni: false
+  buildjni: []
   commit: 1.1.3
   disable: false
   encoding: null
@@ -1292,7 +1292,7 @@ builds:
 - androidupdate: []
   antcommands: []
   build: cd ../ && ./compile.sh -a "x86" --release
-  buildjni: false
+  buildjni: []
   commit: 1.1.3
   disable: false
   encoding: null
@@ -1326,7 +1326,7 @@ builds:
 - androidupdate: []
   antcommands: []
   build: cd ../ && ./compile.sh -a "armeabi" --release
-  buildjni: false
+  buildjni: []
   commit: 1.1.5
   disable: false
   encoding: null
@@ -1360,7 +1360,7 @@ builds:
 - androidupdate: []
   antcommands: []
   build: cd ../ && ./compile.sh -a "armeabi-v7a" --release
-  buildjni: false
+  buildjni: []
   commit: 1.1.5
   disable: false
   encoding: null
@@ -1394,7 +1394,7 @@ builds:
 - androidupdate: []
   antcommands: []
   build: cd ../ && ./compile.sh -a "x86" --release
-  buildjni: false
+  buildjni: []
   commit: 1.1.5
   disable: false
   encoding: null
@@ -1428,7 +1428,7 @@ builds:
 - androidupdate: []
   antcommands: []
   build: cd ../ && ./compile.sh -a "armeabi" --release
-  buildjni: false
+  buildjni: []
   commit: 1.1.6
   disable: false
   encoding: null
@@ -1462,7 +1462,7 @@ builds:
 - androidupdate: []
   antcommands: []
   build: cd ../ && ./compile.sh -a "armeabi-v7a" --release
-  buildjni: false
+  buildjni: []
   commit: 1.1.6
   disable: false
   encoding: null
@@ -1496,7 +1496,7 @@ builds:
 - androidupdate: []
   antcommands: []
   build: cd ../ && ./compile.sh -a "x86" --release
-  buildjni: false
+  buildjni: []
   commit: 1.1.6
   disable: false
   encoding: null
@@ -1530,7 +1530,7 @@ builds:
 - androidupdate: []
   antcommands: []
   build: cd ../ && ./compile.sh -a "armeabi" --release
-  buildjni: false
+  buildjni: []
   commit: 1.2.0
   disable: false
   encoding: null
@@ -1564,7 +1564,7 @@ builds:
 - androidupdate: []
   antcommands: []
   build: cd ../ && ./compile.sh -a "armeabi-v7a" --release
-  buildjni: false
+  buildjni: []
   commit: 1.2.0
   disable: false
   encoding: null
@@ -1598,7 +1598,7 @@ builds:
 - androidupdate: []
   antcommands: []
   build: cd ../ && ./compile.sh -a "x86" --release
-  buildjni: false
+  buildjni: []
   commit: 1.2.0
   disable: false
   encoding: null
@@ -1632,7 +1632,7 @@ builds:
 - androidupdate: []
   antcommands: []
   build: cd ../ && ./compile.sh -a "armeabi" --release
-  buildjni: false
+  buildjni: []
   commit: 1.2.1
   disable: false
   encoding: null
@@ -1666,7 +1666,7 @@ builds:
 - androidupdate: []
   antcommands: []
   build: cd ../ && ./compile.sh -a "armeabi-v7a" --release
-  buildjni: false
+  buildjni: []
   commit: 1.2.1
   disable: false
   encoding: null
@@ -1700,7 +1700,7 @@ builds:
 - androidupdate: []
   antcommands: []
   build: cd ../ && ./compile.sh -a "x86" --release
-  buildjni: false
+  buildjni: []
   commit: 1.2.1
   disable: false
   encoding: null
@@ -1734,7 +1734,7 @@ builds:
 - androidupdate: []
   antcommands: []
   build: cd ../ && ./compile.sh -a "armeabi" --release
-  buildjni: false
+  buildjni: []
   commit: 1.2.2
   disable: false
   encoding: null
@@ -1768,7 +1768,7 @@ builds:
 - androidupdate: []
   antcommands: []
   build: cd ../ && ./compile.sh -a "armeabi-v7a" --release
-  buildjni: false
+  buildjni: []
   commit: 1.2.2
   disable: false
   encoding: null
@@ -1802,7 +1802,7 @@ builds:
 - androidupdate: []
   antcommands: []
   build: cd ../ && ./compile.sh -a "x86" --release
-  buildjni: false
+  buildjni: []
   commit: 1.2.2
   disable: false
   encoding: null
@@ -1836,7 +1836,7 @@ builds:
 - androidupdate: []
   antcommands: []
   build: cd ../ && ./compile.sh -a "armeabi" --release
-  buildjni: false
+  buildjni: []
   commit: 1.2.3
   disable: false
   encoding: null
@@ -1870,7 +1870,7 @@ builds:
 - androidupdate: []
   antcommands: []
   build: cd ../ && ./compile.sh -a "armeabi-v7a" --release
-  buildjni: false
+  buildjni: []
   commit: 1.2.3
   disable: false
   encoding: null
@@ -1904,7 +1904,7 @@ builds:
 - androidupdate: []
   antcommands: []
   build: cd ../ && ./compile.sh -a "x86" --release
-  buildjni: false
+  buildjni: []
   commit: 1.2.3
   disable: false
   encoding: null
@@ -1938,7 +1938,7 @@ builds:
 - androidupdate: []
   antcommands: []
   build: cd ../ && ./compile.sh -a "armeabi" --release
-  buildjni: false
+  buildjni: []
   commit: 1.2.4
   disable: false
   encoding: null
@@ -1972,7 +1972,7 @@ builds:
 - androidupdate: []
   antcommands: []
   build: cd ../ && ./compile.sh -a "armeabi-v7a" --release
-  buildjni: false
+  buildjni: []
   commit: 1.2.4
   disable: false
   encoding: null
@@ -2006,7 +2006,7 @@ builds:
 - androidupdate: []
   antcommands: []
   build: cd ../ && ./compile.sh -a "x86" --release
-  buildjni: false
+  buildjni: []
   commit: 1.2.4
   disable: false
   encoding: null
@@ -2040,7 +2040,7 @@ builds:
 - androidupdate: []
   antcommands: []
   build: cd ../ && ./compile.sh -a "armeabi" --release
-  buildjni: false
+  buildjni: []
   commit: 1.2.5
   disable: false
   encoding: null
@@ -2074,7 +2074,7 @@ builds:
 - androidupdate: []
   antcommands: []
   build: cd ../ && ./compile.sh -a "armeabi-v7a" --release
-  buildjni: false
+  buildjni: []
   commit: 1.2.5
   disable: false
   encoding: null
@@ -2108,7 +2108,7 @@ builds:
 - androidupdate: []
   antcommands: []
   build: cd ../ && ./compile.sh -a "x86" --release
-  buildjni: false
+  buildjni: []
   commit: 1.2.5
   disable: false
   encoding: null
@@ -2142,7 +2142,7 @@ builds:
 - androidupdate: []
   antcommands: []
   build: cd ../ && ./compile.sh -a "armeabi" --release
-  buildjni: false
+  buildjni: []
   commit: 1.2.6
   disable: false
   encoding: null
@@ -2176,7 +2176,7 @@ builds:
 - androidupdate: []
   antcommands: []
   build: cd ../ && ./compile.sh -a "armeabi-v7a" --release
-  buildjni: false
+  buildjni: []
   commit: 1.2.6
   disable: false
   encoding: null
@@ -2210,7 +2210,7 @@ builds:
 - androidupdate: []
   antcommands: []
   build: cd ../ && ./compile.sh -a "x86" --release
-  buildjni: false
+  buildjni: []
   commit: 1.2.6
   disable: false
   encoding: null
diff --git a/tests/metadata/org.videolan.vlc.yml b/tests/metadata/org.videolan.vlc.yml
index 67b0d297..7d38ecce 100644
--- a/tests/metadata/org.videolan.vlc.yml
+++ b/tests/metadata/org.videolan.vlc.yml
@@ -43,9 +43,7 @@ builds:
       - .
       - ../java-libs/SlidingMenu
       - ../java-libs/ActionBarSherlock
-    build: |
-      cd ../ && \
-      ANDROID_ABI=armeabi ./compile.sh release
+    build: cd ../ && ANDROID_ABI=armeabi ./compile.sh release
     buildjni: no
 
   - versionName: 0.0.11-x86
@@ -60,9 +58,7 @@ builds:
       - .
       - ../java-libs/SlidingMenu
       - ../java-libs/ActionBarSherlock
-    build: |
-      cd ../ && \
-      ANDROID_ABI=x86 ./compile.sh release
+    build: cd ../ && ANDROID_ABI=x86 ./compile.sh release
     buildjni: no
 
   - versionName: 0.0.11-mips
@@ -76,9 +72,7 @@ builds:
       - .
       - ../java-libs/SlidingMenu
       - ../java-libs/ActionBarSherlock
-    build: >
-      cd ../ && \
-      ANDROID_ABI=mips ./compile.sh release
+    build: cd ../ && ANDROID_ABI=mips ./compile.sh release
     buildjni: no
 
   - versionName: 0.1.3-MIPS
@@ -90,11 +84,8 @@ builds:
     srclibs: VLC@7c52aacbe
     forceversion: yes
     forcevercode: yes
-    prebuild: sed -i '/ant/d' ../Makefile && \
-        ln -s vlc-android/$$VLC$$ ../vlc
-    build: |
-      cd ../ && \
-      ANDROID_ABI=mips ./compile.sh release
+    prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC$$ ../vlc
+    build: cd ../ && ANDROID_ABI=mips ./compile.sh release
     buildjni: no
 
   - versionName: 0.1.3-x86
@@ -105,8 +96,7 @@ builds:
     srclibs: VLC@7c52aacbe
     forceversion: yes
     forcevercode: yes
-    prebuild: sed -i '/ant/d' ../Makefile && \
-        ln -s vlc-android/$$VLC$$ ../vlc
+    prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC$$ ../vlc
     build: cd ../ && ANDROID_ABI=x86 ./compile.sh release
     buildjni: no
 
@@ -118,8 +108,7 @@ builds:
     srclibs: VLC@7c52aacbe
     forceversion: yes
     forcevercode: yes
-    prebuild: sed -i '/ant/d' ../Makefile && \
-        ln -s vlc-android/$$VLC$$ ../vlc
+    prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC$$ ../vlc
     build: cd ../ && ANDROID_ABI=armeabi ./compile.sh release
     buildjni: no
 
@@ -131,8 +120,7 @@ builds:
     srclibs: VLC@7c52aacbe
     forceversion: yes
     forcevercode: yes
-    prebuild: sed -i '/ant/d' ../Makefile && \
-        ln -s vlc-android/$$VLC$$ ../vlc
+    prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC$$ ../vlc
     build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release
     buildjni: no
 
@@ -142,8 +130,7 @@ builds:
     subdir: vlc-android
     srclibs: VLC@31ffb20309264994
     forcevercode: yes
-    prebuild: sed -i '/ant/d' ../Makefile && \
-        ln -s vlc-android/$$VLC$$ ../vlc
+    prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC$$ ../vlc
     build: cd ../ && ANDROID_ABI=x86 ./compile.sh release
     buildjni: no
 
@@ -153,8 +140,7 @@ builds:
     subdir: vlc-android
     srclibs: VLC@31ffb20309264994
     forcevercode: yes
-    prebuild: sed -i '/ant/d' ../Makefile && \
-        ln -s vlc-android/$$VLC$$ ../vlc
+    prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC$$ ../vlc
     build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release
     buildjni: no
 
@@ -164,8 +150,7 @@ builds:
     subdir: vlc-android
     srclibs: VLC@37e886d113b8b567c15208579fb2f
     forcevercode: yes
-    prebuild: sed -i '/ant/d' ../Makefile && \
-        ln -s vlc-android/$$VLC$$ ../vlc
+    prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC$$ ../vlc
     build: cd ../ && ANDROID_ABI=x86 ./compile.sh release
     buildjni: no
 
@@ -175,8 +160,7 @@ builds:
     subdir: vlc-android
     srclibs: VLC@37e886d113b8b567c15208579fb2f
     forcevercode: yes
-    prebuild: sed -i '/ant/d' ../Makefile && \
-        ln -s vlc-android/$$VLC$$ ../vlc
+    prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC$$ ../vlc
     build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release
     buildjni: no
 
@@ -187,8 +171,7 @@ builds:
     subdir: vlc-android
     srclibs: VLC@052600173f376ff58ff04d53746961a2
     forcevercode: yes
-    prebuild: sed -i '/ant/d' ../Makefile && \
-        ln -s vlc-android/$$VLC$$ ../vlc
+    prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC$$ ../vlc
     build: cd ../ && ANDROID_ABI=x86 ./compile.sh release
     buildjni: no
 
@@ -199,8 +182,7 @@ builds:
     subdir: vlc-android
     srclibs: VLC@052600173f376ff58ff04d53746961a2
     forcevercode: yes
-    prebuild: sed -i '/ant/d' ../Makefile && \
-        ln -s vlc-android/$$VLC$$ ../vlc
+    prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC$$ ../vlc
     build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release
     buildjni: no
 
@@ -210,8 +192,7 @@ builds:
     subdir: vlc-android
     srclibs: VLC-2.2@27f4799
     forcevercode: yes
-    prebuild: sed -i '/ant/d' ../Makefile && \
-        ln -s vlc-android/$$VLC-2.2$$ ../vlc
+    prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc
     build: cd ../ && ANDROID_ABI=x86 ./compile.sh release
     buildjni: no
 
@@ -221,8 +202,7 @@ builds:
     subdir: vlc-android
     srclibs: VLC-2.2@27f4799
     forcevercode: yes
-    prebuild: sed -i '/ant/d' ../Makefile && \
-        ln -s vlc-android/$$VLC-2.2$$ ../vlc
+    prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc
     build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release
     buildjni: no
 
@@ -232,8 +212,7 @@ builds:
     subdir: vlc-android
     srclibs: VLC-2.2@9e1c6ff
     forcevercode: yes
-    prebuild: sed -i '/ant/d' ../Makefile && \
-        ln -s vlc-android/$$VLC-2.2$$ ../vlc
+    prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc
     build: cd ../ && ANDROID_ABI=x86 ./compile.sh release
     buildjni: no
 
@@ -243,8 +222,7 @@ builds:
     subdir: vlc-android
     srclibs: VLC-2.2@9e1c6ff
     forcevercode: yes
-    prebuild: sed -i '/ant/d' ../Makefile && \
-        ln -s vlc-android/$$VLC-2.2$$ ../vlc
+    prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc
     build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release
     buildjni: no
 
@@ -255,8 +233,7 @@ builds:
     subdir: vlc-android
     srclibs: VLC-2.2@57cd36b
     forcevercode: yes
-    prebuild: sed -i '/ant/d' ../Makefile && \
-        ln -s vlc-android/$$VLC-2.2$$ ../vlc
+    prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc
     build: cd ../ && ANDROID_ABI=mips ./compile.sh release
     buildjni: no
 
@@ -266,8 +243,7 @@ builds:
     subdir: vlc-android
     srclibs: VLC-2.2@57cd36b
     forcevercode: yes
-    prebuild: sed -i '/ant/d' ../Makefile && \
-        ln -s vlc-android/$$VLC-2.2$$ ../vlc
+    prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc
     build: cd ../ && ANDROID_ABI=x86 ./compile.sh release
     buildjni: no
 
@@ -277,8 +253,7 @@ builds:
     subdir: vlc-android
     srclibs: VLC-2.2@57cd36b
     forcevercode: yes
-    prebuild: sed -i '/ant/d' ../Makefile && \
-        ln -s vlc-android/$$VLC-2.2$$ ../vlc
+    prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc
     build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release
     buildjni: no
 
@@ -288,8 +263,7 @@ builds:
     subdir: vlc-android
     srclibs: VLC-2.2@f2db364
     forcevercode: yes
-    prebuild: sed -i '/ant/d' ../Makefile && \
-        ln -s vlc-android/$$VLC-2.2$$ ../vlc
+    prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc
     build: cd ../ && ANDROID_ABI=x86 ./compile.sh release
     buildjni: no
 
@@ -299,8 +273,7 @@ builds:
     subdir: vlc-android
     srclibs: VLC-2.2@f2db364
     forcevercode: yes
-    prebuild: sed -i '/ant/d' ../Makefile && \
-        ln -s vlc-android/$$VLC-2.2$$ ../vlc
+    prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc
     build: cd ../ && ANDROID_ABI=armeabi ./compile.sh release
     buildjni: no
 
@@ -310,8 +283,7 @@ builds:
     subdir: vlc-android
     srclibs: VLC-2.2@f2db364
     forcevercode: yes
-    prebuild: sed -i '/ant/d' ../Makefile && \
-        ln -s vlc-android/$$VLC-2.2$$ ../vlc
+    prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc
     build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release
     buildjni: no
 
@@ -321,8 +293,7 @@ builds:
     subdir: vlc-android
     srclibs: VLC-2.2@e731dc23a4f8ef6782c7cc2236bbbf41c034dad1
     forcevercode: yes
-    prebuild: sed -i '/ant/d' ../Makefile && \
-        ln -s vlc-android/$$VLC-2.2$$ ../vlc
+    prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc
     build: cd ../ && ANDROID_ABI=x86 ./compile.sh release
     buildjni: no
 
@@ -332,8 +303,7 @@ builds:
     subdir: vlc-android
     srclibs: VLC-2.2@e731dc23a4f8ef6782c7cc2236bbbf41c034dad1
     forcevercode: yes
-    prebuild: sed -i '/ant/d' ../Makefile && \
-        ln -s vlc-android/$$VLC-2.2$$ ../vlc
+    prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc
     build: cd ../ && ANDROID_ABI=armeabi ./compile.sh release
     buildjni: no
 
@@ -343,8 +313,7 @@ builds:
     subdir: vlc-android
     srclibs: VLC-2.2@e731dc23a4f8ef6782c7cc2236bbbf41c034dad1
     forcevercode: yes
-    prebuild: sed -i '/ant/d' ../Makefile && \
-        ln -s vlc-android/$$VLC-2.2$$ ../vlc
+    prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc
     build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release
     buildjni: no
 
@@ -354,8 +323,7 @@ builds:
     subdir: vlc-android
     srclibs: VLC-2.2@e33e5de
     forcevercode: yes
-    prebuild: sed -i '/ant/d' ../Makefile && \
-        ln -s vlc-android/$$VLC-2.2$$ ../vlc
+    prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc
     build: cd ../ && ANDROID_ABI=x86 ./compile.sh release
     buildjni: no
 
@@ -365,8 +333,7 @@ builds:
     subdir: vlc-android
     srclibs: VLC-2.2@e33e5de
     forcevercode: yes
-    prebuild: sed -i '/ant/d' ../Makefile && \
-        ln -s vlc-android/$$VLC-2.2$$ ../vlc
+    prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc
     build: cd ../ && ANDROID_ABI=armeabi ./compile.sh release
     buildjni: no
 
@@ -376,8 +343,7 @@ builds:
     subdir: vlc-android
     srclibs: VLC-2.2@e33e5de
     forcevercode: yes
-    prebuild: sed -i '/ant/d' ../Makefile && \
-        ln -s vlc-android/$$VLC-2.2$$ ../vlc
+    prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc
     build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release
     buildjni: no
 
@@ -389,8 +355,7 @@ builds:
     subdir: vlc-android
     srclibs: VLC-2.2@036010e
     forcevercode: yes
-    prebuild: sed -i '/ant/d' ../Makefile && \
-        ln -s vlc-android/$$VLC-2.2$$ ../vlc
+    prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc
     build: cd ../ && ANDROID_ABI=x86 ./compile.sh release
     buildjni: no
 
@@ -402,8 +367,7 @@ builds:
     subdir: vlc-android
     srclibs: VLC-2.2@036010e
     forcevercode: yes
-    prebuild: sed -i '/ant/d' ../Makefile && \
-        ln -s vlc-android/$$VLC-2.2$$ ../vlc
+    prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc
     build: cd ../ && ANDROID_ABI=armeabi ./compile.sh release
     buildjni: no
 
@@ -415,8 +379,7 @@ builds:
     subdir: vlc-android
     srclibs: VLC-2.2@036010e
     forcevercode: yes
-    prebuild: sed -i '/ant/d' ../Makefile && \
-        ln -s vlc-android/$$VLC-2.2$$ ../vlc
+    prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc
     build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release
     buildjni: no
 
@@ -426,8 +389,7 @@ builds:
     subdir: vlc-android
     srclibs: VLC-2.2@59409d5
     forcevercode: yes
-    prebuild: sed -i '/ant/d' ../Makefile && \
-        ln -s vlc-android/$$VLC-2.2$$ ../vlc
+    prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc
     build: cd ../ && ANDROID_ABI=x86 ./compile.sh release
     buildjni: no
 
@@ -437,8 +399,7 @@ builds:
     subdir: vlc-android
     srclibs: VLC-2.2@59409d5
     forcevercode: yes
-    prebuild: sed -i '/ant/d' ../Makefile && \
-        ln -s vlc-android/$$VLC-2.2$$ ../vlc
+    prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc
     build: cd ../ && ANDROID_ABI=armeabi ./compile.sh release
     buildjni: no
 
@@ -448,8 +409,7 @@ builds:
     subdir: vlc-android
     srclibs: VLC-2.2@59409d5
     forcevercode: yes
-    prebuild: sed -i '/ant/d' ../Makefile && \
-        ln -s vlc-android/$$VLC-2.2$$ ../vlc
+    prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc
     build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release
     buildjni: no