From: Hans-Christoph Steiner Date: Tue, 29 Nov 2016 12:26:32 +0000 (+0100) Subject: convert metadata.Build to a subclass of dict X-Git-Tag: 0.8~121^2~6 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=c0bc3afda9d67a826471df2f387ab1b489df04e0;p=fdroidserver.git convert metadata.Build to a subclass of dict Like with the App class in the commit before, this makes it a lot easier to work with this data when converting between the internal formats and external formats like YAML, JSON, MsgPack, protobuf, etc. The one unfortunate thing here is Build.update. It becomes dict.update(), which is a method not an attribute. build.get('update') or build['update'] could be used, but that would be oddly inconsistent. So instead the field is renamed to 'androidupdate', except for in the .txt v0 metadata files. This better describes what field does anyway, since it runs `android update`. Build.update is only referenced in two places right next to each other for the ant builds, so this change still seems worthwhile. --- diff --git a/fdroidserver/common.py b/fdroidserver/common.py index daacc89d..dd11a57a 100644 --- a/fdroidserver/common.py +++ b/fdroidserver/common.py @@ -1544,15 +1544,15 @@ def prepare_source(vcs, app, build, build_dir, srclib_dir, extlib_dir, onserver= (app.id, build.version), p.output) # Generate (or update) the ant build file, build.xml... - if build.build_method() == 'ant' and build.update != ['no']: + if build.build_method() == 'ant' and build.androidupdate != ['no']: parms = ['android', 'update', 'lib-project'] lparms = ['android', 'update', 'project'] if build.target: parms += ['-t', build.target] lparms += ['-t', build.target] - if build.update: - update_dirs = build.update + if build.androidupdate: + update_dirs = build.androidupdate else: update_dirs = ant_subprojects(root_dir) + ['.'] diff --git a/fdroidserver/metadata.py b/fdroidserver/metadata.py index 2b091e2c..6d9d9e0e 100644 --- a/fdroidserver/metadata.py +++ b/fdroidserver/metadata.py @@ -25,7 +25,6 @@ import cgi import logging import textwrap import io -import pprint import yaml # use libyaml if it is available @@ -242,9 +241,10 @@ build_flags_order = [ build_flags = set(build_flags_order + ['version', 'vercode']) -class Build(): +class Build(dict): def __init__(self, copydict=None): + super().__init__() self.disable = False self.commit = None self.subdir = None @@ -263,7 +263,7 @@ class Build(): self.rm = [] self.extlibs = [] self.prebuild = '' - self.update = [] + self.androidupdate = [] self.target = None self.scanignore = [] self.scandelete = [] @@ -274,45 +274,28 @@ class Build(): self.gradleprops = [] self.antcommands = [] self.novcheck = False + if copydict: + super().__init__(copydict) + return - self._modified = set() + def __getattr__(self, name): + if name in self: + return self[name] + else: + raise AttributeError("No such attribute: " + name) - if copydict: - for k, v in copydict.items(): - self.set_flag(k, v) + def __setattr__(self, name, value): + self[name] = value - def __str__(self): - return pprint.pformat(self.__dict__) - - def __repr__(self): - return self.__str__() - - def get_flag(self, f): - if f not in build_flags: - warn_or_exception('Unrecognised build flag: ' + f) - return getattr(self, f) - - def set_flag(self, f, v): - if f == 'versionName': - f = 'version' - if f == 'versionCode': - f = 'vercode' - if f not in build_flags: - warn_or_exception('Unrecognised build flag: ' + f) - self.__dict__[f] = v - self._modified.add(f) - - def append_flag(self, f, v): - if f not in build_flags: - warn_or_exception('Unrecognised build flag: ' + f) - if f not in self.__dict__: - self.__dict__[f] = [v] + def __delattr__(self, name): + if name in self: + del self[name] else: - self.__dict__[f].append(v) + raise AttributeError("No such attribute: " + name) def build_method(self): for f in ['maven', 'gradle', 'kivy']: - if self.get_flag(f): + if self.get(f): return f if self.output: return 'raw' @@ -323,7 +306,7 @@ class Build(): if self.output: return 'raw' for f in ['maven', 'gradle', 'kivy']: - if self.get_flag(f): + if self.get(f): return f return 'ant' @@ -336,10 +319,6 @@ class Build(): return '' return paths[version] - def update_flags(self, d): - for f, v in d.items(): - self.set_flag(f, v) - flagtypes = { 'extlibs': TYPE_LIST, @@ -348,7 +327,7 @@ flagtypes = { 'rm': TYPE_LIST, 'buildjni': TYPE_LIST, 'preassemble': TYPE_LIST, - 'update': TYPE_LIST, + 'androidupdate': TYPE_LIST, 'scanignore': TYPE_LIST, 'scandelete': TYPE_LIST, 'gradle': TYPE_LIST, @@ -982,14 +961,16 @@ def parse_txt_metadata(mf, app): pk, pv = bv pk = pk.lstrip() + if pk == 'update': + pk = 'androidupdate' # avoid conflicting with Build(dict).update() t = flagtype(pk) if t == TYPE_LIST: pv = split_list_values(pv) - build.set_flag(pk, pv) + build[pk] = pv elif t == TYPE_STRING or t == TYPE_SCRIPT: - build.set_flag(pk, pv) + build[pk] = pv elif t == TYPE_BOOL: - build.set_flag(pk, _decode_bool(pv)) + build[pk] = _decode_bool(pv) def parse_buildline(lines): v = "".join(lines) @@ -1231,7 +1212,7 @@ def write_plaintext_metadata(mf, app, w_comment, w_field, w_build): if build.version == "Ignore": continue - w_comments('build:' + build.vercode) + w_comments('build:%s' % build.vercode) w_build(build) mf.write('\n') @@ -1276,11 +1257,13 @@ def write_txt(mf, app): mf.write("Build:%s,%s\n" % (build.version, build.vercode)) for f in build_flags_order: - v = build.get_flag(f) + v = build.get(f) if not v: continue t = flagtype(f) + if f == 'androidupdate': + f == 'update' # avoid conflicting with Build(dict).update() mf.write(' %s=' % f) if t == TYPE_STRING: mf.write(v) @@ -1357,7 +1340,7 @@ def write_yaml(mf, app): w_field('versionName', build.version, ' - ', TYPE_STRING) w_field('versionCode', build.vercode, ' ', TYPE_STRING) for f in build_flags_order: - v = build.get_flag(f) + v = build.get(f) if not v: continue diff --git a/tests/metadata.TestCase b/tests/metadata.TestCase index 010117af..791ac652 100755 --- a/tests/metadata.TestCase +++ b/tests/metadata.TestCase @@ -23,6 +23,11 @@ class MetadataTest(unittest.TestCase): '''fdroidserver/metadata.py''' def test_read_metadata(self): + + def _build_yaml_representer(dumper, data): + '''Creates a YAML representation of a Build instance''' + return dumper.represent_dict(data) + testsdir = os.path.dirname(__file__) os.chdir(testsdir) @@ -46,6 +51,7 @@ class MetadataTest(unittest.TestCase): self.assertEqual(frommeta, frompickle) # Uncomment to overwrite # with open(savepath, 'w') as f: + # yaml.add_representer(fdroidserver.metadata.Build, _build_yaml_representer) # yaml.dump(frommeta, f, default_flow_style=False) diff --git a/tests/metadata/dump/org.adaway.yaml b/tests/metadata/dump/org.adaway.yaml index a643fa95..e3b87a96 100644 --- a/tests/metadata/dump/org.adaway.yaml +++ b/tests/metadata/dump/org.adaway.yaml @@ -58,10 +58,10 @@ VercodeOperation: null WebSite: http://sufficientlysecure.org/index.php/adaway added: null builds: -- antcommands: [] +- androidupdate: [] + antcommands: [] build: '' - buildjni: - - 'yes' + buildjni: true commit: ea5378a94ee0dc1d99d2cec95fae7e6d81afb2b9 disable: false encoding: null @@ -87,13 +87,12 @@ builds: subdir: org_adaway/ submodules: false target: null - update: [] vercode: '13' version: '1.12' -- antcommands: [] +- androidupdate: [] + antcommands: [] build: '' - buildjni: - - 'yes' + buildjni: true commit: 4128e59da2eac5c2904c7c7568d298ca51e79540 disable: false encoding: null @@ -120,13 +119,12 @@ builds: subdir: org_adaway/ submodules: false target: null - update: [] vercode: '16' version: '1.15' -- antcommands: [] +- androidupdate: [] + antcommands: [] build: '' - buildjni: - - 'yes' + buildjni: true commit: 0b9985398b9eef7baf6aadd0dbb12002bc199d2e disable: false encoding: null @@ -153,13 +151,12 @@ builds: subdir: org_adaway/ submodules: false target: null - update: [] vercode: '19' version: '1.18' -- antcommands: [] +- androidupdate: [] + antcommands: [] build: '' - buildjni: - - 'yes' + buildjni: true commit: ab27f4dab5f3ea5e228cfb4a6b0e1fbf53695f22 disable: false encoding: null @@ -186,13 +183,12 @@ builds: subdir: org_adaway/ submodules: false target: null - update: [] vercode: '20' version: '1.19' -- antcommands: [] +- androidupdate: [] + antcommands: [] build: '' - buildjni: - - 'yes' + buildjni: true commit: 695e3801e4081026c8f7213a2345fc451d5eb89c disable: false encoding: null @@ -219,13 +215,12 @@ builds: subdir: org_adaway/ submodules: false target: null - update: [] vercode: '21' version: '1.20' -- antcommands: [] +- androidupdate: [] + antcommands: [] build: '' - buildjni: - - 'yes' + buildjni: true commit: 65138c11cc8b6affd28b68e125fbc1dff0886a4e disable: false encoding: null @@ -252,10 +247,10 @@ builds: subdir: org_adaway/ submodules: false target: null - update: [] vercode: '22' version: '1.21' -- antcommands: [] +- androidupdate: [] + antcommands: [] build: '' buildjni: [] commit: unknown - see disabled @@ -283,13 +278,12 @@ builds: subdir: null submodules: false target: null - update: [] vercode: '24' version: '1.23' -- antcommands: [] +- androidupdate: [] + antcommands: [] build: '' - buildjni: - - 'yes' + buildjni: true commit: f811e53e1e1d2ee047b18715fd7d2072b90ae76b disable: false encoding: null @@ -315,13 +309,12 @@ builds: subdir: org_adaway/ submodules: false target: null - update: [] vercode: '25' version: '1.24' -- antcommands: [] +- androidupdate: [] + antcommands: [] build: '' - buildjni: - - 'yes' + buildjni: true commit: ff97932761cdee68638dc2550751a64b2cbe18e7 disable: false encoding: null @@ -347,13 +340,12 @@ builds: subdir: org_adaway/ submodules: false target: null - update: [] vercode: '26' version: '1.25' -- antcommands: [] +- androidupdate: [] + antcommands: [] build: '' - buildjni: - - 'yes' + buildjni: true commit: 33d4d80998f30bafc88c04c80cbae00b03916f99 disable: false encoding: null @@ -379,13 +371,12 @@ builds: subdir: org_adaway/ submodules: false target: null - update: [] vercode: '27' version: '1.26' -- antcommands: [] +- androidupdate: [] + antcommands: [] build: '' - buildjni: - - 'yes' + buildjni: true commit: 743d25a7e287505461f33f4b8e57e4cf988fffea disable: false encoding: null @@ -411,13 +402,12 @@ builds: subdir: org_adaway/ submodules: false target: null - update: [] vercode: '28' version: '1.27' -- antcommands: [] +- androidupdate: [] + antcommands: [] build: '' - buildjni: - - 'yes' + buildjni: true commit: eaa07f4 disable: false encoding: null @@ -443,10 +433,10 @@ builds: subdir: org_adaway/ submodules: false target: null - update: [] vercode: '30' version: '1.29' -- antcommands: [] +- androidupdate: [] + antcommands: [] build: '' buildjni: false commit: 71ced3f @@ -475,10 +465,10 @@ builds: subdir: org_adaway/ submodules: false target: null - update: [] vercode: '33' version: '1.32' -- antcommands: [] +- androidupdate: [] + antcommands: [] build: '' buildjni: false commit: 9d63c18 @@ -506,10 +496,10 @@ builds: subdir: org_adaway/ submodules: false target: null - update: [] vercode: '34' version: '1.33' -- antcommands: [] +- androidupdate: [] + antcommands: [] build: '' buildjni: false commit: f2568b1 @@ -538,10 +528,10 @@ builds: subdir: org_adaway/ submodules: false target: null - update: [] vercode: '35' version: '1.34' -- antcommands: [] +- androidupdate: [] + antcommands: [] build: '' buildjni: false commit: 7442d5d @@ -570,10 +560,10 @@ builds: subdir: org_adaway/ submodules: false target: null - update: [] vercode: '36' version: '1.35' -- antcommands: [] +- androidupdate: [] + antcommands: [] build: '' buildjni: false commit: 83fc713 @@ -602,10 +592,10 @@ builds: subdir: org_adaway/ submodules: false target: null - update: [] vercode: '37' version: '1.36' -- antcommands: [] +- androidupdate: [] + antcommands: [] build: '' buildjni: false commit: 70da32b567122b701cdcb1609b780eb85732028f @@ -634,13 +624,16 @@ builds: subdir: org_adaway/ submodules: false target: null - update: [] vercode: '38' version: '1.37' -- antcommands: [] +- androidupdate: + - . + - android-libs/Donations + - android-libs/ActionBarSherlock + - android-libs/HtmlSpanner/htmlspanner + antcommands: [] build: '' - buildjni: - - 'yes' + buildjni: true commit: v2.1 disable: false encoding: null @@ -674,17 +667,16 @@ builds: subdir: AdAway submodules: false target: null - update: + vercode: '40' + version: '2.1' +- androidupdate: - . - android-libs/Donations - android-libs/ActionBarSherlock - android-libs/HtmlSpanner/htmlspanner - vercode: '40' - version: '2.1' -- antcommands: [] + antcommands: [] build: '' - buildjni: - - 'yes' + buildjni: true commit: v2.3 disable: false encoding: null @@ -718,25 +710,19 @@ builds: subdir: AdAway submodules: false target: null - update: - - . - - android-libs/Donations - - android-libs/ActionBarSherlock - - android-libs/HtmlSpanner/htmlspanner vercode: '42' version: '2.3' -- antcommands: [] +- androidupdate: [] + antcommands: [] build: '' - buildjni: - - 'yes' + buildjni: true commit: v2.6 disable: false encoding: null extlibs: [] forcevercode: false forceversion: false - gradle: - - 'yes' + gradle: true gradleprops: [] init: '' kivy: false @@ -756,21 +742,19 @@ builds: subdir: AdAway submodules: false target: null - update: [] vercode: '45' version: '2.6' -- antcommands: [] +- androidupdate: [] + antcommands: [] build: '' - buildjni: - - 'yes' + buildjni: true commit: v2.7 disable: false encoding: null extlibs: [] forcevercode: false forceversion: false - gradle: - - 'yes' + gradle: true gradleprops: [] init: '' kivy: false @@ -790,21 +774,19 @@ builds: subdir: AdAway submodules: false target: null - update: [] vercode: '46' version: '2.7' -- antcommands: [] +- androidupdate: [] + antcommands: [] build: '' - buildjni: - - 'yes' + buildjni: true commit: v2.8 disable: false encoding: null extlibs: [] forcevercode: false forceversion: false - gradle: - - 'yes' + gradle: true gradleprops: [] init: '' kivy: false @@ -824,21 +806,19 @@ builds: subdir: AdAway submodules: false target: null - update: [] vercode: '47' version: '2.8' -- antcommands: [] +- androidupdate: [] + antcommands: [] build: '' - buildjni: - - 'yes' + buildjni: true commit: v2.8.1 disable: false encoding: null extlibs: [] forcevercode: false forceversion: false - gradle: - - 'yes' + gradle: true gradleprops: [] init: '' kivy: false @@ -858,21 +838,19 @@ builds: subdir: AdAway submodules: false target: null - update: [] vercode: '48' version: 2.8.1 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: '' - buildjni: - - 'yes' + buildjni: true commit: v2.9 disable: false encoding: null extlibs: [] forcevercode: false forceversion: false - gradle: - - 'yes' + gradle: true gradleprops: [] init: '' kivy: false @@ -892,21 +870,19 @@ builds: subdir: AdAway submodules: false target: null - update: [] vercode: '49' version: '2.9' -- antcommands: [] +- androidupdate: [] + antcommands: [] build: '' - buildjni: - - 'yes' + buildjni: true commit: v2.9.1 disable: false encoding: null extlibs: [] forcevercode: false forceversion: false - gradle: - - 'yes' + gradle: true gradleprops: [] init: '' kivy: false @@ -926,21 +902,19 @@ builds: subdir: AdAway submodules: false target: null - update: [] vercode: '50' version: 2.9.1 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: '' - buildjni: - - 'yes' + buildjni: true commit: v2.9.2 disable: false encoding: null extlibs: [] forcevercode: false forceversion: false - gradle: - - 'yes' + gradle: true gradleprops: [] init: '' kivy: false @@ -960,21 +934,19 @@ builds: subdir: AdAway submodules: false target: null - update: [] vercode: '51' version: 2.9.2 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: '' - buildjni: - - 'yes' + buildjni: true commit: v3.0 disable: false encoding: null extlibs: [] forcevercode: false forceversion: false - gradle: - - 'yes' + gradle: true gradleprops: [] init: '' kivy: false @@ -994,7 +966,6 @@ builds: subdir: AdAway submodules: false target: null - update: [] vercode: '52' version: '3.0' comments: diff --git a/tests/metadata/dump/org.smssecure.smssecure.yaml b/tests/metadata/dump/org.smssecure.smssecure.yaml index 3c68de98..5d26d0eb 100644 --- a/tests/metadata/dump/org.smssecure.smssecure.yaml +++ b/tests/metadata/dump/org.smssecure.smssecure.yaml @@ -55,7 +55,8 @@ VercodeOperation: null WebSite: http://www.smssecure.org added: null builds: -- antcommands: [] +- androidupdate: [] + antcommands: [] build: '' buildjni: [] commit: 66367479a4f57f347b5cbe8f6f8f632adaae7727 @@ -95,10 +96,10 @@ builds: subdir: null submodules: false target: null - update: [] vercode: '5' version: 0.3.3 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: '' buildjni: [] commit: 9675ce5eecb929dcaddb43b3d9486fdb88b9ae1a @@ -130,10 +131,10 @@ builds: subdir: null submodules: true target: null - update: [] vercode: '6' version: 0.3.3 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: '' buildjni: [] commit: v0.4.2 @@ -164,10 +165,10 @@ builds: subdir: null submodules: true target: null - update: [] vercode: '9' version: 0.4.2 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: '' buildjni: [] commit: v0.5.1 @@ -198,10 +199,10 @@ builds: subdir: null submodules: true target: null - update: [] vercode: '11' version: 0.5.1 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: '' buildjni: [] commit: v0.5.2 @@ -231,10 +232,10 @@ builds: subdir: null submodules: true target: null - update: [] vercode: '12' version: 0.5.2 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: '' buildjni: [] commit: v0.5.3 @@ -264,10 +265,10 @@ builds: subdir: null submodules: true target: null - update: [] vercode: '100' version: 0.5.3 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: '' buildjni: [] commit: v0.5.4 @@ -297,10 +298,10 @@ builds: subdir: null submodules: true target: null - update: [] vercode: '101' version: 0.5.4 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: '' buildjni: [] commit: v0.6.0 @@ -330,7 +331,6 @@ builds: subdir: null submodules: true target: null - update: [] vercode: '102' version: 0.6.0 comments: {} diff --git a/tests/metadata/dump/org.videolan.vlc.yaml b/tests/metadata/dump/org.videolan.vlc.yaml index a60719f0..cf7cc6f0 100644 --- a/tests/metadata/dump/org.videolan.vlc.yaml +++ b/tests/metadata/dump/org.videolan.vlc.yaml @@ -57,7 +57,11 @@ VercodeOperation: '%c + 5' WebSite: http://www.videolan.org/vlc/download-android.html added: null builds: -- antcommands: [] +- androidupdate: + - . + - ../java-libs/SlidingMenu + - ../java-libs/ActionBarSherlock + antcommands: [] build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release buildjni: false commit: 0.0.11 @@ -85,13 +89,13 @@ builds: subdir: vlc-android submodules: false target: null - update: + vercode: 110 + version: 0.0.11-ARMv7 +- androidupdate: - . - ../java-libs/SlidingMenu - ../java-libs/ActionBarSherlock - vercode: '110' - version: 0.0.11-ARMv7 -- antcommands: [] + antcommands: [] build: cd ../ && ANDROID_ABI=armeabi ./compile.sh release buildjni: false commit: 0.0.11 @@ -119,13 +123,13 @@ builds: subdir: vlc-android submodules: false target: null - update: + vercode: 111 + version: 0.0.11-ARM +- androidupdate: - . - ../java-libs/SlidingMenu - ../java-libs/ActionBarSherlock - vercode: '111' - version: 0.0.11-ARM -- antcommands: [] + antcommands: [] build: cd ../ && ANDROID_ABI=x86 ./compile.sh release buildjni: false commit: unknown - see disabled @@ -153,13 +157,13 @@ builds: subdir: vlc-android submodules: false target: null - update: + vercode: 112 + version: 0.0.11-x86 +- androidupdate: - . - ../java-libs/SlidingMenu - ../java-libs/ActionBarSherlock - vercode: '112' - version: 0.0.11-x86 -- antcommands: [] + antcommands: [] build: cd ../ && ANDROID_ABI=mips ./compile.sh release buildjni: false commit: 0.0.11 @@ -187,13 +191,10 @@ builds: subdir: vlc-android submodules: false target: null - update: - - . - - ../java-libs/SlidingMenu - - ../java-libs/ActionBarSherlock - vercode: '113' + vercode: 113 version: 0.0.11-mips -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ANDROID_ABI=mips ./compile.sh release buildjni: false commit: 0.1.3 @@ -223,10 +224,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '1301' + vercode: 1301 version: 0.1.3-MIPS -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ANDROID_ABI=x86 ./compile.sh release buildjni: false commit: 0.1.3 @@ -256,10 +257,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '1302' + vercode: 1302 version: 0.1.3-x86 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ANDROID_ABI=armeabi ./compile.sh release buildjni: false commit: 0.1.3 @@ -289,10 +290,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '1303' + vercode: 1303 version: 0.1.3-ARM -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release buildjni: false commit: 0.1.3 @@ -322,10 +323,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '1304' + vercode: 1304 version: 0.1.3-ARMv7 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ANDROID_ABI=x86 ./compile.sh release buildjni: false commit: 0.9.0 @@ -354,10 +355,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '9002' + vercode: 9002 version: 0.9.0 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release buildjni: false commit: 0.9.0 @@ -386,10 +387,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '9004' + vercode: 9004 version: 0.9.0 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ANDROID_ABI=x86 ./compile.sh release buildjni: false commit: 0.9.1 @@ -418,10 +419,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '9102' + vercode: 9102 version: 0.9.1 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release buildjni: false commit: 0.9.1 @@ -450,10 +451,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '9104' + vercode: 9104 version: 0.9.1 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ANDROID_ABI=x86 ./compile.sh release buildjni: false commit: 0.9.5 @@ -482,10 +483,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '9502' + vercode: 9502 version: 0.9.5 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release buildjni: false commit: 0.9.5 @@ -514,10 +515,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '9504' + vercode: 9504 version: 0.9.5 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ANDROID_ABI=x86 ./compile.sh release buildjni: false commit: 0.9.6 @@ -546,10 +547,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '9602' + vercode: 9602 version: 0.9.6 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release buildjni: false commit: 0.9.6 @@ -578,10 +579,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '9604' + vercode: 9604 version: 0.9.6 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ANDROID_ABI=x86 ./compile.sh release buildjni: false commit: 0.9.7 @@ -610,10 +611,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '9702' + vercode: 9702 version: 0.9.7 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release buildjni: false commit: 0.9.7 @@ -642,10 +643,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '9704' + vercode: 9704 version: 0.9.7 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ANDROID_ABI=mips ./compile.sh release buildjni: false commit: 0.9.7.1 @@ -674,10 +675,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '9711' + vercode: 9711 version: 0.9.7.1 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ANDROID_ABI=x86 ./compile.sh release buildjni: false commit: 0.9.7.1 @@ -706,10 +707,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '9712' + vercode: 9712 version: 0.9.7.1 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release buildjni: false commit: 0.9.7.1 @@ -738,10 +739,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '9714' + vercode: 9714 version: 0.9.7.1 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ANDROID_ABI=x86 ./compile.sh release buildjni: false commit: 0.9.8 @@ -770,10 +771,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '9802' + vercode: 9802 version: 0.9.8 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ANDROID_ABI=armeabi ./compile.sh release buildjni: false commit: 0.9.8 @@ -802,10 +803,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '9803' + vercode: 9803 version: 0.9.8 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release buildjni: false commit: 0.9.8 @@ -834,10 +835,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '9804' + vercode: 9804 version: 0.9.8 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ANDROID_ABI=x86 ./compile.sh release buildjni: false commit: 0.9.9 @@ -866,10 +867,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '9902' + vercode: 9902 version: 0.9.9 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ANDROID_ABI=armeabi ./compile.sh release buildjni: false commit: 0.9.9 @@ -898,10 +899,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '9903' + vercode: 9903 version: 0.9.9 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release buildjni: false commit: 0.9.9 @@ -930,10 +931,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '9904' + vercode: 9904 version: 0.9.9 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ANDROID_ABI=x86 ./compile.sh release buildjni: false commit: 0.9.10 @@ -962,10 +963,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '10002' + vercode: 10002 version: 0.9.10 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ANDROID_ABI=armeabi ./compile.sh release buildjni: false commit: 0.9.10 @@ -994,10 +995,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '10003' + vercode: 10003 version: 0.9.10 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release buildjni: false commit: 0.9.10 @@ -1026,10 +1027,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '10004' + vercode: 10004 version: 0.9.10 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ANDROID_ABI=x86 ./compile.sh release buildjni: false commit: 1.0.0 @@ -1058,10 +1059,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '10006' + vercode: 10006 version: 1.0.0 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ANDROID_ABI=armeabi ./compile.sh release buildjni: false commit: 1.0.0 @@ -1090,10 +1091,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '10007' + vercode: 10007 version: 1.0.0 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release buildjni: false commit: 1.0.0 @@ -1122,10 +1123,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '10008' + vercode: 10008 version: 1.0.0 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ANDROID_ABI=x86 ./compile.sh release buildjni: false commit: 1.0.1 @@ -1154,10 +1155,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '10102' + vercode: 10102 version: 1.0.1 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ANDROID_ABI=armeabi ./compile.sh release buildjni: false commit: 1.0.1 @@ -1186,10 +1187,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '10103' + vercode: 10103 version: 1.0.1 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release buildjni: false commit: 1.0.1 @@ -1218,10 +1219,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '10104' + vercode: 10104 version: 1.0.1 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ./compile.sh -a "armeabi" --release buildjni: false commit: 1.1.3 @@ -1252,10 +1253,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '1010303' + vercode: 1010303 version: 1.1.3 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ./compile.sh -a "armeabi-v7a" --release buildjni: false commit: 1.1.3 @@ -1286,10 +1287,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '1010304' + vercode: 1010304 version: 1.1.3 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ./compile.sh -a "x86" --release buildjni: false commit: 1.1.3 @@ -1320,10 +1321,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '1010305' + vercode: 1010305 version: 1.1.3 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ./compile.sh -a "armeabi" --release buildjni: false commit: 1.1.5 @@ -1354,10 +1355,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '1010503' + vercode: 1010503 version: 1.1.5 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ./compile.sh -a "armeabi-v7a" --release buildjni: false commit: 1.1.5 @@ -1388,10 +1389,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '1010504' + vercode: 1010504 version: 1.1.5 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ./compile.sh -a "x86" --release buildjni: false commit: 1.1.5 @@ -1422,10 +1423,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '1010505' + vercode: 1010505 version: 1.1.5 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ./compile.sh -a "armeabi" --release buildjni: false commit: 1.1.6 @@ -1456,10 +1457,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '1010603' + vercode: 1010603 version: 1.1.6 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ./compile.sh -a "armeabi-v7a" --release buildjni: false commit: 1.1.6 @@ -1490,10 +1491,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '1010604' + vercode: 1010604 version: 1.1.6 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ./compile.sh -a "x86" --release buildjni: false commit: 1.1.6 @@ -1524,10 +1525,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '1010605' + vercode: 1010605 version: 1.1.6 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ./compile.sh -a "armeabi" --release buildjni: false commit: 1.2.0 @@ -1558,10 +1559,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '1020003' + vercode: 1020003 version: 1.2.0 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ./compile.sh -a "armeabi-v7a" --release buildjni: false commit: 1.2.0 @@ -1592,10 +1593,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '1020004' + vercode: 1020004 version: 1.2.0 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ./compile.sh -a "x86" --release buildjni: false commit: 1.2.0 @@ -1626,10 +1627,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '1020005' + vercode: 1020005 version: 1.2.0 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ./compile.sh -a "armeabi" --release buildjni: false commit: 1.2.1 @@ -1660,10 +1661,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '1020103' + vercode: 1020103 version: 1.2.1 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ./compile.sh -a "armeabi-v7a" --release buildjni: false commit: 1.2.1 @@ -1694,10 +1695,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '1020104' + vercode: 1020104 version: 1.2.1 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ./compile.sh -a "x86" --release buildjni: false commit: 1.2.1 @@ -1728,10 +1729,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '1020105' + vercode: 1020105 version: 1.2.1 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ./compile.sh -a "armeabi" --release buildjni: false commit: 1.2.2 @@ -1762,10 +1763,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '1020203' + vercode: 1020203 version: 1.2.2 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ./compile.sh -a "armeabi-v7a" --release buildjni: false commit: 1.2.2 @@ -1796,10 +1797,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '1020204' + vercode: 1020204 version: 1.2.2 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ./compile.sh -a "x86" --release buildjni: false commit: 1.2.2 @@ -1830,10 +1831,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '1020205' + vercode: 1020205 version: 1.2.2 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ./compile.sh -a "armeabi" --release buildjni: false commit: 1.2.3 @@ -1864,10 +1865,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '1020303' + vercode: 1020303 version: 1.2.3 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ./compile.sh -a "armeabi-v7a" --release buildjni: false commit: 1.2.3 @@ -1898,10 +1899,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '1020304' + vercode: 1020304 version: 1.2.3 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ./compile.sh -a "x86" --release buildjni: false commit: 1.2.3 @@ -1932,10 +1933,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '1020305' + vercode: 1020305 version: 1.2.3 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ./compile.sh -a "armeabi" --release buildjni: false commit: 1.2.4 @@ -1966,10 +1967,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '1020403' + vercode: 1020403 version: 1.2.4 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ./compile.sh -a "armeabi-v7a" --release buildjni: false commit: 1.2.4 @@ -2000,10 +2001,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '1020404' + vercode: 1020404 version: 1.2.4 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ./compile.sh -a "x86" --release buildjni: false commit: 1.2.4 @@ -2034,10 +2035,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '1020405' + vercode: 1020405 version: 1.2.4 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ./compile.sh -a "armeabi" --release buildjni: false commit: 1.2.5 @@ -2068,10 +2069,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '1020503' + vercode: 1020503 version: 1.2.5 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ./compile.sh -a "armeabi-v7a" --release buildjni: false commit: 1.2.5 @@ -2102,10 +2103,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '1020504' + vercode: 1020504 version: 1.2.5 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ./compile.sh -a "x86" --release buildjni: false commit: 1.2.5 @@ -2136,10 +2137,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '1020505' + vercode: 1020505 version: 1.2.5 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ./compile.sh -a "armeabi" --release buildjni: false commit: 1.2.6 @@ -2170,10 +2171,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '1030003' + vercode: 1030003 version: 1.2.6 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ./compile.sh -a "armeabi-v7a" --release buildjni: false commit: 1.2.6 @@ -2204,10 +2205,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '1030004' + vercode: 1030004 version: 1.2.6 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ./compile.sh -a "x86" --release buildjni: false commit: 1.2.6 @@ -2238,8 +2239,7 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '1030005' + vercode: 1030005 version: 1.2.6 comments: {} id: org.videolan.vlc diff --git a/tests/metadata/org.adaway.json b/tests/metadata/org.adaway.json index 0b95a963..c95a8878 100644 --- a/tests/metadata/org.adaway.json +++ b/tests/metadata/org.adaway.json @@ -182,7 +182,7 @@ "prebuild": "rm -rf ../update_zip libs/root-commands-1.2.jar libs/htmlspanner-0.2-fork.jar && cp -f libs/htmlcleaner-2.2.jar android-libs/HtmlSpanner/htmlspanner/libs/ && echo \"android.library.reference.3=$$RootCommands$$\" >> project.properties && echo \"android.library.reference.4=android-libs/HtmlSpanner/htmlspanner\" >> project.properties && find . -type f -print0 | xargs -0 sed -i 's/org.rootcommands/org.sufficientlysecure.rootcommands/g' && cp android-libs/Donations/ant-templates/other/DonationsConfig.java android-libs/Donations/src/org/donations/", "srclibs": ["RootCommands@c940b0e503"], "subdir": "AdAway", - "update": [".", + "androidupdate": [".", "android-libs/Donations", "android-libs/ActionBarSherlock", "android-libs/HtmlSpanner/htmlspanner"], @@ -197,7 +197,7 @@ "prebuild": "rm -rf ../update_zip libs/root-commands-1.2.jar libs/htmlspanner-0.2-fork.jar && cp -f libs/htmlcleaner-2.2.jar android-libs/HtmlSpanner/htmlspanner/libs/ && echo \"android.library.reference.3=$$RootCommands$$\" >> project.properties && echo \"android.library.reference.4=android-libs/HtmlSpanner/htmlspanner\" >> project.properties && find . -type f -print0 | xargs -0 sed -i 's/org.rootcommands/org.sufficientlysecure.rootcommands/g' && cp android-libs/Donations/ant-templates/other/DonationsConfig.java android-libs/Donations/src/org/donations/", "srclibs": ["RootCommands@c940b0e503"], "subdir": "AdAway", - "update": [".", + "androidupdate": [".", "android-libs/Donations", "android-libs/ActionBarSherlock", "android-libs/HtmlSpanner/htmlspanner"], diff --git a/tests/metadata/org.smssecure.smssecure.txt b/tests/metadata/org.smssecure.smssecure.txt index 2f324b7d..d4ff2384 100644 --- a/tests/metadata/org.smssecure.smssecure.txt +++ b/tests/metadata/org.smssecure.smssecure.txt @@ -45,7 +45,7 @@ Build:0.3.3,5 cp -fR smil/java/org src/ && \ rm -fR smil && \ sed -i -e '/org.w3c.smil/d' build.gradle && \ - cp -fR $$AospMms$$/src/org src/ + cp -fR $$AospMms$$/src/org src/ Build:0.3.3,6 disable=builds, wait for upstream diff --git a/tests/metadata/org.videolan.vlc.yml b/tests/metadata/org.videolan.vlc.yml index 5bedfb9e..67b0d297 100644 --- a/tests/metadata/org.videolan.vlc.yml +++ b/tests/metadata/org.videolan.vlc.yml @@ -25,12 +25,11 @@ builds: forceversion: yes forcevercode: yes prebuild: sed -i '48d' ../Makefile - update: + androidupdate: - . - ../java-libs/SlidingMenu - ../java-libs/ActionBarSherlock - build: cd ../ && \ - ANDROID_ABI=armeabi-v7a ./compile.sh release + build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release buildjni: no - versionName: 0.0.11-ARM @@ -40,7 +39,7 @@ builds: forceversion: yes forcevercode: yes prebuild: sed -i '48d' ../Makefile - update: + androidupdate: - . - ../java-libs/SlidingMenu - ../java-libs/ActionBarSherlock @@ -57,7 +56,7 @@ builds: forceversion: yes forcevercode: yes prebuild: sed -i '48d' ../Makefile - update: + androidupdate: - . - ../java-libs/SlidingMenu - ../java-libs/ActionBarSherlock @@ -73,7 +72,7 @@ builds: forceversion: yes forcevercode: yes prebuild: sed -i '48d' ../Makefile - update: + androidupdate: - . - ../java-libs/SlidingMenu - ../java-libs/ActionBarSherlock @@ -108,8 +107,7 @@ builds: forcevercode: yes prebuild: sed -i '/ant/d' ../Makefile && \ ln -s vlc-android/$$VLC$$ ../vlc - build: cd ../ && \ - ANDROID_ABI=x86 ./compile.sh release + build: cd ../ && ANDROID_ABI=x86 ./compile.sh release buildjni: no - versionName: 0.1.3-ARM @@ -122,8 +120,7 @@ builds: forcevercode: yes prebuild: sed -i '/ant/d' ../Makefile && \ ln -s vlc-android/$$VLC$$ ../vlc - build: cd ../ && \ - ANDROID_ABI=armeabi ./compile.sh release + build: cd ../ && ANDROID_ABI=armeabi ./compile.sh release buildjni: no - versionName: 0.1.3-ARMv7 @@ -136,8 +133,7 @@ builds: forcevercode: yes prebuild: sed -i '/ant/d' ../Makefile && \ ln -s vlc-android/$$VLC$$ ../vlc - build: cd ../ && \ - ANDROID_ABI=armeabi-v7a ./compile.sh release + build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release buildjni: no - versionName: 0.9.0 @@ -148,8 +144,7 @@ builds: forcevercode: yes prebuild: sed -i '/ant/d' ../Makefile && \ ln -s vlc-android/$$VLC$$ ../vlc - build: cd ../ && \ - ANDROID_ABI=x86 ./compile.sh release + build: cd ../ && ANDROID_ABI=x86 ./compile.sh release buildjni: no - versionName: 0.9.0 @@ -160,8 +155,7 @@ builds: forcevercode: yes prebuild: sed -i '/ant/d' ../Makefile && \ ln -s vlc-android/$$VLC$$ ../vlc - build: cd ../ && \ - ANDROID_ABI=armeabi-v7a ./compile.sh release + build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release buildjni: no - versionName: 0.9.1 @@ -172,8 +166,7 @@ builds: forcevercode: yes prebuild: sed -i '/ant/d' ../Makefile && \ ln -s vlc-android/$$VLC$$ ../vlc - build: cd ../ && \ - ANDROID_ABI=x86 ./compile.sh release + build: cd ../ && ANDROID_ABI=x86 ./compile.sh release buildjni: no - versionName: 0.9.1 @@ -184,8 +177,7 @@ builds: forcevercode: yes prebuild: sed -i '/ant/d' ../Makefile && \ ln -s vlc-android/$$VLC$$ ../vlc - build: cd ../ && \ - ANDROID_ABI=armeabi-v7a ./compile.sh release + build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release buildjni: no - versionName: 0.9.5 @@ -197,8 +189,7 @@ builds: forcevercode: yes prebuild: sed -i '/ant/d' ../Makefile && \ ln -s vlc-android/$$VLC$$ ../vlc - build: cd ../ && \ - ANDROID_ABI=x86 ./compile.sh release + build: cd ../ && ANDROID_ABI=x86 ./compile.sh release buildjni: no - versionName: 0.9.5 @@ -210,8 +201,7 @@ builds: forcevercode: yes prebuild: sed -i '/ant/d' ../Makefile && \ ln -s vlc-android/$$VLC$$ ../vlc - build: cd ../ && \ - ANDROID_ABI=armeabi-v7a ./compile.sh release + build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release buildjni: no - versionName: 0.9.6 @@ -222,8 +212,7 @@ builds: forcevercode: yes prebuild: sed -i '/ant/d' ../Makefile && \ ln -s vlc-android/$$VLC-2.2$$ ../vlc - build: cd ../ && \ - ANDROID_ABI=x86 ./compile.sh release + build: cd ../ && ANDROID_ABI=x86 ./compile.sh release buildjni: no - versionName: 0.9.6 @@ -234,8 +223,7 @@ builds: forcevercode: yes prebuild: sed -i '/ant/d' ../Makefile && \ ln -s vlc-android/$$VLC-2.2$$ ../vlc - build: cd ../ && \ - ANDROID_ABI=armeabi-v7a ./compile.sh release + build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release buildjni: no - versionName: 0.9.7 @@ -246,8 +234,7 @@ builds: forcevercode: yes prebuild: sed -i '/ant/d' ../Makefile && \ ln -s vlc-android/$$VLC-2.2$$ ../vlc - build: cd ../ && \ - ANDROID_ABI=x86 ./compile.sh release + build: cd ../ && ANDROID_ABI=x86 ./compile.sh release buildjni: no - versionName: 0.9.7 @@ -258,8 +245,7 @@ builds: forcevercode: yes prebuild: sed -i '/ant/d' ../Makefile && \ ln -s vlc-android/$$VLC-2.2$$ ../vlc - build: cd ../ && \ - ANDROID_ABI=armeabi-v7a ./compile.sh release + build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release buildjni: no - versionName: 0.9.7.1 @@ -271,8 +257,7 @@ builds: forcevercode: yes prebuild: sed -i '/ant/d' ../Makefile && \ ln -s vlc-android/$$VLC-2.2$$ ../vlc - build: cd ../ && \ - ANDROID_ABI=mips ./compile.sh release + build: cd ../ && ANDROID_ABI=mips ./compile.sh release buildjni: no - versionName: 0.9.7.1 @@ -283,8 +268,7 @@ builds: forcevercode: yes prebuild: sed -i '/ant/d' ../Makefile && \ ln -s vlc-android/$$VLC-2.2$$ ../vlc - build: cd ../ && \ - ANDROID_ABI=x86 ./compile.sh release + build: cd ../ && ANDROID_ABI=x86 ./compile.sh release buildjni: no - versionName: 0.9.7.1 @@ -295,8 +279,7 @@ builds: forcevercode: yes prebuild: sed -i '/ant/d' ../Makefile && \ ln -s vlc-android/$$VLC-2.2$$ ../vlc - build: cd ../ && \ - ANDROID_ABI=armeabi-v7a ./compile.sh release + build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release buildjni: no - versionName: 0.9.8 @@ -307,8 +290,7 @@ builds: forcevercode: yes prebuild: sed -i '/ant/d' ../Makefile && \ ln -s vlc-android/$$VLC-2.2$$ ../vlc - build: cd ../ && \ - ANDROID_ABI=x86 ./compile.sh release + build: cd ../ && ANDROID_ABI=x86 ./compile.sh release buildjni: no - versionName: 0.9.8 @@ -319,8 +301,7 @@ builds: forcevercode: yes prebuild: sed -i '/ant/d' ../Makefile && \ ln -s vlc-android/$$VLC-2.2$$ ../vlc - build: cd ../ && \ - ANDROID_ABI=armeabi ./compile.sh release + build: cd ../ && ANDROID_ABI=armeabi ./compile.sh release buildjni: no - versionName: 0.9.8 @@ -331,8 +312,7 @@ builds: forcevercode: yes prebuild: sed -i '/ant/d' ../Makefile && \ ln -s vlc-android/$$VLC-2.2$$ ../vlc - build: cd ../ && \ - ANDROID_ABI=armeabi-v7a ./compile.sh release + build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release buildjni: no - versionName: 0.9.9 @@ -343,8 +323,7 @@ builds: forcevercode: yes prebuild: sed -i '/ant/d' ../Makefile && \ ln -s vlc-android/$$VLC-2.2$$ ../vlc - build: cd ../ && \ - ANDROID_ABI=x86 ./compile.sh release + build: cd ../ && ANDROID_ABI=x86 ./compile.sh release buildjni: no - versionName: 0.9.9 @@ -355,8 +334,7 @@ builds: forcevercode: yes prebuild: sed -i '/ant/d' ../Makefile && \ ln -s vlc-android/$$VLC-2.2$$ ../vlc - build: cd ../ && \ - ANDROID_ABI=armeabi ./compile.sh release + build: cd ../ && ANDROID_ABI=armeabi ./compile.sh release buildjni: no - versionName: 0.9.9 @@ -367,8 +345,7 @@ builds: forcevercode: yes prebuild: sed -i '/ant/d' ../Makefile && \ ln -s vlc-android/$$VLC-2.2$$ ../vlc - build: cd ../ && \ - ANDROID_ABI=armeabi-v7a ./compile.sh release + build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release buildjni: no - versionName: 0.9.10 @@ -379,8 +356,7 @@ builds: forcevercode: yes prebuild: sed -i '/ant/d' ../Makefile && \ ln -s vlc-android/$$VLC-2.2$$ ../vlc - build: cd ../ && \ - ANDROID_ABI=x86 ./compile.sh release + build: cd ../ && ANDROID_ABI=x86 ./compile.sh release buildjni: no - versionName: 0.9.10 @@ -391,8 +367,7 @@ builds: forcevercode: yes prebuild: sed -i '/ant/d' ../Makefile && \ ln -s vlc-android/$$VLC-2.2$$ ../vlc - build: cd ../ && \ - ANDROID_ABI=armeabi ./compile.sh release + build: cd ../ && ANDROID_ABI=armeabi ./compile.sh release buildjni: no - versionName: 0.9.10 @@ -403,8 +378,7 @@ builds: forcevercode: yes prebuild: sed -i '/ant/d' ../Makefile && \ ln -s vlc-android/$$VLC-2.2$$ ../vlc - build: cd ../ && \ - ANDROID_ABI=armeabi-v7a ./compile.sh release + build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release buildjni: no #0.9.10 vercodes were off @@ -417,8 +391,7 @@ builds: forcevercode: yes prebuild: sed -i '/ant/d' ../Makefile && \ ln -s vlc-android/$$VLC-2.2$$ ../vlc - build: cd ../ && \ - ANDROID_ABI=x86 ./compile.sh release + build: cd ../ && ANDROID_ABI=x86 ./compile.sh release buildjni: no #0.9.10 vercodes were off @@ -431,8 +404,7 @@ builds: forcevercode: yes prebuild: sed -i '/ant/d' ../Makefile && \ ln -s vlc-android/$$VLC-2.2$$ ../vlc - build: cd ../ && \ - ANDROID_ABI=armeabi ./compile.sh release + build: cd ../ && ANDROID_ABI=armeabi ./compile.sh release buildjni: no #0.9.10 vercodes were off @@ -445,8 +417,7 @@ builds: forcevercode: yes prebuild: sed -i '/ant/d' ../Makefile && \ ln -s vlc-android/$$VLC-2.2$$ ../vlc - build: cd ../ && \ - ANDROID_ABI=armeabi-v7a ./compile.sh release + build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release buildjni: no - versionName: 1.0.1 @@ -457,8 +428,7 @@ builds: forcevercode: yes prebuild: sed -i '/ant/d' ../Makefile && \ ln -s vlc-android/$$VLC-2.2$$ ../vlc - build: cd ../ && \ - ANDROID_ABI=x86 ./compile.sh release + build: cd ../ && ANDROID_ABI=x86 ./compile.sh release buildjni: no - versionName: 1.0.1 @@ -469,8 +439,7 @@ builds: forcevercode: yes prebuild: sed -i '/ant/d' ../Makefile && \ ln -s vlc-android/$$VLC-2.2$$ ../vlc - build: cd ../ && \ - ANDROID_ABI=armeabi ./compile.sh release + build: cd ../ && ANDROID_ABI=armeabi ./compile.sh release buildjni: no - versionName: 1.0.1 @@ -481,8 +450,7 @@ builds: forcevercode: yes prebuild: sed -i '/ant/d' ../Makefile && \ ln -s vlc-android/$$VLC-2.2$$ ../vlc - build: cd ../ && \ - ANDROID_ABI=armeabi-v7a ./compile.sh release + build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release buildjni: no - versionName: 1.1.3 @@ -491,10 +459,9 @@ builds: subdir: vlc-android gradle: VanillaARMv6fpu srclibs: VLC@a9b19e4 - prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && \ + prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc - build: cd ../ && \ - ./compile.sh -a "armeabi" --release + build: cd ../ && ./compile.sh -a "armeabi" --release buildjni: no ndk: r10d @@ -504,10 +471,9 @@ builds: subdir: vlc-android gradle: VanillaARMv7 srclibs: VLC@a9b19e4 - prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && \ + prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc - build: cd ../ && \ - ./compile.sh -a "armeabi-v7a" --release + build: cd ../ && ./compile.sh -a "armeabi-v7a" --release buildjni: no ndk: r10d @@ -517,10 +483,9 @@ builds: subdir: vlc-android gradle: VanillaX86 srclibs: VLC@a9b19e4 - prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && \ + prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc - build: cd ../ && \ - ./compile.sh -a "x86" --release + build: cd ../ && ./compile.sh -a "x86" --release buildjni: no ndk: r10d @@ -530,10 +495,9 @@ builds: subdir: vlc-android gradle: VanillaARMv6fpu srclibs: VLC@e6b4585 - prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && \ + prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc - build: cd ../ && \ - ./compile.sh -a "armeabi" --release + build: cd ../ && ./compile.sh -a "armeabi" --release buildjni: no ndk: r10d @@ -543,10 +507,9 @@ builds: subdir: vlc-android gradle: VanillaARMv7 srclibs: VLC@e6b4585 - prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && \ + prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc - build: cd ../ && \ - ./compile.sh -a "armeabi-v7a" --release + build: cd ../ && ./compile.sh -a "armeabi-v7a" --release buildjni: no ndk: r10d @@ -556,10 +519,9 @@ builds: subdir: vlc-android gradle: VanillaX86 srclibs: VLC@e6b4585 - prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && \ + prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc - build: cd ../ && \ - ./compile.sh -a "x86" --release + build: cd ../ && ./compile.sh -a "x86" --release buildjni: no ndk: r10d @@ -569,10 +531,9 @@ builds: subdir: vlc-android gradle: VanillaARMv6fpu srclibs: VLC@551b670 - prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && \ + prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc - build: cd ../ && \ - ./compile.sh -a "armeabi" --release + build: cd ../ && ./compile.sh -a "armeabi" --release buildjni: no ndk: r10d @@ -582,10 +543,9 @@ builds: subdir: vlc-android gradle: VanillaARMv7 srclibs: VLC@551b670 - prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && \ + prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc - build: cd ../ && \ - ./compile.sh -a "armeabi-v7a" --release + build: cd ../ && ./compile.sh -a "armeabi-v7a" --release buildjni: no ndk: r10d @@ -595,10 +555,9 @@ builds: subdir: vlc-android gradle: VanillaX86 srclibs: VLC@551b670 - prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && \ + prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc - build: cd ../ && \ - ./compile.sh -a "x86" --release + build: cd ../ && ./compile.sh -a "x86" --release buildjni: no ndk: r10d @@ -608,10 +567,9 @@ builds: subdir: vlc-android gradle: VanillaARMv6fpu srclibs: VLC@23c8d86 - prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && \ + prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc - build: cd ../ && \ - ./compile.sh -a "armeabi" --release + build: cd ../ && ./compile.sh -a "armeabi" --release buildjni: no ndk: r10d @@ -621,10 +579,9 @@ builds: subdir: vlc-android gradle: VanillaARMv7 srclibs: VLC@23c8d86 - prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && \ + prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc - build: cd ../ && \ - ./compile.sh -a "armeabi-v7a" --release + build: cd ../ && ./compile.sh -a "armeabi-v7a" --release buildjni: no ndk: r10d @@ -634,10 +591,9 @@ builds: subdir: vlc-android gradle: VanillaX86 srclibs: VLC@23c8d86 - prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && \ + prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc - build: cd ../ && \ - ./compile.sh -a "x86" --release + build: cd ../ && ./compile.sh -a "x86" --release buildjni: no ndk: r10d @@ -647,10 +603,9 @@ builds: subdir: vlc-android gradle: VanillaARMv6fpu srclibs: VLC@23c8d86 - prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && \ + prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc - build: cd ../ && \ - ./compile.sh -a "armeabi" --release + build: cd ../ && ./compile.sh -a "armeabi" --release buildjni: no ndk: r10d @@ -660,10 +615,9 @@ builds: subdir: vlc-android gradle: VanillaARMv7 srclibs: VLC@23c8d86 - prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && \ + prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc - build: cd ../ && \ - ./compile.sh -a "armeabi-v7a" --release + build: cd ../ && ./compile.sh -a "armeabi-v7a" --release buildjni: no ndk: r10d @@ -673,10 +627,9 @@ builds: subdir: vlc-android gradle: VanillaX86 srclibs: VLC@23c8d86 - prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && \ + prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc - build: cd ../ && \ - ./compile.sh -a "x86" --release + build: cd ../ && ./compile.sh -a "x86" --release buildjni: no ndk: r10d @@ -686,10 +639,9 @@ builds: subdir: vlc-android gradle: VanillaARMv6fpu srclibs: VLC@7491a5f - prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && \ + prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc - build: cd ../ && \ - ./compile.sh -a "armeabi" --release + build: cd ../ && ./compile.sh -a "armeabi" --release buildjni: no ndk: r10d @@ -699,10 +651,9 @@ builds: subdir: vlc-android gradle: VanillaARMv7 srclibs: VLC@7491a5f - prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && \ + prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc - build: cd ../ && \ - ./compile.sh -a "armeabi-v7a" --release + build: cd ../ && ./compile.sh -a "armeabi-v7a" --release buildjni: no ndk: r10d @@ -712,10 +663,9 @@ builds: subdir: vlc-android gradle: VanillaX86 srclibs: VLC@7491a5f - prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && \ + prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc - build: cd ../ && \ - ./compile.sh -a "x86" --release + build: cd ../ && ./compile.sh -a "x86" --release buildjni: no ndk: r10d @@ -725,10 +675,9 @@ builds: subdir: vlc-android gradle: VanillaARMv6fpu srclibs: VLC@7491a5f - prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && \ + prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc - build: cd ../ && \ - ./compile.sh -a "armeabi" --release + build: cd ../ && ./compile.sh -a "armeabi" --release buildjni: no ndk: r10d @@ -738,10 +687,9 @@ builds: subdir: vlc-android gradle: VanillaARMv7 srclibs: VLC@7491a5f - prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && \ + prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc - build: cd ../ && \ - ./compile.sh -a "armeabi-v7a" --release + build: cd ../ && ./compile.sh -a "armeabi-v7a" --release buildjni: no ndk: r10d @@ -751,10 +699,9 @@ builds: subdir: vlc-android gradle: VanillaX86 srclibs: VLC@7491a5f - prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && \ + prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc - build: cd ../ && \ - ./compile.sh -a "x86" --release + build: cd ../ && ./compile.sh -a "x86" --release buildjni: no ndk: r10d @@ -764,10 +711,9 @@ builds: subdir: vlc-android gradle: VanillaARMv6fpu srclibs: VLC@7491a5f - prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && \ + prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc - build: cd ../ && \ - ./compile.sh -a "armeabi" --release + build: cd ../ && ./compile.sh -a "armeabi" --release buildjni: no ndk: r10d @@ -777,10 +723,9 @@ builds: subdir: vlc-android gradle: VanillaARMv7 srclibs: VLC@7491a5f - prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && \ + prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc - build: cd ../ && \ - ./compile.sh -a "armeabi-v7a" --release + build: cd ../ && ./compile.sh -a "armeabi-v7a" --release buildjni: no ndk: r10d @@ -790,10 +735,9 @@ builds: subdir: vlc-android gradle: VanillaX86 srclibs: VLC@7491a5f - prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && \ + prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc - build: cd ../ && \ - ./compile.sh -a "x86" --release + build: cd ../ && ./compile.sh -a "x86" --release buildjni: no ndk: r10d @@ -803,10 +747,9 @@ builds: subdir: vlc-android gradle: VanillaARMv6fpu srclibs: VLC@50accb8 - prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && \ + prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc - build: cd ../ && \ - ./compile.sh -a "armeabi" --release + build: cd ../ && ./compile.sh -a "armeabi" --release buildjni: no ndk: r10d @@ -816,10 +759,9 @@ builds: subdir: vlc-android gradle: VanillaARMv7 srclibs: VLC@50accb8 - prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && \ + prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc - build: cd ../ && \ - ./compile.sh -a "armeabi-v7a" --release + build: cd ../ && ./compile.sh -a "armeabi-v7a" --release buildjni: no ndk: r10d @@ -829,10 +771,9 @@ builds: subdir: vlc-android gradle: VanillaX86 srclibs: VLC@50accb8 - prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && \ + prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc - build: cd ../ && \ - ./compile.sh -a "x86" --release + build: cd ../ && ./compile.sh -a "x86" --release buildjni: no ndk: r10d @@ -842,10 +783,9 @@ builds: subdir: vlc-android gradle: VanillaARMv6fpu srclibs: VLC@d59b81a - prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && \ + prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc - build: cd ../ && \ - ./compile.sh -a "armeabi" --release + build: cd ../ && ./compile.sh -a "armeabi" --release buildjni: no ndk: r10d @@ -855,10 +795,9 @@ builds: subdir: vlc-android gradle: VanillaARMv7 srclibs: VLC@d59b81a - prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && \ + prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc - build: cd ../ && \ - ./compile.sh -a "armeabi-v7a" --release + build: cd ../ && ./compile.sh -a "armeabi-v7a" --release buildjni: no ndk: r10d @@ -868,10 +807,9 @@ builds: subdir: vlc-android gradle: VanillaX86 srclibs: VLC@d59b81a - prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && \ + prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc - build: cd ../ && \ - ./compile.sh -a "x86" --release + build: cd ../ && ./compile.sh -a "x86" --release buildjni: no ndk: r10d