From 141e0e24c779b9ed7be6b0164a778aab3c541ca3 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Mon, 20 Jul 2015 16:55:15 -0700 Subject: [PATCH 01/22] metadata: rename parse_metadata() to parse_txt_metadata() This makes the code clear as support for other metadata formats is added. --- fdroidserver/import.py | 2 +- fdroidserver/metadata.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/fdroidserver/import.py b/fdroidserver/import.py index 27a93ca6..5c47f780 100644 --- a/fdroidserver/import.py +++ b/fdroidserver/import.py @@ -198,7 +198,7 @@ def main(): sys.exit(1) # Construct the metadata... - app = metadata.parse_metadata(None)[1] + app = metadata.parse_txt_metadata(None)[1] app['Web Site'] = website app['Source Code'] = sourcecode if issuetracker: diff --git a/fdroidserver/metadata.py b/fdroidserver/metadata.py index 2ec38b0a..587c4aab 100644 --- a/fdroidserver/metadata.py +++ b/fdroidserver/metadata.py @@ -470,7 +470,7 @@ def read_srclibs(): # Read all metadata. Returns a list of 'app' objects (which are dictionaries as -# returned by the parse_metadata function. +# returned by the parse_txt_metadata function. def read_metadata(xref=True): # Always read the srclibs before the apps, since they can use a srlib as @@ -484,7 +484,7 @@ def read_metadata(xref=True): os.makedirs(basedir) for metafile in sorted(glob.glob(os.path.join('metadata', '*.txt'))): - appid, appinfo = parse_metadata(metafile) + appid, appinfo = parse_txt_metadata(metafile) check_metadata(appinfo) apps[appid] = appinfo @@ -584,7 +584,7 @@ def split_list_values(s): # 'descriptionlines' - original lines of description as formatted in the # metadata file. # -def parse_metadata(metafile): +def parse_txt_metadata(metafile): appid = None linedesc = None From 2b726341205c24fa6e2a17c38760be4747bdc10d Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Tue, 21 Jul 2015 11:46:01 -0700 Subject: [PATCH 02/22] use common method to set up defaults in metadata dict This is needed for the upcoming metadata formats: JSON, XML, etc. --- fdroidserver/metadata.py | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/fdroidserver/metadata.py b/fdroidserver/metadata.py index 587c4aab..83bdbc4e 100644 --- a/fdroidserver/metadata.py +++ b/fdroidserver/metadata.py @@ -560,6 +560,17 @@ def split_list_values(s): return [v for v in l if v] +def get_default_app_info_list(): + thisinfo = {} + thisinfo.update(app_defaults) + + # General defaults... + thisinfo['builds'] = [] + thisinfo['comments'] = [] + + return thisinfo + + # Parse metadata for a single application. # # 'metafile' - the filename to read. The package id for the application comes @@ -661,20 +672,13 @@ def parse_txt_metadata(metafile): thisinfo['comments'].append((key, comment)) del curcomments[:] - thisinfo = {} + thisinfo = get_default_app_info_list() if metafile: if not isinstance(metafile, file): metafile = open(metafile, "r") appid = metafile.name[9:-4] - - thisinfo.update(app_defaults) - thisinfo['id'] = appid - - # General defaults... - thisinfo['builds'] = [] - thisinfo['comments'] = [] - - if metafile is None: + thisinfo['id'] = appid + else: return appid, thisinfo mode = 0 From 84c9777e9e586e9a52325178b9f8b4d278f9e5fa Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Tue, 21 Jul 2015 11:50:49 -0700 Subject: [PATCH 03/22] support app metadata in JSON format While the current text metadata format is good for human readability and editability, it is difficult to produce and parse using code. JSON is a widespread standard format for easy automatic parsing and creating, while having decent human readability. --- fdroidserver/metadata.py | 56 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/fdroidserver/metadata.py b/fdroidserver/metadata.py index 83bdbc4e..c9a39dc7 100644 --- a/fdroidserver/metadata.py +++ b/fdroidserver/metadata.py @@ -17,6 +17,7 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . +import json import os import re import glob @@ -488,6 +489,11 @@ def read_metadata(xref=True): check_metadata(appinfo) apps[appid] = appinfo + for metafile in sorted(glob.glob(os.path.join('metadata', '*.json'))): + appid, appinfo = parse_json_metadata(metafile) + check_metadata(appinfo) + apps[appid] = appinfo + if xref: # Parse all descriptions at load time, just to ensure cross-referencing # errors are caught early rather than when they hit the build server. @@ -595,6 +601,56 @@ def get_default_app_info_list(): # 'descriptionlines' - original lines of description as formatted in the # metadata file. # + + +def parse_json_metadata(metafile): + + appid = os.path.basename(metafile)[0:-5] # strip path and .json + thisinfo = get_default_app_info_list() + thisinfo['id'] = appid + + # fdroid metadata is only strings and booleans, no floats or ints. And + # json returns unicode, and fdroidserver still uses plain python strings + jsoninfo = json.load(open(metafile, 'r'), + parse_int=lambda s: s, + parse_float=lambda s: s) + supported_metadata = app_defaults.keys() + ['builds', 'comments'] + for k, v in jsoninfo.iteritems(): + if k == 'Requires Root': + if isinstance(v, basestring): + if re.match('^\s*(yes|true).*', v, flags=re.IGNORECASE): + jsoninfo[k] = 'Yes' + elif re.match('^\s*(no|false).*', v, flags=re.IGNORECASE): + jsoninfo[k] = 'No' + if isinstance(v, bool): + if v: + jsoninfo[k] = 'Yes' + else: + jsoninfo[k] = 'No' + if k not in supported_metadata: + logging.warn(metafile + ' contains unknown metadata key, ignoring: ' + k) + thisinfo.update(jsoninfo) + + for build in thisinfo['builds']: + for k, v in build.iteritems(): + if k in ('buildjni', 'gradle', 'maven', 'kivy'): + # convert standard types to mixed datatype legacy format + if isinstance(v, bool): + if v: + build[k] = ['yes'] + else: + build[k] = ['no'] + elif k == 'versionCode': + build['vercode'] = v + del build['versionCode'] + elif k == 'versionName': + build['version'] = v + del build['versionName'] + + # TODO create schema using https://pypi.python.org/pypi/jsonschema + return (appid, thisinfo) + + def parse_txt_metadata(metafile): appid = None From 9e5dd19fc8ea806267b06d448c9193d8f48d9885 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Tue, 21 Jul 2015 23:19:56 -0700 Subject: [PATCH 04/22] add test files to pre-commit hook and fix pep8 errors --- hooks/pre-commit | 2 +- tests/common.TestCase | 16 ++++++++-------- tests/install.TestCase | 8 ++++---- tests/update.TestCase | 13 +++++++------ 4 files changed, 20 insertions(+), 19 deletions(-) diff --git a/hooks/pre-commit b/hooks/pre-commit index 37183631..891ad19b 100755 --- a/hooks/pre-commit +++ b/hooks/pre-commit @@ -6,7 +6,7 @@ # Redirect output to stderr. exec 1>&2 -PY_FILES="fdroid makebuildserver setup.py examples/*.py buildserver/*.py fdroidserver/*.py" +PY_FILES="fdroid makebuildserver setup.py examples/*.py buildserver/*.py fdroidserver/*.py tests/*.TestCase" SH_FILES="hooks/pre-commit" BASH_FILES="fd-commit jenkins-build docs/update.sh completion/bash-completion" RB_FILES="buildserver/cookbooks/*/recipes/*.rb" diff --git a/tests/common.TestCase b/tests/common.TestCase index 2b2496bc..9f80c1df 100755 --- a/tests/common.TestCase +++ b/tests/common.TestCase @@ -12,16 +12,16 @@ import sys import tempfile import unittest -localmodule = os.path.realpath(os.path.join( - os.path.dirname(inspect.getfile(inspect.currentframe())), - '..')) +localmodule = os.path.realpath( + os.path.join(os.path.dirname(inspect.getfile(inspect.currentframe())), '..')) print('localmodule: ' + localmodule) if localmodule not in sys.path: - sys.path.insert(0,localmodule) + sys.path.insert(0, localmodule) import fdroidserver.common import fdroidserver.metadata + class CommonTest(unittest.TestCase): '''fdroidserver/common.py''' @@ -50,7 +50,7 @@ class CommonTest(unittest.TestCase): def test_find_sdk_tools_cmd(self): fdroidserver.common.config = dict() # TODO add this once everything works without sdk_path set in config - #self._find_all() + # self._find_all() sdk_path = os.getenv('ANDROID_HOME') if os.path.exists(sdk_path): fdroidserver.common.config['sdk_path'] = sdk_path @@ -67,7 +67,7 @@ class CommonTest(unittest.TestCase): config = dict() config['sdk_path'] = os.getenv('ANDROID_HOME') fdroidserver.common.config = config - self._set_build_tools(); + self._set_build_tools() config['aapt'] = fdroidserver.common.find_sdk_tools_cmd('aapt') # these are set debuggable testfiles = [] @@ -91,13 +91,13 @@ class CommonTest(unittest.TestCase): for name in ["org.fdroid.fdroid", "org.f_droid.fdr0ID"]: self.assertTrue(fdroidserver.common.is_valid_package_name(name), - "{0} should be a valid package name".format(name)) + "{0} should be a valid package name".format(name)) for name in ["0rg.fdroid.fdroid", ".f_droid.fdr0ID", "org.fdroid/fdroid", "/org.fdroid.fdroid"]: self.assertFalse(fdroidserver.common.is_valid_package_name(name), - "{0} should not be a valid package name".format(name)) + "{0} should not be a valid package name".format(name)) def test_prepare_sources(self): testint = 99999999 diff --git a/tests/install.TestCase b/tests/install.TestCase index f0a6a968..2734f132 100755 --- a/tests/install.TestCase +++ b/tests/install.TestCase @@ -9,16 +9,16 @@ import os import sys import unittest -localmodule = os.path.realpath(os.path.join( - os.path.dirname(inspect.getfile(inspect.currentframe())), - '..')) +localmodule = os.path.realpath( + os.path.join(os.path.dirname(inspect.getfile(inspect.currentframe())), '..')) print('localmodule: ' + localmodule) if localmodule not in sys.path: - sys.path.insert(0,localmodule) + sys.path.insert(0, localmodule) import fdroidserver.common import fdroidserver.install + class InstallTest(unittest.TestCase): '''fdroidserver/install.py''' diff --git a/tests/update.TestCase b/tests/update.TestCase index c5f4a4c8..aa342aba 100755 --- a/tests/update.TestCase +++ b/tests/update.TestCase @@ -4,22 +4,23 @@ # http://www.drdobbs.com/testing/unit-testing-with-python/240165163 import inspect +import logging import optparse import os import sys import unittest -localmodule = os.path.realpath(os.path.join( - os.path.dirname(inspect.getfile(inspect.currentframe())), - '..')) +localmodule = os.path.realpath( + os.path.join(os.path.dirname(inspect.getfile(inspect.currentframe())), '..')) print('localmodule: ' + localmodule) if localmodule not in sys.path: - sys.path.insert(0,localmodule) + sys.path.insert(0, localmodule) import fdroidserver.common import fdroidserver.update from fdroidserver.common import FDroidPopen + class UpdateTest(unittest.TestCase): '''fdroid update''' @@ -39,13 +40,13 @@ class UpdateTest(unittest.TestCase): return sig else: return None - + def testGoodGetsig(self): apkfile = os.path.join(os.path.dirname(__file__), 'urzip.apk') sig = self.javagetsig(apkfile) self.assertIsNotNone(sig, "sig is None") pysig = fdroidserver.update.getsig(apkfile) - self.assertIsNotNone(pysig, "pysig is None") + self.assertIsNotNone(pysig, "pysig is None") self.assertEquals(sig, fdroidserver.update.getsig(apkfile), "python sig not equal to java sig!") self.assertEquals(len(sig), len(pysig), From eeb8ba02b05aa79679076cc5e5415665a0e042d2 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Wed, 22 Jul 2015 01:12:21 -0700 Subject: [PATCH 05/22] move metadata post-parse processing to reusable function --- fdroidserver/metadata.py | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/fdroidserver/metadata.py b/fdroidserver/metadata.py index c9a39dc7..ac12599d 100644 --- a/fdroidserver/metadata.py +++ b/fdroidserver/metadata.py @@ -577,6 +577,17 @@ def get_default_app_info_list(): return thisinfo +def post_metadata_parse(thisinfo): + + if not thisinfo['Description']: + thisinfo['Description'].append('No description available') + + for build in thisinfo['builds']: + fill_build_defaults(build) + + thisinfo['builds'] = sorted(thisinfo['builds'], key=lambda build: int(build['vercode'])) + + # Parse metadata for a single application. # # 'metafile' - the filename to read. The package id for the application comes @@ -648,6 +659,8 @@ def parse_json_metadata(metafile): del build['versionName'] # TODO create schema using https://pypi.python.org/pypi/jsonschema + post_metadata_parse(thisinfo) + return (appid, thisinfo) @@ -848,13 +861,7 @@ def parse_txt_metadata(metafile): elif mode == 3: raise MetaDataException("Unterminated build in " + metafile.name) - if not thisinfo['Description']: - thisinfo['Description'].append('No description available') - - for build in thisinfo['builds']: - fill_build_defaults(build) - - thisinfo['builds'] = sorted(thisinfo['builds'], key=lambda build: int(build['vercode'])) + post_metadata_parse(thisinfo) return (appid, thisinfo) From 1bbae4cd9e79dc1646dab61de15e408e2031cce9 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Wed, 22 Jul 2015 01:16:43 -0700 Subject: [PATCH 06/22] add test for metadata parsing based on a parse output to a pickle This is a test to cover future modifications of the .txt metadata parsing. The pickle file was generated by just dumping the current parsed metadata, so this test will always succeed if the parsing is not changed. --- tests/metadata.TestCase | 54 ++ tests/metadata/org.smssecure.smssecure.pickle | 755 ++++++++++++++++++ tests/metadata/org.smssecure.smssecure.txt | 125 +++ 3 files changed, 934 insertions(+) create mode 100755 tests/metadata.TestCase create mode 100644 tests/metadata/org.smssecure.smssecure.pickle create mode 100644 tests/metadata/org.smssecure.smssecure.txt diff --git a/tests/metadata.TestCase b/tests/metadata.TestCase new file mode 100755 index 00000000..6778606e --- /dev/null +++ b/tests/metadata.TestCase @@ -0,0 +1,54 @@ +#!/usr/bin/env python2 +# -*- coding: utf-8 -*- + +# http://www.drdobbs.com/testing/unit-testing-with-python/240165163 + +import inspect +import optparse +import os +import pickle +import sys +import unittest + +localmodule = os.path.realpath( + os.path.join(os.path.dirname(inspect.getfile(inspect.currentframe())), '..')) +print('localmodule: ' + localmodule) +if localmodule not in sys.path: + sys.path.insert(0, localmodule) + +import fdroidserver.common +import fdroidserver.metadata + + +class MetadataTest(unittest.TestCase): + '''fdroidserver/metadata.py''' + + def test_read_metadata(self): + testsdir = os.path.dirname(__file__) + os.chdir(testsdir) + + self.maxDiff = None + + # these only need to be set to prevent code running on None. The + # values are not used in metadata.py + config = dict() + config['sdk_path'] = '/opt/android-sdk' + config['ndk_paths'] = dict() + fdroidserver.common.config = config + + apps = fdroidserver.metadata.read_metadata(xref=True) + for appid in ('org.smssecure.smssecure', 'org.adaway'): + frompickle = pickle.load(open(os.path.join('metadata', appid + '.pickle'))) + self.assertTrue(appid in apps.keys()) + self.assertEquals(apps[appid], frompickle) + + +if __name__ == "__main__": + parser = optparse.OptionParser() + parser.add_option("-v", "--verbose", action="store_true", default=False, + help="Spew out even more information than normal") + (fdroidserver.common.options, args) = parser.parse_args(['--verbose']) + + newSuite = unittest.TestSuite() + newSuite.addTest(unittest.makeSuite(MetadataTest)) + unittest.main() diff --git a/tests/metadata/org.smssecure.smssecure.pickle b/tests/metadata/org.smssecure.smssecure.pickle new file mode 100644 index 00000000..4cd8f2a8 --- /dev/null +++ b/tests/metadata/org.smssecure.smssecure.pickle @@ -0,0 +1,755 @@ +(dp0 +S'Update Check Data' +p1 +NsS'Bitcoin' +p2 +NsS'AntiFeatures' +p3 +NsS'Web Site' +p4 +S'http://www.smssecure.org' +p5 +sS'Auto Update Mode' +p6 +S'Version v%v' +p7 +sS'Provides' +p8 +NsS'Issue Tracker' +p9 +S'https://github.com/SMSSecure/SMSSecure/issues' +p10 +sS'Donate' +p11 +NsS'Repo Type' +p12 +S'git' +p13 +sS'Description' +p14 +(lp15 +S'SMSSecure is an SMS/MMS application that allows you to protect your privacy while communicating with friends.' +p16 +aS'Using SMSSecure, you can send SMS messages and share media or attachments with complete privacy.' +p17 +aS'' +p18 +aS"* Easy. SMSSecure works like any other SMS application. There's nothing to sign up for and no new service your friends need to join." +p19 +aS'* Reliable. SMSSecure communicates using encrypted SMS messages. No servers or internet connection required.' +p20 +aS'* Private. SMSSecure uses the TextSecure encryption protocol to provide privacy for every message, every time.' +p21 +aS'* Safe. All messages are encrypted locally, so if your phone is lost or stolen, your messages are protected.' +p22 +aS'* Open Source. SMSSecure is Free and Open Source, enabling anyone to verify its security by auditing the code.' +p23 +asS'Requires Root' +p24 +I00 +sS'comments' +p25 +(lp26 +sS'id' +p27 +S'org.smssecure.smssecure' +p28 +sS'Repo' +p29 +S'https://github.com/SMSSecure/SMSSecure' +p30 +sS'No Source Since' +p31 +g18 +sS'Auto Name' +p32 +S'SMSSecure' +p33 +sS'Categories' +p34 +(lp35 +S'Phone & SMS' +p36 +asS'Source Code' +p37 +S'https://github.com/SMSSecure/SMSSecure' +p38 +sS'Litecoin' +p39 +NsS'Update Check Ignore' +p40 +NsS'Name' +p41 +NsS'License' +p42 +S'GPLv3' +p43 +sS'Changelog' +p44 +g18 +sS'Update Check Mode' +p45 +S'Tags' +p46 +sS'Summary' +p47 +S'Send encrypted text messages (SMS)' +p48 +sS'Dogecoin' +p49 +NsS'Maintainer Notes' +p50 +(lp51 +sS'Current Version Code' +p52 +S'102' +p53 +sS'Binaries' +p54 +NsS'Archive Policy' +p55 +NsS'builds' +p56 +(lp57 +(dp58 +S'submodules' +p59 +I00 +sS'vercode' +p60 +S'5' +p61 +sS'forceversion' +p62 +I00 +sS'oldsdkloc' +p63 +I00 +sS'kivy' +p64 +I00 +sS'patch' +p65 +(lp66 +sS'scanignore' +p67 +(lp68 +sS'srclibs' +p69 +(lp70 +S'GradleWitness@10f1269c0aafdc1d478efc005ed48f3a47d44278' +p71 +aS'PreferenceFragment@717a45433b927d2f0dfc5328f79e77c9682c37bc' +p72 +aS'ShortcutBadger@3815ce2ec0c66acd7d7c0b4f2479df8fa70fed87' +p73 +aS'AospMms@android-5.1.0_r3' +p74 +asS'encoding' +p75 +NsS'extlibs' +p76 +(lp77 +sS'init' +p78 +g18 +sS'version' +p79 +S'0.3.3' +p80 +sS'subdir' +p81 +NsS'rm' +p82 +(lp83 +S'libs/*' +p84 +asS'type' +p85 +S'gradle' +p86 +sS'build' +p87 +g18 +sS'ndk_path' +p88 +g18 +sS'forcevercode' +p89 +I01 +sS'preassemble' +p90 +(lp91 +sS'update' +p92 +(lp93 +S'auto' +p94 +asS'maven' +p95 +I00 +sS'disable' +p96 +S'builds, merge changes into upstream' +p97 +sS'commit' +p98 +S'66367479a4f57f347b5cbe8f6f8f632adaae7727' +p99 +sS'scandelete' +p100 +(lp101 +sS'buildjni' +p102 +(lp103 +sS'ndk' +p104 +S'r10e' +p105 +sS'target' +p106 +NsS'antcommands' +p107 +NsS'gradle' +p108 +(lp109 +S'yes' +p110 +asS'prebuild' +p111 +S"touch signing.properties && pushd $$GradleWitness$$ && gradle jar && popd && cp $$GradleWitness$$/build/libs/GradleWitness.jar libs/gradle-witness.jar && sed -i -e '20,22d' build.gradle && pushd $$PreferenceFragment$$ && gradle uploadArchives && popd && sed -i -e '/5470f5872514a6226fa1fc6f4e000991f38805691c534cf0bd2778911fc773ad/d' build.gradle && mkdir smil && pushd smil && wget -c http://www.w3.org/TR/smil-boston-dom/java-binding.zip && unzip java-binding.zip && popd && cp -fR smil/java/org src/ && rm -fR smil && sed -i -e '/org.w3c.smil/d' build.gradle && cp -fR $$AospMms$$/src/org src/ " +p112 +sS'novcheck' +p113 +I00 +sS'output' +p114 +Nsa(dp115 +S'submodules' +p116 +I01 +sg60 +S'6' +p117 +sg62 +I00 +sg63 +I00 +sg64 +I00 +sg65 +g66 +sg67 +g68 +sS'srclibs' +p118 +(lp119 +S'GradleWitness@10f1269c0aafdc1d478efc005ed48f3a47d44278' +p120 +asg75 +Nsg76 +g77 +sg78 +g18 +sg79 +S'0.3.3' +p121 +sg81 +NsS'rm' +p122 +(lp123 +S'libs/*.jar' +p124 +asg85 +g86 +sg87 +g18 +sg88 +g18 +sS'forcevercode' +p125 +I00 +sg90 +g91 +sg92 +g93 +sg95 +I00 +sS'disable' +p126 +S'builds, wait for upstream' +p127 +sS'commit' +p128 +S'9675ce5eecb929dcaddb43b3d9486fdb88b9ae1a' +p129 +sg100 +g101 +sg102 +g103 +sg104 +g105 +sg106 +Nsg107 +NsS'gradle' +p130 +(lp131 +g110 +asS'prebuild' +p132 +S'touch signing.properties && pushd $$GradleWitness$$ && gradle jar && popd && cp $$GradleWitness$$/build/libs/GradleWitness.jar libs/gradle-witness.jar' +p133 +sg113 +I00 +sg114 +Nsa(dp134 +S'submodules' +p135 +I01 +sg60 +S'9' +p136 +sg62 +I00 +sg63 +I00 +sg64 +I00 +sg65 +g66 +sg67 +g68 +sS'srclibs' +p137 +(lp138 +sg75 +Nsg76 +g77 +sg78 +g18 +sg79 +S'0.4.2' +p139 +sg81 +NsS'rm' +p140 +(lp141 +S'libs/*.jar' +p142 +asg85 +g86 +sg87 +g18 +sg88 +g18 +sg125 +I00 +sg90 +g91 +sg92 +g93 +sg95 +I00 +sS'disable' +p143 +S'builds locally, but not on BS' +p144 +sS'commit' +p145 +S'v0.4.2' +p146 +sg100 +g101 +sg102 +g103 +sg104 +g105 +sg106 +Nsg107 +NsS'gradle' +p147 +(lp148 +g110 +asS'prebuild' +p149 +S'touch signing.properties && ./build-witness.sh && rm -rf libs/gradle-witness/build && echo "org.gradle.jvmargs=-Xms512m -Xmx512m -XX:MaxPermSize=512m" >> gradle.properties' +p150 +sg113 +I00 +sg114 +Nsa(dp151 +S'submodules' +p152 +I01 +sg60 +S'11' +p153 +sg62 +I00 +sg63 +I00 +sg64 +I00 +sg65 +g66 +sg67 +g68 +sg137 +g138 +sg75 +Nsg76 +g77 +sg78 +g18 +sg79 +S'0.5.1' +p154 +sg81 +NsS'rm' +p155 +(lp156 +S'libs/*.jar' +p157 +asg85 +g86 +sg87 +g18 +sg88 +g18 +sg125 +I00 +sg90 +g91 +sg92 +g93 +sg95 +I00 +sS'disable' +p158 +I00 +sS'commit' +p159 +S'v0.5.1' +p160 +sg100 +g101 +sg102 +g103 +sg104 +g105 +sg106 +Nsg107 +NsS'gradle' +p161 +(lp162 +g110 +asS'prebuild' +p163 +S'touch signing.properties && ./build-witness.sh && rm -rf libs/gradle-witness/build && echo "org.gradle.jvmargs=-Xms512m -Xmx512m -XX:MaxPermSize=512m" >> gradle.properties' +p164 +sg113 +I00 +sg114 +Nsa(dp165 +S'submodules' +p166 +I01 +sg60 +S'12' +p167 +sg62 +I00 +sg63 +I00 +sg64 +I00 +sg65 +g66 +sg67 +g68 +sg137 +g138 +sg75 +Nsg76 +g77 +sg78 +g18 +sg79 +S'0.5.2' +p168 +sg81 +NsS'rm' +p169 +(lp170 +S'libs/*.jar' +p171 +asg85 +g86 +sg87 +g18 +sg88 +g18 +sg125 +I00 +sg90 +g91 +sg92 +g93 +sg95 +I00 +sS'disable' +p172 +S'broken in upstream' +p173 +sS'commit' +p174 +S'v0.5.2' +p175 +sg100 +g101 +sg102 +g103 +sg104 +g105 +sg106 +Nsg107 +NsS'gradle' +p176 +(lp177 +g110 +asS'prebuild' +p178 +S'touch signing.properties && ./scripts/build-witness.sh && rm -rf libs/gradle-witness/build' +p179 +sg113 +I00 +sg114 +Nsa(dp180 +S'submodules' +p181 +I01 +sg60 +S'100' +p182 +sg62 +I00 +sg63 +I00 +sg64 +I00 +sg65 +g66 +sg67 +g68 +sg137 +g138 +sg75 +Nsg76 +g77 +sg78 +g18 +sg79 +S'0.5.3' +p183 +sg81 +NsS'rm' +p184 +(lp185 +S'libs/*.jar' +p186 +asg85 +g86 +sg87 +g18 +sg88 +g18 +sg125 +I00 +sg90 +g91 +sg92 +g93 +sg95 +I00 +sg158 +I00 +sS'commit' +p187 +S'v0.5.3' +p188 +sg100 +g101 +sg102 +g103 +sg104 +g105 +sg106 +Nsg107 +NsS'gradle' +p189 +(lp190 +g110 +asS'prebuild' +p191 +S'touch signing.properties && ./scripts/build-witness.sh && rm -rf libs/gradle-witness/build' +p192 +sg113 +I00 +sg114 +Nsa(dp193 +S'submodules' +p194 +I01 +sg60 +S'101' +p195 +sg62 +I00 +sg63 +I00 +sg64 +I00 +sg65 +g66 +sg67 +g68 +sg137 +g138 +sg75 +Nsg76 +g77 +sg78 +g18 +sg79 +S'0.5.4' +p196 +sg81 +NsS'rm' +p197 +(lp198 +S'libs/*.jar' +p199 +asg85 +g86 +sg87 +g18 +sg88 +g18 +sg125 +I00 +sg90 +g91 +sg92 +g93 +sg95 +I00 +sg158 +I00 +sS'commit' +p200 +S'v0.5.4' +p201 +sg100 +g101 +sg102 +g103 +sg104 +g105 +sg106 +Nsg107 +NsS'gradle' +p202 +(lp203 +g110 +asS'prebuild' +p204 +S'touch signing.properties && ./scripts/build-witness.sh && rm -rf libs/gradle-witness/build' +p205 +sg113 +I00 +sg114 +Nsa(dp206 +S'submodules' +p207 +I01 +sg60 +S'102' +p208 +sg62 +I00 +sg63 +I00 +sg64 +I00 +sg65 +g66 +sg67 +g68 +sg137 +g138 +sg75 +Nsg76 +g77 +sg78 +g18 +sg79 +S'0.6.0' +p209 +sg81 +NsS'rm' +p210 +(lp211 +S'libs/*.jar' +p212 +asg85 +g86 +sg87 +g18 +sg88 +g18 +sg125 +I00 +sg90 +g91 +sg92 +g93 +sg95 +I00 +sg158 +I00 +sS'commit' +p213 +S'v0.6.0' +p214 +sg100 +g101 +sg102 +g103 +sg104 +g105 +sg106 +Nsg107 +NsS'gradle' +p215 +(lp216 +g110 +asS'prebuild' +p217 +S'touch signing.properties && ./scripts/build-witness.sh && rm -rf libs/gradle-witness/build' +p218 +sg113 +I00 +sg114 +NsasS'FlattrID' +p219 +NsS'Disabled' +p220 +NsS'Update Check Name' +p221 +NsS'Vercode Operation' +p222 +NsS'Current Version' +p223 +S'0.6.0' +p224 +s. \ No newline at end of file diff --git a/tests/metadata/org.smssecure.smssecure.txt b/tests/metadata/org.smssecure.smssecure.txt new file mode 100644 index 00000000..2f324b7d --- /dev/null +++ b/tests/metadata/org.smssecure.smssecure.txt @@ -0,0 +1,125 @@ +Categories:Phone & SMS +License:GPLv3 +Web Site:http://www.smssecure.org +Source Code:https://github.com/SMSSecure/SMSSecure +Issue Tracker:https://github.com/SMSSecure/SMSSecure/issues + +Auto Name:SMSSecure +Summary:Send encrypted text messages (SMS) +Description: +SMSSecure is an SMS/MMS application that allows you to protect your privacy while communicating with friends. +Using SMSSecure, you can send SMS messages and share media or attachments with complete privacy. + +* Easy. SMSSecure works like any other SMS application. There's nothing to sign up for and no new service your friends need to join. +* Reliable. SMSSecure communicates using encrypted SMS messages. No servers or internet connection required. +* Private. SMSSecure uses the TextSecure encryption protocol to provide privacy for every message, every time. +* Safe. All messages are encrypted locally, so if your phone is lost or stolen, your messages are protected. +* Open Source. SMSSecure is Free and Open Source, enabling anyone to verify its security by auditing the code. +. + +Repo Type:git +Repo:https://github.com/SMSSecure/SMSSecure + +Build:0.3.3,5 + disable=builds, merge changes into upstream + commit=66367479a4f57f347b5cbe8f6f8f632adaae7727 + gradle=yes + srclibs=GradleWitness@10f1269c0aafdc1d478efc005ed48f3a47d44278,PreferenceFragment@717a45433b927d2f0dfc5328f79e77c9682c37bc,ShortcutBadger@3815ce2ec0c66acd7d7c0b4f2479df8fa70fed87,AospMms@android-5.1.0_r3 + forcevercode=yes + rm=libs/* + prebuild=touch signing.properties && \ + pushd $$GradleWitness$$ && \ + gradle jar && \ + popd && \ + cp $$GradleWitness$$/build/libs/GradleWitness.jar libs/gradle-witness.jar && \ + sed -i -e '20,22d' build.gradle && \ + pushd $$PreferenceFragment$$ && \ + gradle uploadArchives && \ + popd && \ + sed -i -e '/5470f5872514a6226fa1fc6f4e000991f38805691c534cf0bd2778911fc773ad/d' build.gradle && \ + mkdir smil && \ + pushd smil && \ + wget -c http://www.w3.org/TR/smil-boston-dom/java-binding.zip && \ + unzip java-binding.zip && \ + popd && \ + cp -fR smil/java/org src/ && \ + rm -fR smil && \ + sed -i -e '/org.w3c.smil/d' build.gradle && \ + cp -fR $$AospMms$$/src/org src/ + +Build:0.3.3,6 + disable=builds, wait for upstream + commit=9675ce5eecb929dcaddb43b3d9486fdb88b9ae1a + submodules=yes + gradle=yes + srclibs=GradleWitness@10f1269c0aafdc1d478efc005ed48f3a47d44278 + rm=libs/*.jar + prebuild=touch signing.properties && \ + pushd $$GradleWitness$$ && \ + gradle jar && \ + popd && \ + cp $$GradleWitness$$/build/libs/GradleWitness.jar libs/gradle-witness.jar + +Build:0.4.2,9 + disable=builds locally, but not on BS + commit=v0.4.2 + submodules=yes + gradle=yes + rm=libs/*.jar + prebuild=touch signing.properties && \ + ./build-witness.sh && \ + rm -rf libs/gradle-witness/build && \ + echo "org.gradle.jvmargs=-Xms512m -Xmx512m -XX:MaxPermSize=512m" >> gradle.properties + +Build:0.5.1,11 + commit=v0.5.1 + submodules=yes + gradle=yes + rm=libs/*.jar + prebuild=touch signing.properties && \ + ./build-witness.sh && \ + rm -rf libs/gradle-witness/build && \ + echo "org.gradle.jvmargs=-Xms512m -Xmx512m -XX:MaxPermSize=512m" >> gradle.properties + +Build:0.5.2,12 + disable=broken in upstream + commit=v0.5.2 + submodules=yes + gradle=yes + rm=libs/*.jar + prebuild=touch signing.properties && \ + ./scripts/build-witness.sh && \ + rm -rf libs/gradle-witness/build + +Build:0.5.3,100 + commit=v0.5.3 + submodules=yes + gradle=yes + rm=libs/*.jar + prebuild=touch signing.properties && \ + ./scripts/build-witness.sh && \ + rm -rf libs/gradle-witness/build + +Build:0.5.4,101 + commit=v0.5.4 + submodules=yes + gradle=yes + rm=libs/*.jar + prebuild=touch signing.properties && \ + ./scripts/build-witness.sh && \ + rm -rf libs/gradle-witness/build + +Build:0.6.0,102 + commit=v0.6.0 + submodules=yes + gradle=yes + rm=libs/*.jar + prebuild=touch signing.properties && \ + ./scripts/build-witness.sh && \ + rm -rf libs/gradle-witness/build + +Auto Update Mode:Version v%v +Update Check Mode:Tags +Current Version:0.6.0 +Current Version Code:102 + From 61f6be1a7bd5f03e9a14a04010d51860275ae6e5 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Wed, 22 Jul 2015 09:59:50 -0700 Subject: [PATCH 07/22] in JSON metadata, convert unicode to str to match the internal format fdroidserver currently uses plain python 2.x strings rather than unicode strings, so the parsed JSON should produce the same format as the parsed .txt metadata. --- fdroidserver/metadata.py | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/fdroidserver/metadata.py b/fdroidserver/metadata.py index ac12599d..58b774a3 100644 --- a/fdroidserver/metadata.py +++ b/fdroidserver/metadata.py @@ -614,6 +614,36 @@ def post_metadata_parse(thisinfo): # +def _decode_list(data): + '''convert items in a list from unicode to basestring''' + rv = [] + for item in data: + if isinstance(item, unicode): + item = item.encode('utf-8') + elif isinstance(item, list): + item = _decode_list(item) + elif isinstance(item, dict): + item = _decode_dict(item) + rv.append(item) + return rv + + +def _decode_dict(data): + '''convert items in a dict from unicode to basestring''' + rv = {} + for key, value in data.iteritems(): + if isinstance(key, unicode): + key = key.encode('utf-8') + if isinstance(value, unicode): + value = value.encode('utf-8') + elif isinstance(value, list): + value = _decode_list(value) + elif isinstance(value, dict): + value = _decode_dict(value) + rv[key] = value + return rv + + def parse_json_metadata(metafile): appid = os.path.basename(metafile)[0:-5] # strip path and .json @@ -623,6 +653,7 @@ def parse_json_metadata(metafile): # fdroid metadata is only strings and booleans, no floats or ints. And # json returns unicode, and fdroidserver still uses plain python strings jsoninfo = json.load(open(metafile, 'r'), + object_hook=_decode_dict, parse_int=lambda s: s, parse_float=lambda s: s) supported_metadata = app_defaults.keys() + ['builds', 'comments'] From dabb7e42b78973d30f130d190ad9c3341cfa10a9 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Wed, 22 Jul 2015 11:08:35 -0700 Subject: [PATCH 08/22] add test case for JSON parsing, based on parsed .txt metadata The .pickle was created by dumping the output from parsing the current .txt metadata for org.adaway. The JSON started from that pickle dump, but was then hand edited to be more proper JSON, e.g. using boolean values. --- tests/metadata/org.adaway.json | 284 ++++ tests/metadata/org.adaway.pickle | 2260 ++++++++++++++++++++++++++++++ 2 files changed, 2544 insertions(+) create mode 100644 tests/metadata/org.adaway.json create mode 100644 tests/metadata/org.adaway.pickle diff --git a/tests/metadata/org.adaway.json b/tests/metadata/org.adaway.json new file mode 100644 index 00000000..ee9df7e2 --- /dev/null +++ b/tests/metadata/org.adaway.json @@ -0,0 +1,284 @@ +{ + "Auto Name": "AdAway", + "Auto Update Mode": "Version v%v", + "Categories": ["System", "Security"], + "Current Version": "3.0", + "Current Version Code": "52", + "Description": [ + "An ad blocker that uses the hosts file. The hosts file", + "contains a list of mappings between hostnames and IP addresses. When", + "an app requests an ad, that request is directed to 127.0.0.1 which does", + "nothing. There are options to run a web server", + "to respond to blocked hostnames and to direct requests to the IP", + "address of your choosing. You can download hosts files from the", + "app but it is possible to use your own and to add certain sites", + "to the white- and black-lists.", + "", + "[https://github.com/dschuermann/ad-away/raw/HEAD/CHANGELOG Changelog]", + "", + "Requires root: Yes. The hosts files is located in /system which is normally", + "read-only." + ], + "Donate": "http://sufficientlysecure.org/index.php/adaway", + "FlattrID": "369138", + "Issue Tracker": "https://github.com/dschuermann/ad-away/issues", + "License": "GPLv3", + "Provides": "org.sufficientlysecure.adaway", + "Repo": "https://github.com/dschuermann/ad-away.git", + "Repo Type": "git", + "Requires Root": true, + "Source Code": "https://github.com/dschuermann/ad-away", + "Summary": "Block advertisements", + "Update Check Mode": "Tags", + "Web Site": "http://sufficientlysecure.org/index.php/adaway", + + "builds": [ + { + "buildjni": true, + "commit": "ea5378a94ee0dc1d99d2cec95fae7e6d81afb2b9", + "subdir": "org_adaway/", + "versionCode": "13", + "versionName": "1.12" + }, + { + "buildjni": true, + "commit": "4128e59da2eac5c2904c7c7568d298ca51e79540", + "patch": ["defprop.patch"], + "subdir": "org_adaway/", + "versionCode": "16", + "versionName": "1.15" + }, + { + "buildjni": true, + "commit": "0b9985398b9eef7baf6aadd0dbb12002bc199d2e", + "patch": ["defprop.patch"], + "subdir": "org_adaway/", + "versionCode": "19", + "versionName": "1.18" + }, + { + "buildjni": true, + "commit": "ab27f4dab5f3ea5e228cfb4a6b0e1fbf53695f22", + "patch": ["defprop.patch"], + "subdir": "org_adaway/", + "versionCode": "20", + "versionName": "1.19" + }, + { + "buildjni": true, + "commit": "695e3801e4081026c8f7213a2345fc451d5eb89c", + "patch": ["defprop.patch"], + "subdir": "org_adaway/", + "versionCode": "21", + "versionName": "1.20" + }, + { + "buildjni": true, + "commit": "65138c11cc8b6affd28b68e125fbc1dff0886a4e", + "patch": ["defprop.patch"], + "subdir": "org_adaway/", + "versionCode": "22", + "versionName": "1.21" + }, + { + "commit": "unknown - see disabled", + "disable": "no source in repo", + "versionCode": "24", + "versionName": "1.23" + }, + { + "buildjni": true, + "commit": "f811e53e1e1d2ee047b18715fd7d2072b90ae76b", + "prebuild": "android update project -p ../com_actionbarsherlock", + "subdir": "org_adaway/", + "versionCode": "25", + "versionName": "1.24" + }, + { + "buildjni": true, + "commit": "ff97932761cdee68638dc2550751a64b2cbe18e7", + "prebuild": "android update project -p ../com_actionbarsherlock", + "subdir": "org_adaway/", + "versionCode": "26", + "versionName": "1.25" + }, + { + "buildjni": true, + "commit": "33d4d80998f30bafc88c04c80cbae00b03916f99", + "prebuild": "android update project -p ../com_actionbarsherlock", + "subdir": "org_adaway/", + "versionCode": "27", + "versionName": "1.26" + }, + { + "buildjni": true, + "commit": "743d25a7e287505461f33f4b8e57e4cf988fffea", + "prebuild": "android update project -p ../com_actionbarsherlock", + "subdir": "org_adaway/", + "versionCode": "28", + "versionName": "1.27" + }, + { + "buildjni": true, + "commit": "eaa07f4", + "prebuild": "android update project -p ../com_actionbarsherlock && rm -rf libs/armeabi/*", + "subdir": "org_adaway/", + "versionCode": "30", + "versionName": "1.29" + }, + { + "buildjni": false, + "commit": "71ced3f", + "prebuild": "android update project -p ../com_actionbarsherlock && rm -rf libs/armeabi/* && rm libs/android-support-v4.jar", + "subdir": "org_adaway/", + "versionCode": "33", + "versionName": "1.32" + }, + { + "buildjni": false, + "commit": "9d63c18", + "prebuild": "android update project -p ../com_actionbarsherlock && rm -rf libs/armeabi/*", + "subdir": "org_adaway/", + "versionCode": "34", + "versionName": "1.33" + }, + { + "buildjni": false, + "commit": "f2568b1", + "prebuild": "android update project -p ../com_actionbarsherlock && rm -rf libs/armeabi/* && android update project -p ../org_donations", + "subdir": "org_adaway/", + "versionCode": "35", + "versionName": "1.34" + }, + { + "buildjni": false, + "commit": "7442d5d", + "prebuild": "android update project -p ../com_actionbarsherlock && rm -rf libs/armeabi/* && android update project -p ../org_donations", + "subdir": "org_adaway/", + "versionCode": "36", + "versionName": "1.35" + }, + { + "buildjni": false, + "commit": "83fc713", + "prebuild": "android update project -p ../com_actionbarsherlock && rm -rf libs/armeabi/* && android update project -p ../org_donations", + "subdir": "org_adaway/", + "versionCode": "37", + "versionName": "1.36" + }, + { + "buildjni": false, + "commit": "70da32b567122b701cdcb1609b780eb85732028f", + "prebuild": "android update project -p ../com_actionbarsherlock && rm -rf libs/armeabi/* && android update project -p ../org_donations", + "subdir": "org_adaway/", + "versionCode": "38", + "versionName": "1.37" + }, + { + "buildjni": true, + "commit": "v2.1", + "extlibs": ["htmlcleaner/htmlcleaner-2.2.jar"], + "init": "rm android-libs/Donations/custom_rules.xml && git clone https://github.com/dschuermann/HtmlSpanner android-libs/HtmlSpanner", + "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": [".", + "android-libs/Donations", + "android-libs/ActionBarSherlock", + "android-libs/HtmlSpanner/htmlspanner"], + "versionCode": "40", + "versionName": "2.1" + }, + { + "buildjni": true, + "commit": "v2.3", + "extlibs": ["htmlcleaner/htmlcleaner-2.2.jar"], + "init": "rm android-libs/Donations/custom_rules.xml && git clone https://github.com/dschuermann/HtmlSpanner android-libs/HtmlSpanner", + "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": [".", + "android-libs/Donations", + "android-libs/ActionBarSherlock", + "android-libs/HtmlSpanner/htmlspanner"], + "versionCode": "42", + "versionName": "2.3" + }, + { + "buildjni": true, + "commit": "v2.6", + "gradle": true, + "preassemble": ["renameExecutables"], + "subdir": "AdAway", + "versionCode": "45", + "versionName": "2.6" + }, + { + "buildjni": true, + "commit": "v2.7", + "gradle": true, + "preassemble": ["renameExecutables"], + "subdir": "AdAway", + "versionCode": "46", + "versionName": "2.7" + }, + { + "buildjni": true, + "commit": "v2.8", + "gradle": true, + "preassemble": ["renameExecutables"], + "subdir": "AdAway", + "versionCode": "47", + "versionName": "2.8" + }, + { + "buildjni": true, + "commit": "v2.8.1", + "gradle": true, + "preassemble": ["renameExecutables"], + "subdir": "AdAway", + "versionCode": "48", + "versionName": "2.8.1" + }, + { + "buildjni": true, + "commit": "v2.9", + "gradle": true, + "preassemble": ["renameExecutables"], + "subdir": "AdAway", + "versionCode": "49", + "versionName": "2.9" + }, + { + "buildjni": true, + "commit": "v2.9.1", + "gradle": true, + "preassemble": ["renameExecutables"], + "subdir": "AdAway", + "versionCode": "50", + "versionName": "2.9.1" + }, + { + "buildjni": true, + "commit": "v2.9.2", + "gradle": true, + "preassemble": ["renameExecutables"], + "subdir": "AdAway", + "versionCode": "51", + "versionName": "2.9.2" + }, + { + "buildjni": true, + "commit": "v3.0", + "gradle": true, + "preassemble": ["renameExecutables"], + "subdir": "AdAway", + "versionCode": "52", + "versionName": "3.0" + } + ], + "comments": [ + ["build:40", "#RootCommands srclib needs changing on fdroidserver"], + ["build:42", "#RootCommands srclib needs changing on fdroidserver"] + ] +} diff --git a/tests/metadata/org.adaway.pickle b/tests/metadata/org.adaway.pickle new file mode 100644 index 00000000..d6165f4e --- /dev/null +++ b/tests/metadata/org.adaway.pickle @@ -0,0 +1,2260 @@ +(dp0 +S'Update Check Data' +p1 +NsS'Bitcoin' +p2 +NsS'AntiFeatures' +p3 +NsS'Web Site' +p4 +S'http://sufficientlysecure.org/index.php/adaway' +p5 +sS'Auto Update Mode' +p6 +S'Version v%v' +p7 +sS'Provides' +p8 +S'org.sufficientlysecure.adaway' +p9 +sS'Issue Tracker' +p10 +S'https://github.com/dschuermann/ad-away/issues' +p11 +sS'Donate' +p12 +S'http://sufficientlysecure.org/index.php/adaway' +p13 +sS'Repo Type' +p14 +S'git' +p15 +sS'Description' +p16 +(lp17 +S'An ad blocker that uses the hosts file. The hosts file' +p18 +aS'contains a list of mappings between hostnames and IP addresses. When' +p19 +aS'an app requests an ad, that request is directed to 127.0.0.1 which does' +p20 +aS'nothing. There are options to run a web server' +p21 +aS'to respond to blocked hostnames and to direct requests to the IP' +p22 +aS'address of your choosing. You can download hosts files from the' +p23 +aS'app but it is possible to use your own and to add certain sites' +p24 +aS'to the white- and black-lists.' +p25 +aS'' +p26 +aS'[https://github.com/dschuermann/ad-away/raw/HEAD/CHANGELOG Changelog]' +p27 +ag26 +aS'Requires root: Yes. The hosts files is located in /system which is normally' +p28 +aS'read-only.' +p29 +asS'Requires Root' +p30 +S'Yes' +p31 +sS'comments' +p32 +(lp33 +(lp34 +S'build:40' +p35 +aS'#RootCommands srclib needs changing on fdroidserver' +p36 +aa(lp37 +S'build:42' +p38 +aS'#RootCommands srclib needs changing on fdroidserver' +p39 +aasS'id' +p40 +S'org.adaway' +p41 +sS'Repo' +p42 +S'https://github.com/dschuermann/ad-away.git' +p43 +sS'No Source Since' +p44 +g26 +sS'Auto Name' +p45 +S'AdAway' +p46 +sS'Categories' +p47 +(lp48 +S'System' +p49 +aS'Security' +p50 +asS'Source Code' +p51 +S'https://github.com/dschuermann/ad-away' +p52 +sS'Litecoin' +p53 +NsS'Update Check Ignore' +p54 +NsS'Name' +p55 +NsS'License' +p56 +S'GPLv3' +p57 +sS'Changelog' +p58 +g26 +sS'Update Check Mode' +p59 +S'Tags' +p60 +sS'Summary' +p61 +S'Block advertisements' +p62 +sS'Dogecoin' +p63 +NsS'Maintainer Notes' +p64 +(lp65 +sS'Current Version Code' +p66 +S'52' +p67 +sS'Binaries' +p68 +NsS'Archive Policy' +p69 +NsS'builds' +p70 +(lp71 +(dp72 +S'submodules' +p73 +I00 +sS'vercode' +p74 +S'13' +p75 +sS'forceversion' +p76 +I00 +sS'oldsdkloc' +p77 +I00 +sS'kivy' +p78 +I00 +sS'gradle' +p79 +I00 +sS'scanignore' +p80 +(lp81 +sS'srclibs' +p82 +(lp83 +sS'encoding' +p84 +NsS'extlibs' +p85 +(lp86 +sS'init' +p87 +g26 +sS'version' +p88 +S'1.12' +p89 +sS'subdir' +p90 +S'org_adaway/' +p91 +sS'rm' +p92 +(lp93 +sS'type' +p94 +S'ant' +p95 +sS'build' +p96 +g26 +sS'ndk_path' +p97 +g26 +sS'forcevercode' +p98 +I00 +sS'preassemble' +p99 +(lp100 +sS'update' +p101 +(lp102 +S'auto' +p103 +asS'maven' +p104 +I00 +sS'disable' +p105 +I00 +sS'commit' +p106 +S'ea5378a94ee0dc1d99d2cec95fae7e6d81afb2b9' +p107 +sS'scandelete' +p108 +(lp109 +sS'buildjni' +p110 +(lp111 +S'yes' +p112 +asS'ndk' +p113 +S'r10e' +p114 +sS'target' +p115 +NsS'antcommands' +p116 +NsS'patch' +p117 +(lp118 +sS'prebuild' +p119 +g26 +sS'novcheck' +p120 +I00 +sS'output' +p121 +Nsa(dp122 +g73 +I00 +sg74 +S'16' +p123 +sg76 +I00 +sg77 +I00 +sg78 +I00 +sg79 +I00 +sg80 +g81 +sg82 +g83 +sg84 +Nsg85 +g86 +sg87 +g26 +sg88 +S'1.15' +p124 +sS'subdir' +p125 +S'org_adaway/' +p126 +sg92 +g93 +sg94 +g95 +sg96 +g26 +sg97 +g26 +sg98 +I00 +sg99 +g100 +sg101 +g102 +sg104 +I00 +sg105 +I00 +sS'commit' +p127 +S'4128e59da2eac5c2904c7c7568d298ca51e79540' +p128 +sg108 +g109 +sS'buildjni' +p129 +(lp130 +S'yes' +p131 +asg113 +g114 +sg115 +Nsg116 +NsS'patch' +p132 +(lp133 +S'defprop.patch' +p134 +asg119 +g26 +sg120 +I00 +sg121 +Nsa(dp135 +g73 +I00 +sg74 +S'19' +p136 +sg76 +I00 +sg77 +I00 +sg78 +I00 +sg79 +I00 +sg80 +g81 +sg82 +g83 +sg84 +Nsg85 +g86 +sg87 +g26 +sg88 +S'1.18' +p137 +sS'subdir' +p138 +S'org_adaway/' +p139 +sg92 +g93 +sg94 +g95 +sg96 +g26 +sg97 +g26 +sg98 +I00 +sg99 +g100 +sg101 +g102 +sg104 +I00 +sg105 +I00 +sS'commit' +p140 +S'0b9985398b9eef7baf6aadd0dbb12002bc199d2e' +p141 +sg108 +g109 +sS'buildjni' +p142 +(lp143 +S'yes' +p144 +asg113 +g114 +sg115 +Nsg116 +NsS'patch' +p145 +(lp146 +S'defprop.patch' +p147 +asg119 +g26 +sg120 +I00 +sg121 +Nsa(dp148 +g73 +I00 +sg74 +S'20' +p149 +sg76 +I00 +sg77 +I00 +sg78 +I00 +sg79 +I00 +sg80 +g81 +sg82 +g83 +sg84 +Nsg85 +g86 +sg87 +g26 +sg88 +S'1.19' +p150 +sS'subdir' +p151 +S'org_adaway/' +p152 +sg92 +g93 +sg94 +g95 +sg96 +g26 +sg97 +g26 +sg98 +I00 +sg99 +g100 +sg101 +g102 +sg104 +I00 +sg105 +I00 +sS'commit' +p153 +S'ab27f4dab5f3ea5e228cfb4a6b0e1fbf53695f22' +p154 +sg108 +g109 +sS'buildjni' +p155 +(lp156 +S'yes' +p157 +asg113 +g114 +sg115 +Nsg116 +NsS'patch' +p158 +(lp159 +S'defprop.patch' +p160 +asg119 +g26 +sg120 +I00 +sg121 +Nsa(dp161 +g73 +I00 +sg74 +S'21' +p162 +sg76 +I00 +sg77 +I00 +sg78 +I00 +sg79 +I00 +sg80 +g81 +sg82 +g83 +sg84 +Nsg85 +g86 +sg87 +g26 +sg88 +S'1.20' +p163 +sS'subdir' +p164 +S'org_adaway/' +p165 +sg92 +g93 +sg94 +g95 +sg96 +g26 +sg97 +g26 +sg98 +I00 +sg99 +g100 +sg101 +g102 +sg104 +I00 +sg105 +I00 +sS'commit' +p166 +S'695e3801e4081026c8f7213a2345fc451d5eb89c' +p167 +sg108 +g109 +sS'buildjni' +p168 +(lp169 +S'yes' +p170 +asg113 +g114 +sg115 +Nsg116 +NsS'patch' +p171 +(lp172 +S'defprop.patch' +p173 +asg119 +g26 +sg120 +I00 +sg121 +Nsa(dp174 +g73 +I00 +sg74 +S'22' +p175 +sg76 +I00 +sg77 +I00 +sg78 +I00 +sg79 +I00 +sg80 +g81 +sg82 +g83 +sg84 +Nsg85 +g86 +sg87 +g26 +sg88 +S'1.21' +p176 +sS'subdir' +p177 +S'org_adaway/' +p178 +sg92 +g93 +sg94 +g95 +sg96 +g26 +sg97 +g26 +sg98 +I00 +sg99 +g100 +sg101 +g102 +sg104 +I00 +sg105 +I00 +sS'commit' +p179 +S'65138c11cc8b6affd28b68e125fbc1dff0886a4e' +p180 +sg108 +g109 +sS'buildjni' +p181 +(lp182 +S'yes' +p183 +asg113 +g114 +sg115 +Nsg116 +NsS'patch' +p184 +(lp185 +S'defprop.patch' +p186 +asg119 +g26 +sg120 +I00 +sg121 +Nsa(dp187 +g73 +I00 +sg74 +S'24' +p188 +sg76 +I00 +sg77 +I00 +sg78 +I00 +sg79 +I00 +sg80 +g81 +sg82 +g83 +sg84 +Nsg85 +g86 +sg87 +g26 +sg88 +S'1.23' +p189 +sS'subdir' +p190 +Nsg92 +g93 +sg94 +g95 +sg96 +g26 +sg97 +g26 +sg98 +I00 +sg99 +g100 +sg101 +g102 +sg104 +I00 +sS'disable' +p191 +S'no source in repo' +p192 +sS'commit' +p193 +S'unknown - see disabled' +p194 +sg108 +g109 +sS'buildjni' +p195 +(lp196 +sg113 +g114 +sg115 +Nsg116 +Nsg117 +g118 +sg119 +g26 +sg120 +I00 +sg121 +Nsa(dp197 +g73 +I00 +sg74 +S'25' +p198 +sg76 +I00 +sg77 +I00 +sg78 +I00 +sg79 +I00 +sg80 +g81 +sg82 +g83 +sg84 +Nsg85 +g86 +sg87 +g26 +sg88 +S'1.24' +p199 +sS'subdir' +p200 +S'org_adaway/' +p201 +sg92 +g93 +sg94 +g95 +sg96 +g26 +sg97 +g26 +sg98 +I00 +sg99 +g100 +sg101 +g102 +sg104 +I00 +sg105 +I00 +sS'commit' +p202 +S'f811e53e1e1d2ee047b18715fd7d2072b90ae76b' +p203 +sg108 +g109 +sS'buildjni' +p204 +(lp205 +S'yes' +p206 +asg113 +g114 +sg115 +Nsg116 +Nsg117 +g118 +sS'prebuild' +p207 +S'android update project -p ../com_actionbarsherlock' +p208 +sg120 +I00 +sg121 +Nsa(dp209 +g73 +I00 +sg74 +S'26' +p210 +sg76 +I00 +sg77 +I00 +sg78 +I00 +sg79 +I00 +sg80 +g81 +sg82 +g83 +sg84 +Nsg85 +g86 +sg87 +g26 +sg88 +S'1.25' +p211 +sS'subdir' +p212 +S'org_adaway/' +p213 +sg92 +g93 +sg94 +g95 +sg96 +g26 +sg97 +g26 +sg98 +I00 +sg99 +g100 +sg101 +g102 +sg104 +I00 +sg105 +I00 +sS'commit' +p214 +S'ff97932761cdee68638dc2550751a64b2cbe18e7' +p215 +sg108 +g109 +sS'buildjni' +p216 +(lp217 +S'yes' +p218 +asg113 +g114 +sg115 +Nsg116 +Nsg117 +g118 +sS'prebuild' +p219 +S'android update project -p ../com_actionbarsherlock' +p220 +sg120 +I00 +sg121 +Nsa(dp221 +g73 +I00 +sg74 +S'27' +p222 +sg76 +I00 +sg77 +I00 +sg78 +I00 +sg79 +I00 +sg80 +g81 +sg82 +g83 +sg84 +Nsg85 +g86 +sg87 +g26 +sg88 +S'1.26' +p223 +sS'subdir' +p224 +S'org_adaway/' +p225 +sg92 +g93 +sg94 +g95 +sg96 +g26 +sg97 +g26 +sg98 +I00 +sg99 +g100 +sg101 +g102 +sg104 +I00 +sg105 +I00 +sS'commit' +p226 +S'33d4d80998f30bafc88c04c80cbae00b03916f99' +p227 +sg108 +g109 +sS'buildjni' +p228 +(lp229 +S'yes' +p230 +asg113 +g114 +sg115 +Nsg116 +Nsg117 +g118 +sS'prebuild' +p231 +S'android update project -p ../com_actionbarsherlock' +p232 +sg120 +I00 +sg121 +Nsa(dp233 +g73 +I00 +sg74 +S'28' +p234 +sg76 +I00 +sg77 +I00 +sg78 +I00 +sg79 +I00 +sg80 +g81 +sg82 +g83 +sg84 +Nsg85 +g86 +sg87 +g26 +sg88 +S'1.27' +p235 +sS'subdir' +p236 +S'org_adaway/' +p237 +sg92 +g93 +sg94 +g95 +sg96 +g26 +sg97 +g26 +sg98 +I00 +sg99 +g100 +sg101 +g102 +sg104 +I00 +sg105 +I00 +sS'commit' +p238 +S'743d25a7e287505461f33f4b8e57e4cf988fffea' +p239 +sg108 +g109 +sS'buildjni' +p240 +(lp241 +S'yes' +p242 +asg113 +g114 +sg115 +Nsg116 +Nsg117 +g118 +sS'prebuild' +p243 +S'android update project -p ../com_actionbarsherlock' +p244 +sg120 +I00 +sg121 +Nsa(dp245 +g73 +I00 +sg74 +S'30' +p246 +sg76 +I00 +sg77 +I00 +sg78 +I00 +sg79 +I00 +sg80 +g81 +sg82 +g83 +sg84 +Nsg85 +g86 +sg87 +g26 +sg88 +S'1.29' +p247 +sS'subdir' +p248 +S'org_adaway/' +p249 +sg92 +g93 +sg94 +g95 +sg96 +g26 +sg97 +g26 +sg98 +I00 +sg99 +g100 +sg101 +g102 +sg104 +I00 +sg105 +I00 +sS'commit' +p250 +S'eaa07f4' +p251 +sg108 +g109 +sS'buildjni' +p252 +(lp253 +S'yes' +p254 +asg113 +g114 +sg115 +Nsg116 +Nsg117 +g118 +sS'prebuild' +p255 +S'android update project -p ../com_actionbarsherlock && rm -rf libs/armeabi/*' +p256 +sg120 +I00 +sg121 +Nsa(dp257 +g73 +I00 +sg74 +S'33' +p258 +sg76 +I00 +sg77 +I00 +sg78 +I00 +sg79 +I00 +sg80 +g81 +sg82 +g83 +sg84 +Nsg85 +g86 +sg87 +g26 +sg88 +S'1.32' +p259 +sS'subdir' +p260 +S'org_adaway/' +p261 +sg92 +g93 +sg94 +g95 +sg96 +g26 +sg97 +g26 +sg98 +I00 +sg99 +g100 +sg101 +g102 +sg104 +I00 +sg105 +I00 +sS'commit' +p262 +S'71ced3f' +p263 +sg108 +g109 +sS'buildjni' +p264 +(lp265 +S'no' +p266 +asg113 +g114 +sg115 +Nsg116 +Nsg117 +g118 +sS'prebuild' +p267 +S'android update project -p ../com_actionbarsherlock && rm -rf libs/armeabi/* && rm libs/android-support-v4.jar' +p268 +sg120 +I00 +sg121 +Nsa(dp269 +g73 +I00 +sg74 +S'34' +p270 +sg76 +I00 +sg77 +I00 +sg78 +I00 +sg79 +I00 +sg80 +g81 +sg82 +g83 +sg84 +Nsg85 +g86 +sg87 +g26 +sg88 +S'1.33' +p271 +sS'subdir' +p272 +S'org_adaway/' +p273 +sg92 +g93 +sg94 +g95 +sg96 +g26 +sg97 +g26 +sg98 +I00 +sg99 +g100 +sg101 +g102 +sg104 +I00 +sg105 +I00 +sS'commit' +p274 +S'9d63c18' +p275 +sg108 +g109 +sS'buildjni' +p276 +(lp277 +S'no' +p278 +asg113 +g114 +sg115 +Nsg116 +Nsg117 +g118 +sS'prebuild' +p279 +S'android update project -p ../com_actionbarsherlock && rm -rf libs/armeabi/*' +p280 +sg120 +I00 +sg121 +Nsa(dp281 +g73 +I00 +sg74 +S'35' +p282 +sg76 +I00 +sg77 +I00 +sg78 +I00 +sg79 +I00 +sg80 +g81 +sg82 +g83 +sg84 +Nsg85 +g86 +sg87 +g26 +sg88 +S'1.34' +p283 +sS'subdir' +p284 +S'org_adaway/' +p285 +sg92 +g93 +sg94 +g95 +sg96 +g26 +sg97 +g26 +sg98 +I00 +sg99 +g100 +sg101 +g102 +sg104 +I00 +sg105 +I00 +sS'commit' +p286 +S'f2568b1' +p287 +sg108 +g109 +sS'buildjni' +p288 +(lp289 +S'no' +p290 +asg113 +g114 +sg115 +Nsg116 +Nsg117 +g118 +sS'prebuild' +p291 +S'android update project -p ../com_actionbarsherlock && rm -rf libs/armeabi/* && android update project -p ../org_donations' +p292 +sg120 +I00 +sg121 +Nsa(dp293 +g73 +I00 +sg74 +S'36' +p294 +sg76 +I00 +sg77 +I00 +sg78 +I00 +sg79 +I00 +sg80 +g81 +sg82 +g83 +sg84 +Nsg85 +g86 +sg87 +g26 +sg88 +S'1.35' +p295 +sS'subdir' +p296 +S'org_adaway/' +p297 +sg92 +g93 +sg94 +g95 +sg96 +g26 +sg97 +g26 +sg98 +I00 +sg99 +g100 +sg101 +g102 +sg104 +I00 +sg105 +I00 +sS'commit' +p298 +S'7442d5d' +p299 +sg108 +g109 +sS'buildjni' +p300 +(lp301 +S'no' +p302 +asg113 +g114 +sg115 +Nsg116 +Nsg117 +g118 +sS'prebuild' +p303 +S'android update project -p ../com_actionbarsherlock && rm -rf libs/armeabi/* && android update project -p ../org_donations' +p304 +sg120 +I00 +sg121 +Nsa(dp305 +g73 +I00 +sg74 +S'37' +p306 +sg76 +I00 +sg77 +I00 +sg78 +I00 +sg79 +I00 +sg80 +g81 +sg82 +g83 +sg84 +Nsg85 +g86 +sg87 +g26 +sg88 +S'1.36' +p307 +sS'subdir' +p308 +S'org_adaway/' +p309 +sg92 +g93 +sg94 +g95 +sg96 +g26 +sg97 +g26 +sg98 +I00 +sg99 +g100 +sg101 +g102 +sg104 +I00 +sg105 +I00 +sS'commit' +p310 +S'83fc713' +p311 +sg108 +g109 +sS'buildjni' +p312 +(lp313 +S'no' +p314 +asg113 +g114 +sg115 +Nsg116 +Nsg117 +g118 +sS'prebuild' +p315 +S'android update project -p ../com_actionbarsherlock && rm -rf libs/armeabi/* && android update project -p ../org_donations' +p316 +sg120 +I00 +sg121 +Nsa(dp317 +g73 +I00 +sg74 +S'38' +p318 +sg76 +I00 +sg77 +I00 +sg78 +I00 +sg79 +I00 +sg80 +g81 +sg82 +g83 +sg84 +Nsg85 +g86 +sg87 +g26 +sg88 +S'1.37' +p319 +sS'subdir' +p320 +S'org_adaway/' +p321 +sg92 +g93 +sg94 +g95 +sg96 +g26 +sg97 +g26 +sg98 +I00 +sg99 +g100 +sg101 +g102 +sg104 +I00 +sg105 +I00 +sS'commit' +p322 +S'70da32b567122b701cdcb1609b780eb85732028f' +p323 +sg108 +g109 +sS'buildjni' +p324 +(lp325 +S'no' +p326 +asg113 +g114 +sg115 +Nsg116 +Nsg117 +g118 +sS'prebuild' +p327 +S'android update project -p ../com_actionbarsherlock && rm -rf libs/armeabi/* && android update project -p ../org_donations' +p328 +sg120 +I00 +sg121 +Nsa(dp329 +g73 +I00 +sg74 +S'40' +p330 +sg76 +I00 +sg77 +I00 +sg78 +I00 +sg79 +I00 +sg80 +g81 +sS'srclibs' +p331 +(lp332 +S'RootCommands@c940b0e503' +p333 +asg84 +NsS'extlibs' +p334 +(lp335 +S'htmlcleaner/htmlcleaner-2.2.jar' +p336 +asS'init' +p337 +S'rm android-libs/Donations/custom_rules.xml && git clone https://github.com/dschuermann/HtmlSpanner android-libs/HtmlSpanner' +p338 +sg88 +S'2.1' +p339 +sS'subdir' +p340 +S'AdAway' +p341 +sg92 +g93 +sg94 +g95 +sg96 +g26 +sg97 +g26 +sg98 +I00 +sg99 +g100 +sS'update' +p342 +(lp343 +S'.' +p344 +aS'android-libs/Donations' +p345 +aS'android-libs/ActionBarSherlock' +p346 +aS'android-libs/HtmlSpanner/htmlspanner' +p347 +asg104 +I00 +sg105 +I00 +sS'commit' +p348 +S'v2.1' +p349 +sg108 +g109 +sS'buildjni' +p350 +(lp351 +S'yes' +p352 +asg113 +g114 +sg115 +Nsg116 +Nsg117 +g118 +sS'prebuild' +p353 +S'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/' +p354 +sg120 +I00 +sg121 +Nsa(dp355 +g73 +I00 +sg74 +S'42' +p356 +sg76 +I00 +sg77 +I00 +sg78 +I00 +sg79 +I00 +sg80 +g81 +sS'srclibs' +p357 +(lp358 +S'RootCommands@c940b0e503' +p359 +asg84 +NsS'extlibs' +p360 +(lp361 +S'htmlcleaner/htmlcleaner-2.2.jar' +p362 +asS'init' +p363 +S'rm android-libs/Donations/custom_rules.xml && git clone https://github.com/dschuermann/HtmlSpanner android-libs/HtmlSpanner' +p364 +sg88 +S'2.3' +p365 +sS'subdir' +p366 +S'AdAway' +p367 +sg92 +g93 +sg94 +g95 +sg96 +g26 +sg97 +g26 +sg98 +I00 +sg99 +g100 +sS'update' +p368 +(lp369 +g344 +aS'android-libs/Donations' +p370 +aS'android-libs/ActionBarSherlock' +p371 +aS'android-libs/HtmlSpanner/htmlspanner' +p372 +asg104 +I00 +sg105 +I00 +sS'commit' +p373 +S'v2.3' +p374 +sg108 +g109 +sS'buildjni' +p375 +(lp376 +S'yes' +p377 +asg113 +g114 +sg115 +Nsg116 +Nsg117 +g118 +sS'prebuild' +p378 +S'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/' +p379 +sg120 +I00 +sg121 +Nsa(dp380 +g73 +I00 +sg74 +S'45' +p381 +sg76 +I00 +sg77 +I00 +sg78 +I00 +sg117 +g118 +sg80 +g81 +sg82 +g83 +sg84 +Nsg85 +g86 +sg87 +g26 +sg88 +S'2.6' +p382 +sS'subdir' +p383 +S'AdAway' +p384 +sg92 +g93 +sg94 +g79 +sg96 +g26 +sg97 +g26 +sg98 +I00 +sS'preassemble' +p385 +(lp386 +S'renameExecutables' +p387 +asg101 +g102 +sg104 +I00 +sg105 +I00 +sS'commit' +p388 +S'v2.6' +p389 +sg108 +g109 +sS'buildjni' +p390 +(lp391 +S'yes' +p392 +asg113 +g114 +sg115 +Nsg116 +NsS'gradle' +p393 +(lp394 +S'yes' +p395 +asg119 +g26 +sg120 +I00 +sg121 +Nsa(dp396 +g73 +I00 +sg74 +S'46' +p397 +sg76 +I00 +sg77 +I00 +sg78 +I00 +sg117 +g118 +sg80 +g81 +sg82 +g83 +sg84 +Nsg85 +g86 +sg87 +g26 +sg88 +S'2.7' +p398 +sS'subdir' +p399 +S'AdAway' +p400 +sg92 +g93 +sg94 +g79 +sg96 +g26 +sg97 +g26 +sg98 +I00 +sS'preassemble' +p401 +(lp402 +S'renameExecutables' +p403 +asg101 +g102 +sg104 +I00 +sg105 +I00 +sS'commit' +p404 +S'v2.7' +p405 +sg108 +g109 +sS'buildjni' +p406 +(lp407 +S'yes' +p408 +asg113 +g114 +sg115 +Nsg116 +NsS'gradle' +p409 +(lp410 +g395 +asg119 +g26 +sg120 +I00 +sg121 +Nsa(dp411 +g73 +I00 +sg74 +S'47' +p412 +sg76 +I00 +sg77 +I00 +sg78 +I00 +sg117 +g118 +sg80 +g81 +sg82 +g83 +sg84 +Nsg85 +g86 +sg87 +g26 +sg88 +S'2.8' +p413 +sS'subdir' +p414 +S'AdAway' +p415 +sg92 +g93 +sg94 +g79 +sg96 +g26 +sg97 +g26 +sg98 +I00 +sS'preassemble' +p416 +(lp417 +S'renameExecutables' +p418 +asg101 +g102 +sg104 +I00 +sg105 +I00 +sS'commit' +p419 +S'v2.8' +p420 +sg108 +g109 +sS'buildjni' +p421 +(lp422 +S'yes' +p423 +asg113 +g114 +sg115 +Nsg116 +NsS'gradle' +p424 +(lp425 +g395 +asg119 +g26 +sg120 +I00 +sg121 +Nsa(dp426 +g73 +I00 +sg74 +S'48' +p427 +sg76 +I00 +sg77 +I00 +sg78 +I00 +sg117 +g118 +sg80 +g81 +sg82 +g83 +sg84 +Nsg85 +g86 +sg87 +g26 +sg88 +S'2.8.1' +p428 +sS'subdir' +p429 +S'AdAway' +p430 +sg92 +g93 +sg94 +g79 +sg96 +g26 +sg97 +g26 +sg98 +I00 +sS'preassemble' +p431 +(lp432 +S'renameExecutables' +p433 +asg101 +g102 +sg104 +I00 +sg105 +I00 +sS'commit' +p434 +S'v2.8.1' +p435 +sg108 +g109 +sS'buildjni' +p436 +(lp437 +S'yes' +p438 +asg113 +g114 +sg115 +Nsg116 +NsS'gradle' +p439 +(lp440 +g395 +asg119 +g26 +sg120 +I00 +sg121 +Nsa(dp441 +g73 +I00 +sg74 +S'49' +p442 +sg76 +I00 +sg77 +I00 +sg78 +I00 +sg117 +g118 +sg80 +g81 +sg82 +g83 +sg84 +Nsg85 +g86 +sg87 +g26 +sg88 +S'2.9' +p443 +sS'subdir' +p444 +S'AdAway' +p445 +sg92 +g93 +sg94 +g79 +sg96 +g26 +sg97 +g26 +sg98 +I00 +sS'preassemble' +p446 +(lp447 +S'renameExecutables' +p448 +asg101 +g102 +sg104 +I00 +sg105 +I00 +sS'commit' +p449 +S'v2.9' +p450 +sg108 +g109 +sS'buildjni' +p451 +(lp452 +S'yes' +p453 +asg113 +g114 +sg115 +Nsg116 +NsS'gradle' +p454 +(lp455 +g395 +asg119 +g26 +sg120 +I00 +sg121 +Nsa(dp456 +g73 +I00 +sg74 +S'50' +p457 +sg76 +I00 +sg77 +I00 +sg78 +I00 +sg117 +g118 +sg80 +g81 +sg82 +g83 +sg84 +Nsg85 +g86 +sg87 +g26 +sg88 +S'2.9.1' +p458 +sS'subdir' +p459 +S'AdAway' +p460 +sg92 +g93 +sg94 +g79 +sg96 +g26 +sg97 +g26 +sg98 +I00 +sS'preassemble' +p461 +(lp462 +S'renameExecutables' +p463 +asg101 +g102 +sg104 +I00 +sg105 +I00 +sS'commit' +p464 +S'v2.9.1' +p465 +sg108 +g109 +sS'buildjni' +p466 +(lp467 +S'yes' +p468 +asg113 +g114 +sg115 +Nsg116 +NsS'gradle' +p469 +(lp470 +g395 +asg119 +g26 +sg120 +I00 +sg121 +Nsa(dp471 +g73 +I00 +sg74 +S'51' +p472 +sg76 +I00 +sg77 +I00 +sg78 +I00 +sg117 +g118 +sg80 +g81 +sg82 +g83 +sg84 +Nsg85 +g86 +sg87 +g26 +sg88 +S'2.9.2' +p473 +sS'subdir' +p474 +S'AdAway' +p475 +sg92 +g93 +sg94 +g79 +sg96 +g26 +sg97 +g26 +sg98 +I00 +sS'preassemble' +p476 +(lp477 +S'renameExecutables' +p478 +asg101 +g102 +sg104 +I00 +sg105 +I00 +sS'commit' +p479 +S'v2.9.2' +p480 +sg108 +g109 +sS'buildjni' +p481 +(lp482 +S'yes' +p483 +asg113 +g114 +sg115 +Nsg116 +NsS'gradle' +p484 +(lp485 +g395 +asg119 +g26 +sg120 +I00 +sg121 +Nsa(dp486 +g73 +I00 +sg74 +S'52' +p487 +sg76 +I00 +sg77 +I00 +sg78 +I00 +sg117 +g118 +sg80 +g81 +sg82 +g83 +sg84 +Nsg85 +g86 +sg87 +g26 +sg88 +S'3.0' +p488 +sS'subdir' +p489 +S'AdAway' +p490 +sg92 +g93 +sg94 +g79 +sg96 +g26 +sg97 +g26 +sg98 +I00 +sS'preassemble' +p491 +(lp492 +S'renameExecutables' +p493 +asg101 +g102 +sg104 +I00 +sg105 +I00 +sS'commit' +p494 +S'v3.0' +p495 +sg108 +g109 +sS'buildjni' +p496 +(lp497 +S'yes' +p498 +asg113 +g114 +sg115 +Nsg116 +NsS'gradle' +p499 +(lp500 +g395 +asg119 +g26 +sg120 +I00 +sg121 +NsasS'FlattrID' +p501 +S'369138' +p502 +sS'Disabled' +p503 +NsS'Update Check Name' +p504 +NsS'Vercode Operation' +p505 +NsS'Current Version' +p506 +S'3.0' +p507 +s. \ No newline at end of file From cc29d39f0a2f3d4745c5ff0c4d3cbc902c6aba75 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Wed, 22 Jul 2015 11:10:52 -0700 Subject: [PATCH 09/22] metadata: store comments in lists since lists are used everywhere else The only data produced by parsing metadata that was stored as a tuple was the comments' key/values. Everywhere else, lists are used. This changes the comments to also only use lists to keep the data consistent internally. That makes it vastly easier to produce the exact same metadata dict when parsing .txt, JSON, XML, etc. --- fdroidserver/metadata.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fdroidserver/metadata.py b/fdroidserver/metadata.py index 58b774a3..3684b917 100644 --- a/fdroidserver/metadata.py +++ b/fdroidserver/metadata.py @@ -604,7 +604,7 @@ def post_metadata_parse(thisinfo): # 'builds' - a list of dictionaries containing build information # for each defined build # 'comments' - a list of comments from the metadata file. Each is -# a tuple of the form (field, comment) where field is +# a list of the form [field, comment] where field is # the name of the field it preceded in the metadata # file. Where field is None, the comment goes at the # end of the file. Alternatively, 'build:version' is @@ -769,7 +769,7 @@ def parse_txt_metadata(metafile): if not curcomments: return for comment in curcomments: - thisinfo['comments'].append((key, comment)) + thisinfo['comments'].append([key, comment]) del curcomments[:] thisinfo = get_default_app_info_list() From 2831b3e93f5cdf0f91d87936b721976da327529f Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Wed, 22 Jul 2015 17:41:03 -0700 Subject: [PATCH 10/22] convert internal representation of AntiFeatures to list The AntiFeatures metadata is a comma-separated list of tags, like Categories, so it should also be stored internally as a list. This makes parsing XML and JSON easier. The test cases' .pickle files look like they change a lot, but they really don't, its only the change of default AntiFeatures value from None to [] --- fdroidserver/metadata.py | 6 +- fdroidserver/stats.py | 3 +- fdroidserver/update.py | 6 +- tests/metadata/org.adaway.pickle | 3069 ++++++++--------- tests/metadata/org.smssecure.smssecure.pickle | 1159 +++---- 5 files changed, 2109 insertions(+), 2134 deletions(-) diff --git a/fdroidserver/metadata.py b/fdroidserver/metadata.py index 3684b917..2b75389f 100644 --- a/fdroidserver/metadata.py +++ b/fdroidserver/metadata.py @@ -42,7 +42,7 @@ class MetaDataException(Exception): # In the order in which they are laid out on files app_defaults = OrderedDict([ ('Disabled', None), - ('AntiFeatures', None), + ('AntiFeatures', []), ('Provides', None), ('Categories', ['None']), ('License', 'Unknown'), @@ -516,7 +516,7 @@ def read_metadata(xref=True): def metafieldtype(name): if name in ['Description', 'Maintainer Notes']: return 'multiline' - if name in ['Categories']: + if name in ['Categories', 'AntiFeatures']: return 'list' if name == 'Build Version': return 'build' @@ -929,7 +929,7 @@ def write_metadata(dest, app): mf = open(dest, 'w') writefield_nonempty('Disabled') - writefield_nonempty('AntiFeatures') + writefield('AntiFeatures') writefield_nonempty('Provides') writefield('Categories') writefield('License') diff --git a/fdroidserver/stats.py b/fdroidserver/stats.py index b320f9db..5df00694 100644 --- a/fdroidserver/stats.py +++ b/fdroidserver/stats.py @@ -256,8 +256,7 @@ def main(): for app in metaapps: if app['AntiFeatures'] is None: continue - antifeatures = [a.strip() for a in app['AntiFeatures'].split(',')] - for antifeature in antifeatures: + for antifeature in app['AntiFeatures']: afs[antifeature] += 1 with open('stats/antifeatures.txt', 'w') as f: for antifeature, count in afs.most_common(): diff --git a/fdroidserver/update.py b/fdroidserver/update.py index 291861a3..c3940e6a 100644 --- a/fdroidserver/update.py +++ b/fdroidserver/update.py @@ -92,8 +92,8 @@ def update_wiki(apps, sortedids, apks): wikidata = '' if app['Disabled']: wikidata += '{{Disabled|' + app['Disabled'] + '}}\n' - if app['AntiFeatures']: - for af in app['AntiFeatures'].split(','): + if 'AntiFeatures' in app: + for af in app['AntiFeatures']: wikidata += '{{AntiFeature|' + af + '}}\n' wikidata += '{{App|id=%s|name=%s|added=%s|lastupdated=%s|source=%s|tracker=%s|web=%s|changelog=%s|donate=%s|flattr=%s|bitcoin=%s|litecoin=%s|dogecoin=%s|license=%s|root=%s}}\n' % ( appid, @@ -847,7 +847,7 @@ def make_index(apps, sortedids, apks, repodir, archive, categories): addElement('marketvercode', app['Current Version Code'], doc, apel) if app['AntiFeatures']: - af = app['AntiFeatures'].split(',') + af = app['AntiFeatures'] if af: addElementNonEmpty('antifeatures', ','.join(af), doc, apel) if app['Provides']: diff --git a/tests/metadata/org.adaway.pickle b/tests/metadata/org.adaway.pickle index d6165f4e..e60769c0 100644 --- a/tests/metadata/org.adaway.pickle +++ b/tests/metadata/org.adaway.pickle @@ -5,249 +5,248 @@ NsS'Bitcoin' p2 NsS'AntiFeatures' p3 -NsS'Web Site' -p4 -S'http://sufficientlysecure.org/index.php/adaway' +(lp4 +sS'Web Site' p5 -sS'Auto Update Mode' -p6 -S'Version v%v' -p7 -sS'Provides' -p8 -S'org.sufficientlysecure.adaway' -p9 -sS'Issue Tracker' -p10 -S'https://github.com/dschuermann/ad-away/issues' -p11 -sS'Donate' -p12 S'http://sufficientlysecure.org/index.php/adaway' +p6 +sS'Auto Update Mode' +p7 +S'Version v%v' +p8 +sS'Provides' +p9 +S'org.sufficientlysecure.adaway' +p10 +sS'Issue Tracker' +p11 +S'https://github.com/dschuermann/ad-away/issues' +p12 +sS'Donate' p13 -sS'Repo Type' +S'http://sufficientlysecure.org/index.php/adaway' p14 -S'git' +sS'Repo Type' p15 -sS'Description' +S'git' p16 -(lp17 +sS'Description' +p17 +(lp18 S'An ad blocker that uses the hosts file. The hosts file' -p18 -aS'contains a list of mappings between hostnames and IP addresses. When' p19 -aS'an app requests an ad, that request is directed to 127.0.0.1 which does' +aS'contains a list of mappings between hostnames and IP addresses. When' p20 -aS'nothing. There are options to run a web server' +aS'an app requests an ad, that request is directed to 127.0.0.1 which does' p21 -aS'to respond to blocked hostnames and to direct requests to the IP' +aS'nothing. There are options to run a web server' p22 -aS'address of your choosing. You can download hosts files from the' +aS'to respond to blocked hostnames and to direct requests to the IP' p23 -aS'app but it is possible to use your own and to add certain sites' +aS'address of your choosing. You can download hosts files from the' p24 -aS'to the white- and black-lists.' +aS'app but it is possible to use your own and to add certain sites' p25 -aS'' +aS'to the white- and black-lists.' p26 -aS'[https://github.com/dschuermann/ad-away/raw/HEAD/CHANGELOG Changelog]' +aS'' p27 -ag26 -aS'Requires root: Yes. The hosts files is located in /system which is normally' +aS'[https://github.com/dschuermann/ad-away/raw/HEAD/CHANGELOG Changelog]' p28 -aS'read-only.' +ag27 +aS'Requires root: Yes. The hosts files is located in /system which is normally' p29 -asS'Requires Root' +aS'read-only.' p30 -S'Yes' +asS'Requires Root' p31 -sS'comments' +S'Yes' p32 -(lp33 +sS'comments' +p33 (lp34 +(lp35 S'build:40' -p35 -aS'#RootCommands srclib needs changing on fdroidserver' p36 -aa(lp37 -S'build:42' -p38 aS'#RootCommands srclib needs changing on fdroidserver' +p37 +aa(lp38 +S'build:42' p39 -aasS'id' +aS'#RootCommands srclib needs changing on fdroidserver' p40 -S'org.adaway' +aasS'id' p41 -sS'Repo' +S'org.adaway' p42 -S'https://github.com/dschuermann/ad-away.git' +sS'Repo' p43 -sS'No Source Since' +S'https://github.com/dschuermann/ad-away.git' p44 -g26 -sS'Auto Name' +sS'No Source Since' p45 -S'AdAway' +g27 +sS'Auto Name' p46 -sS'Categories' +S'AdAway' p47 -(lp48 +sS'Categories' +p48 +(lp49 S'System' -p49 -aS'Security' p50 -asS'Source Code' +aS'Security' p51 -S'https://github.com/dschuermann/ad-away' +asS'Source Code' p52 -sS'Litecoin' +S'https://github.com/dschuermann/ad-away' p53 -NsS'Update Check Ignore' +sS'Litecoin' p54 -NsS'Name' +NsS'Update Check Ignore' p55 -NsS'License' +NsS'Name' p56 -S'GPLv3' +NsS'License' p57 -sS'Changelog' +S'GPLv3' p58 -g26 -sS'Update Check Mode' +sS'Changelog' p59 -S'Tags' +g27 +sS'Update Check Mode' p60 -sS'Summary' +S'Tags' p61 -S'Block advertisements' +sS'Summary' p62 -sS'Dogecoin' +S'Block advertisements' p63 -NsS'Maintainer Notes' +sS'Dogecoin' p64 -(lp65 +NsS'Maintainer Notes' +p65 +(lp66 sS'Current Version Code' -p66 -S'52' p67 -sS'Binaries' +S'52' p68 -NsS'Archive Policy' +sS'Binaries' p69 -NsS'builds' +NsS'Archive Policy' p70 -(lp71 -(dp72 +NsS'builds' +p71 +(lp72 +(dp73 S'submodules' -p73 +p74 I00 sS'vercode' -p74 -S'13' p75 -sS'forceversion' +S'13' p76 -I00 -sS'oldsdkloc' +sS'forceversion' p77 I00 -sS'kivy' +sS'oldsdkloc' p78 I00 -sS'gradle' +sS'kivy' p79 I00 -sS'scanignore' +sS'gradle' p80 -(lp81 +I00 +sS'scanignore' +p81 +(lp82 sS'srclibs' -p82 -(lp83 +p83 +(lp84 sS'encoding' -p84 -NsS'extlibs' p85 -(lp86 +NsS'extlibs' +p86 +(lp87 sS'init' -p87 -g26 -sS'version' p88 -S'1.12' +g27 +sS'version' p89 -sS'subdir' +S'1.12' p90 -S'org_adaway/' +sS'subdir' p91 -sS'rm' +S'org_adaway/' p92 -(lp93 +sS'rm' +p93 +(lp94 sS'type' -p94 -S'ant' p95 -sS'build' +S'ant' p96 -g26 -sS'ndk_path' +sS'build' p97 -g26 -sS'forcevercode' +g27 +sS'ndk_path' p98 +g27 +sS'forcevercode' +p99 I00 sS'preassemble' -p99 -(lp100 +p100 +(lp101 sS'update' -p101 -(lp102 +p102 +(lp103 S'auto' -p103 -asS'maven' p104 -I00 -sS'disable' +asS'maven' p105 I00 -sS'commit' +sS'disable' p106 -S'ea5378a94ee0dc1d99d2cec95fae7e6d81afb2b9' +I00 +sS'commit' p107 -sS'scandelete' +S'ea5378a94ee0dc1d99d2cec95fae7e6d81afb2b9' p108 -(lp109 +sS'scandelete' +p109 +(lp110 sS'buildjni' -p110 -(lp111 +p111 +(lp112 S'yes' -p112 -asS'ndk' p113 -S'r10e' +asS'ndk' p114 -sS'target' +S'r10e' p115 -NsS'antcommands' +sS'target' p116 -NsS'patch' +NsS'antcommands' p117 -(lp118 +NsS'patch' +p118 +(lp119 sS'prebuild' -p119 -g26 -sS'novcheck' p120 +g27 +sS'novcheck' +p121 I00 sS'output' -p121 -Nsa(dp122 -g73 +p122 +Nsa(dp123 +g74 I00 -sg74 +sg75 S'16' -p123 -sg76 -I00 +p124 sg77 I00 sg78 @@ -255,72 +254,71 @@ I00 sg79 I00 sg80 -g81 -sg82 -g83 -sg84 -Nsg85 -g86 -sg87 -g26 +I00 +sg81 +g82 +sg83 +g84 +sg85 +Nsg86 +g87 sg88 +g27 +sg89 S'1.15' -p124 -sS'subdir' p125 -S'org_adaway/' +sS'subdir' p126 -sg92 -g93 -sg94 -g95 -sg96 -g26 +S'org_adaway/' +p127 +sg93 +g94 +sg95 +g96 sg97 -g26 +g27 sg98 -I00 +g27 sg99 -g100 -sg101 -g102 -sg104 I00 +sg100 +g101 +sg102 +g103 sg105 I00 +sg106 +I00 sS'commit' -p127 -S'4128e59da2eac5c2904c7c7568d298ca51e79540' p128 -sg108 -g109 -sS'buildjni' +S'4128e59da2eac5c2904c7c7568d298ca51e79540' p129 -(lp130 -S'yes' -p131 -asg113 -g114 -sg115 -Nsg116 +sg109 +g110 +sS'buildjni' +p130 +(lp131 +g113 +asg114 +g115 +sg116 +Nsg117 NsS'patch' p132 (lp133 S'defprop.patch' p134 -asg119 -g26 -sg120 -I00 +asg120 +g27 sg121 -Nsa(dp135 -g73 I00 -sg74 +sg122 +Nsa(dp135 +g74 +I00 +sg75 S'19' p136 -sg76 -I00 sg77 I00 sg78 @@ -328,72 +326,71 @@ I00 sg79 I00 sg80 -g81 -sg82 -g83 -sg84 -Nsg85 -g86 -sg87 -g26 +I00 +sg81 +g82 +sg83 +g84 +sg85 +Nsg86 +g87 sg88 +g27 +sg89 S'1.18' p137 sS'subdir' p138 S'org_adaway/' p139 -sg92 -g93 -sg94 -g95 -sg96 -g26 +sg93 +g94 +sg95 +g96 sg97 -g26 +g27 sg98 -I00 +g27 sg99 -g100 -sg101 -g102 -sg104 I00 +sg100 +g101 +sg102 +g103 sg105 I00 +sg106 +I00 sS'commit' p140 S'0b9985398b9eef7baf6aadd0dbb12002bc199d2e' p141 -sg108 -g109 +sg109 +g110 sS'buildjni' p142 (lp143 -S'yes' +g113 +asg114 +g115 +sg116 +Nsg117 +NsS'patch' p144 -asg113 -g114 -sg115 -Nsg116 -NsS'patch' -p145 -(lp146 +(lp145 S'defprop.patch' -p147 -asg119 -g26 -sg120 -I00 +p146 +asg120 +g27 sg121 -Nsa(dp148 -g73 I00 -sg74 +sg122 +Nsa(dp147 +g74 +I00 +sg75 S'20' -p149 -sg76 -I00 +p148 sg77 I00 sg78 @@ -401,72 +398,71 @@ I00 sg79 I00 sg80 -g81 -sg82 -g83 -sg84 -Nsg85 -g86 -sg87 -g26 +I00 +sg81 +g82 +sg83 +g84 +sg85 +Nsg86 +g87 sg88 +g27 +sg89 S'1.19' -p150 +p149 sS'subdir' -p151 +p150 S'org_adaway/' -p152 -sg92 -g93 -sg94 -g95 -sg96 -g26 +p151 +sg93 +g94 +sg95 +g96 sg97 -g26 +g27 sg98 -I00 +g27 sg99 -g100 -sg101 -g102 -sg104 I00 +sg100 +g101 +sg102 +g103 sg105 I00 +sg106 +I00 sS'commit' -p153 +p152 S'ab27f4dab5f3ea5e228cfb4a6b0e1fbf53695f22' -p154 -sg108 -g109 +p153 +sg109 +g110 sS'buildjni' -p155 -(lp156 -S'yes' -p157 -asg113 -g114 -sg115 -Nsg116 +p154 +(lp155 +g113 +asg114 +g115 +sg116 +Nsg117 NsS'patch' -p158 -(lp159 +p156 +(lp157 S'defprop.patch' -p160 -asg119 -g26 -sg120 -I00 +p158 +asg120 +g27 sg121 -Nsa(dp161 -g73 I00 -sg74 +sg122 +Nsa(dp159 +g74 +I00 +sg75 S'21' -p162 -sg76 -I00 +p160 sg77 I00 sg78 @@ -474,72 +470,71 @@ I00 sg79 I00 sg80 -g81 -sg82 -g83 -sg84 -Nsg85 -g86 -sg87 -g26 +I00 +sg81 +g82 +sg83 +g84 +sg85 +Nsg86 +g87 sg88 +g27 +sg89 S'1.20' -p163 +p161 sS'subdir' -p164 +p162 S'org_adaway/' -p165 -sg92 -g93 -sg94 -g95 -sg96 -g26 +p163 +sg93 +g94 +sg95 +g96 sg97 -g26 +g27 sg98 -I00 +g27 sg99 -g100 -sg101 -g102 -sg104 I00 +sg100 +g101 +sg102 +g103 sg105 I00 +sg106 +I00 sS'commit' -p166 +p164 S'695e3801e4081026c8f7213a2345fc451d5eb89c' -p167 -sg108 -g109 +p165 +sg109 +g110 sS'buildjni' +p166 +(lp167 +g113 +asg114 +g115 +sg116 +Nsg117 +NsS'patch' p168 (lp169 -S'yes' -p170 -asg113 -g114 -sg115 -Nsg116 -NsS'patch' -p171 -(lp172 S'defprop.patch' -p173 -asg119 -g26 -sg120 -I00 +p170 +asg120 +g27 sg121 -Nsa(dp174 -g73 I00 -sg74 +sg122 +Nsa(dp171 +g74 +I00 +sg75 S'22' -p175 -sg76 -I00 +p172 sg77 I00 sg78 @@ -547,72 +542,71 @@ I00 sg79 I00 sg80 -g81 -sg82 -g83 -sg84 -Nsg85 -g86 -sg87 -g26 +I00 +sg81 +g82 +sg83 +g84 +sg85 +Nsg86 +g87 sg88 +g27 +sg89 S'1.21' -p176 +p173 sS'subdir' -p177 +p174 S'org_adaway/' -p178 -sg92 -g93 -sg94 -g95 -sg96 -g26 +p175 +sg93 +g94 +sg95 +g96 sg97 -g26 +g27 sg98 -I00 +g27 sg99 -g100 -sg101 -g102 -sg104 I00 +sg100 +g101 +sg102 +g103 sg105 I00 +sg106 +I00 sS'commit' -p179 +p176 S'65138c11cc8b6affd28b68e125fbc1dff0886a4e' -p180 -sg108 -g109 +p177 +sg109 +g110 sS'buildjni' -p181 -(lp182 -S'yes' -p183 -asg113 -g114 -sg115 -Nsg116 +p178 +(lp179 +g113 +asg114 +g115 +sg116 +Nsg117 NsS'patch' -p184 -(lp185 +p180 +(lp181 S'defprop.patch' -p186 -asg119 -g26 -sg120 -I00 +p182 +asg120 +g27 sg121 -Nsa(dp187 -g73 I00 -sg74 +sg122 +Nsa(dp183 +g74 +I00 +sg75 S'24' -p188 -sg76 -I00 +p184 sg77 I00 sg78 @@ -620,67 +614,67 @@ I00 sg79 I00 sg80 -g81 -sg82 -g83 -sg84 -Nsg85 -g86 -sg87 -g26 -sg88 -S'1.23' -p189 -sS'subdir' -p190 -Nsg92 -g93 -sg94 -g95 -sg96 -g26 -sg97 -g26 -sg98 I00 +sg81 +g82 +sg83 +g84 +sg85 +Nsg86 +g87 +sg88 +g27 +sg89 +S'1.23' +p185 +sS'subdir' +p186 +Nsg93 +g94 +sg95 +g96 +sg97 +g27 +sg98 +g27 sg99 -g100 -sg101 -g102 -sg104 +I00 +sg100 +g101 +sg102 +g103 +sg105 I00 sS'disable' -p191 +p187 S'no source in repo' -p192 +p188 sS'commit' -p193 +p189 S'unknown - see disabled' -p194 -sg108 -g109 +p190 +sg109 +g110 sS'buildjni' -p195 -(lp196 -sg113 -g114 -sg115 -Nsg116 +p191 +(lp192 +sg114 +g115 +sg116 Nsg117 -g118 -sg119 -g26 +Nsg118 +g119 sg120 -I00 +g27 sg121 -Nsa(dp197 -g73 I00 -sg74 +sg122 +Nsa(dp193 +g74 +I00 +sg75 S'25' -p198 -sg76 -I00 +p194 sg77 I00 sg78 @@ -688,71 +682,70 @@ I00 sg79 I00 sg80 -g81 -sg82 -g83 -sg84 -Nsg85 -g86 -sg87 -g26 +I00 +sg81 +g82 +sg83 +g84 +sg85 +Nsg86 +g87 sg88 +g27 +sg89 S'1.24' -p199 +p195 sS'subdir' -p200 +p196 S'org_adaway/' -p201 -sg92 -g93 -sg94 -g95 -sg96 -g26 +p197 +sg93 +g94 +sg95 +g96 sg97 -g26 +g27 sg98 -I00 +g27 sg99 -g100 -sg101 -g102 -sg104 I00 +sg100 +g101 +sg102 +g103 sg105 I00 +sg106 +I00 sS'commit' -p202 +p198 S'f811e53e1e1d2ee047b18715fd7d2072b90ae76b' +p199 +sg109 +g110 +sS'buildjni' +p200 +(lp201 +g113 +asg114 +g115 +sg116 +Nsg117 +Nsg118 +g119 +sS'prebuild' +p202 +S'android update project -p ../com_actionbarsherlock' p203 -sg108 -g109 -sS'buildjni' -p204 -(lp205 -S'yes' -p206 -asg113 -g114 -sg115 -Nsg116 -Nsg117 -g118 -sS'prebuild' -p207 -S'android update project -p ../com_actionbarsherlock' -p208 -sg120 -I00 sg121 -Nsa(dp209 -g73 I00 -sg74 +sg122 +Nsa(dp204 +g74 +I00 +sg75 S'26' -p210 -sg76 -I00 +p205 sg77 I00 sg78 @@ -760,71 +753,70 @@ I00 sg79 I00 sg80 -g81 -sg82 -g83 -sg84 -Nsg85 -g86 -sg87 -g26 +I00 +sg81 +g82 +sg83 +g84 +sg85 +Nsg86 +g87 sg88 +g27 +sg89 S'1.25' -p211 +p206 sS'subdir' -p212 +p207 S'org_adaway/' -p213 -sg92 -g93 -sg94 -g95 -sg96 -g26 +p208 +sg93 +g94 +sg95 +g96 sg97 -g26 +g27 sg98 -I00 +g27 sg99 -g100 -sg101 -g102 -sg104 I00 +sg100 +g101 +sg102 +g103 sg105 I00 +sg106 +I00 sS'commit' -p214 +p209 S'ff97932761cdee68638dc2550751a64b2cbe18e7' -p215 -sg108 -g109 +p210 +sg109 +g110 sS'buildjni' -p216 -(lp217 -S'yes' -p218 -asg113 -g114 -sg115 -Nsg116 +p211 +(lp212 +g113 +asg114 +g115 +sg116 Nsg117 -g118 +Nsg118 +g119 sS'prebuild' -p219 +p213 S'android update project -p ../com_actionbarsherlock' -p220 -sg120 -I00 +p214 sg121 -Nsa(dp221 -g73 I00 -sg74 +sg122 +Nsa(dp215 +g74 +I00 +sg75 S'27' -p222 -sg76 -I00 +p216 sg77 I00 sg78 @@ -832,71 +824,70 @@ I00 sg79 I00 sg80 -g81 -sg82 -g83 -sg84 -Nsg85 -g86 -sg87 -g26 +I00 +sg81 +g82 +sg83 +g84 +sg85 +Nsg86 +g87 sg88 +g27 +sg89 S'1.26' -p223 +p217 sS'subdir' -p224 +p218 S'org_adaway/' -p225 -sg92 -g93 -sg94 -g95 -sg96 -g26 +p219 +sg93 +g94 +sg95 +g96 sg97 -g26 +g27 sg98 -I00 +g27 sg99 -g100 -sg101 -g102 -sg104 I00 +sg100 +g101 +sg102 +g103 sg105 I00 +sg106 +I00 sS'commit' -p226 +p220 S'33d4d80998f30bafc88c04c80cbae00b03916f99' -p227 -sg108 -g109 +p221 +sg109 +g110 sS'buildjni' -p228 -(lp229 -S'yes' -p230 -asg113 -g114 -sg115 -Nsg116 +p222 +(lp223 +g113 +asg114 +g115 +sg116 Nsg117 -g118 +Nsg118 +g119 sS'prebuild' -p231 +p224 S'android update project -p ../com_actionbarsherlock' -p232 -sg120 -I00 +p225 sg121 -Nsa(dp233 -g73 I00 -sg74 +sg122 +Nsa(dp226 +g74 +I00 +sg75 S'28' -p234 -sg76 -I00 +p227 sg77 I00 sg78 @@ -904,71 +895,70 @@ I00 sg79 I00 sg80 -g81 -sg82 -g83 -sg84 -Nsg85 -g86 -sg87 -g26 +I00 +sg81 +g82 +sg83 +g84 +sg85 +Nsg86 +g87 sg88 +g27 +sg89 S'1.27' -p235 +p228 sS'subdir' -p236 +p229 S'org_adaway/' -p237 -sg92 -g93 -sg94 -g95 -sg96 -g26 +p230 +sg93 +g94 +sg95 +g96 sg97 -g26 +g27 sg98 -I00 +g27 sg99 -g100 -sg101 -g102 -sg104 I00 +sg100 +g101 +sg102 +g103 sg105 I00 +sg106 +I00 sS'commit' -p238 +p231 S'743d25a7e287505461f33f4b8e57e4cf988fffea' -p239 -sg108 -g109 +p232 +sg109 +g110 sS'buildjni' -p240 -(lp241 -S'yes' -p242 -asg113 -g114 -sg115 -Nsg116 +p233 +(lp234 +g113 +asg114 +g115 +sg116 Nsg117 -g118 +Nsg118 +g119 sS'prebuild' -p243 +p235 S'android update project -p ../com_actionbarsherlock' -p244 -sg120 -I00 +p236 sg121 -Nsa(dp245 -g73 I00 -sg74 +sg122 +Nsa(dp237 +g74 +I00 +sg75 S'30' -p246 -sg76 -I00 +p238 sg77 I00 sg78 @@ -976,71 +966,70 @@ I00 sg79 I00 sg80 -g81 -sg82 -g83 -sg84 -Nsg85 -g86 -sg87 -g26 +I00 +sg81 +g82 +sg83 +g84 +sg85 +Nsg86 +g87 sg88 +g27 +sg89 S'1.29' -p247 +p239 sS'subdir' -p248 +p240 S'org_adaway/' -p249 -sg92 -g93 -sg94 -g95 -sg96 -g26 +p241 +sg93 +g94 +sg95 +g96 sg97 -g26 +g27 sg98 -I00 +g27 sg99 -g100 -sg101 -g102 -sg104 I00 +sg100 +g101 +sg102 +g103 sg105 I00 +sg106 +I00 sS'commit' -p250 +p242 S'eaa07f4' -p251 -sg108 -g109 +p243 +sg109 +g110 sS'buildjni' -p252 -(lp253 -S'yes' -p254 -asg113 -g114 -sg115 -Nsg116 +p244 +(lp245 +g113 +asg114 +g115 +sg116 Nsg117 -g118 +Nsg118 +g119 sS'prebuild' -p255 +p246 S'android update project -p ../com_actionbarsherlock && rm -rf libs/armeabi/*' -p256 -sg120 -I00 +p247 sg121 -Nsa(dp257 -g73 I00 -sg74 +sg122 +Nsa(dp248 +g74 +I00 +sg75 S'33' -p258 -sg76 -I00 +p249 sg77 I00 sg78 @@ -1048,71 +1037,71 @@ I00 sg79 I00 sg80 -g81 -sg82 -g83 -sg84 -Nsg85 -g86 -sg87 -g26 +I00 +sg81 +g82 +sg83 +g84 +sg85 +Nsg86 +g87 sg88 +g27 +sg89 S'1.32' -p259 +p250 sS'subdir' -p260 +p251 S'org_adaway/' -p261 -sg92 -g93 -sg94 -g95 -sg96 -g26 +p252 +sg93 +g94 +sg95 +g96 sg97 -g26 +g27 sg98 -I00 +g27 sg99 -g100 -sg101 -g102 -sg104 I00 +sg100 +g101 +sg102 +g103 sg105 I00 +sg106 +I00 sS'commit' -p262 +p253 S'71ced3f' -p263 -sg108 -g109 +p254 +sg109 +g110 sS'buildjni' -p264 -(lp265 +p255 +(lp256 S'no' -p266 -asg113 -g114 -sg115 -Nsg116 +p257 +asg114 +g115 +sg116 Nsg117 -g118 +Nsg118 +g119 sS'prebuild' -p267 +p258 S'android update project -p ../com_actionbarsherlock && rm -rf libs/armeabi/* && rm libs/android-support-v4.jar' -p268 -sg120 -I00 +p259 sg121 -Nsa(dp269 -g73 I00 -sg74 +sg122 +Nsa(dp260 +g74 +I00 +sg75 S'34' -p270 -sg76 -I00 +p261 sg77 I00 sg78 @@ -1120,71 +1109,70 @@ I00 sg79 I00 sg80 -g81 -sg82 -g83 -sg84 -Nsg85 -g86 -sg87 -g26 +I00 +sg81 +g82 +sg83 +g84 +sg85 +Nsg86 +g87 sg88 +g27 +sg89 S'1.33' -p271 +p262 sS'subdir' -p272 +p263 S'org_adaway/' -p273 -sg92 -g93 -sg94 -g95 -sg96 -g26 +p264 +sg93 +g94 +sg95 +g96 sg97 -g26 +g27 sg98 -I00 +g27 sg99 -g100 -sg101 -g102 -sg104 I00 +sg100 +g101 +sg102 +g103 sg105 I00 +sg106 +I00 sS'commit' -p274 +p265 S'9d63c18' -p275 -sg108 -g109 +p266 +sg109 +g110 sS'buildjni' -p276 -(lp277 -S'no' -p278 -asg113 -g114 -sg115 -Nsg116 +p267 +(lp268 +g257 +asg114 +g115 +sg116 Nsg117 -g118 +Nsg118 +g119 sS'prebuild' -p279 +p269 S'android update project -p ../com_actionbarsherlock && rm -rf libs/armeabi/*' -p280 -sg120 -I00 +p270 sg121 -Nsa(dp281 -g73 I00 -sg74 +sg122 +Nsa(dp271 +g74 +I00 +sg75 S'35' -p282 -sg76 -I00 +p272 sg77 I00 sg78 @@ -1192,71 +1180,141 @@ I00 sg79 I00 sg80 -g81 -sg82 -g83 -sg84 -Nsg85 -g86 -sg87 -g26 +I00 +sg81 +g82 +sg83 +g84 +sg85 +Nsg86 +g87 sg88 +g27 +sg89 S'1.34' -p283 +p273 sS'subdir' -p284 +p274 S'org_adaway/' -p285 -sg92 -g93 -sg94 -g95 -sg96 -g26 +p275 +sg93 +g94 +sg95 +g96 sg97 -g26 +g27 sg98 -I00 +g27 sg99 -g100 -sg101 -g102 -sg104 I00 +sg100 +g101 +sg102 +g103 sg105 I00 +sg106 +I00 sS'commit' -p286 +p276 S'f2568b1' -p287 -sg108 -g109 +p277 +sg109 +g110 sS'buildjni' -p288 -(lp289 -S'no' -p290 -asg113 -g114 -sg115 -Nsg116 +p278 +(lp279 +g257 +asg114 +g115 +sg116 Nsg117 -g118 +Nsg118 +g119 +sS'prebuild' +p280 +S'android update project -p ../com_actionbarsherlock && rm -rf libs/armeabi/* && android update project -p ../org_donations' +p281 +sg121 +I00 +sg122 +Nsa(dp282 +g74 +I00 +sg75 +S'36' +p283 +sg77 +I00 +sg78 +I00 +sg79 +I00 +sg80 +I00 +sg81 +g82 +sg83 +g84 +sg85 +Nsg86 +g87 +sg88 +g27 +sg89 +S'1.35' +p284 +sS'subdir' +p285 +S'org_adaway/' +p286 +sg93 +g94 +sg95 +g96 +sg97 +g27 +sg98 +g27 +sg99 +I00 +sg100 +g101 +sg102 +g103 +sg105 +I00 +sg106 +I00 +sS'commit' +p287 +S'7442d5d' +p288 +sg109 +g110 +sS'buildjni' +p289 +(lp290 +g257 +asg114 +g115 +sg116 +Nsg117 +Nsg118 +g119 sS'prebuild' p291 S'android update project -p ../com_actionbarsherlock && rm -rf libs/armeabi/* && android update project -p ../org_donations' p292 -sg120 -I00 sg121 +I00 +sg122 Nsa(dp293 -g73 +g74 I00 -sg74 -S'36' +sg75 +S'37' p294 -sg76 -I00 sg77 I00 sg78 @@ -1264,143 +1322,70 @@ I00 sg79 I00 sg80 -g81 -sg82 -g83 -sg84 -Nsg85 -g86 -sg87 -g26 +I00 +sg81 +g82 +sg83 +g84 +sg85 +Nsg86 +g87 sg88 -S'1.35' +g27 +sg89 +S'1.36' p295 sS'subdir' p296 S'org_adaway/' p297 -sg92 -g93 -sg94 -g95 -sg96 -g26 +sg93 +g94 +sg95 +g96 sg97 -g26 +g27 sg98 -I00 +g27 sg99 -g100 -sg101 -g102 -sg104 I00 +sg100 +g101 +sg102 +g103 sg105 I00 +sg106 +I00 sS'commit' p298 -S'7442d5d' +S'83fc713' p299 -sg108 -g109 +sg109 +g110 sS'buildjni' p300 (lp301 -S'no' +g257 +asg114 +g115 +sg116 +Nsg117 +Nsg118 +g119 +sS'prebuild' p302 -asg113 -g114 -sg115 -Nsg116 -Nsg117 -g118 -sS'prebuild' +S'android update project -p ../com_actionbarsherlock && rm -rf libs/armeabi/* && android update project -p ../org_donations' p303 -S'android update project -p ../com_actionbarsherlock && rm -rf libs/armeabi/* && android update project -p ../org_donations' -p304 -sg120 -I00 sg121 -Nsa(dp305 -g73 I00 -sg74 -S'37' -p306 -sg76 +sg122 +Nsa(dp304 +g74 I00 -sg77 -I00 -sg78 -I00 -sg79 -I00 -sg80 -g81 -sg82 -g83 -sg84 -Nsg85 -g86 -sg87 -g26 -sg88 -S'1.36' -p307 -sS'subdir' -p308 -S'org_adaway/' -p309 -sg92 -g93 -sg94 -g95 -sg96 -g26 -sg97 -g26 -sg98 -I00 -sg99 -g100 -sg101 -g102 -sg104 -I00 -sg105 -I00 -sS'commit' -p310 -S'83fc713' -p311 -sg108 -g109 -sS'buildjni' -p312 -(lp313 -S'no' -p314 -asg113 -g114 -sg115 -Nsg116 -Nsg117 -g118 -sS'prebuild' -p315 -S'android update project -p ../com_actionbarsherlock && rm -rf libs/armeabi/* && android update project -p ../org_donations' -p316 -sg120 -I00 -sg121 -Nsa(dp317 -g73 -I00 -sg74 +sg75 S'38' -p318 -sg76 -I00 +p305 sg77 I00 sg78 @@ -1408,71 +1393,70 @@ I00 sg79 I00 sg80 -g81 -sg82 -g83 -sg84 -Nsg85 -g86 -sg87 -g26 +I00 +sg81 +g82 +sg83 +g84 +sg85 +Nsg86 +g87 sg88 +g27 +sg89 S'1.37' -p319 +p306 sS'subdir' -p320 +p307 S'org_adaway/' -p321 -sg92 -g93 -sg94 -g95 -sg96 -g26 +p308 +sg93 +g94 +sg95 +g96 sg97 -g26 +g27 sg98 -I00 +g27 sg99 -g100 -sg101 -g102 -sg104 I00 +sg100 +g101 +sg102 +g103 sg105 I00 +sg106 +I00 sS'commit' -p322 +p309 S'70da32b567122b701cdcb1609b780eb85732028f' -p323 -sg108 -g109 +p310 +sg109 +g110 sS'buildjni' -p324 -(lp325 -S'no' -p326 -asg113 -g114 -sg115 -Nsg116 +p311 +(lp312 +g257 +asg114 +g115 +sg116 Nsg117 -g118 +Nsg118 +g119 sS'prebuild' -p327 +p313 S'android update project -p ../com_actionbarsherlock && rm -rf libs/armeabi/* && android update project -p ../org_donations' -p328 -sg120 -I00 +p314 sg121 -Nsa(dp329 -g73 I00 -sg74 +sg122 +Nsa(dp315 +g74 +I00 +sg75 S'40' -p330 -sg76 -I00 +p316 sg77 I00 sg78 @@ -1480,781 +1464,772 @@ I00 sg79 I00 sg80 -g81 -sS'srclibs' -p331 -(lp332 -S'RootCommands@c940b0e503' -p333 -asg84 -NsS'extlibs' -p334 -(lp335 -S'htmlcleaner/htmlcleaner-2.2.jar' -p336 -asS'init' -p337 -S'rm android-libs/Donations/custom_rules.xml && git clone https://github.com/dschuermann/HtmlSpanner android-libs/HtmlSpanner' -p338 -sg88 -S'2.1' -p339 -sS'subdir' -p340 -S'AdAway' -p341 -sg92 -g93 -sg94 -g95 -sg96 -g26 -sg97 -g26 -sg98 I00 +sg81 +g82 +sS'srclibs' +p317 +(lp318 +S'RootCommands@c940b0e503' +p319 +asg85 +NsS'extlibs' +p320 +(lp321 +S'htmlcleaner/htmlcleaner-2.2.jar' +p322 +asS'init' +p323 +S'rm android-libs/Donations/custom_rules.xml && git clone https://github.com/dschuermann/HtmlSpanner android-libs/HtmlSpanner' +p324 +sg89 +S'2.1' +p325 +sS'subdir' +p326 +S'AdAway' +p327 +sg93 +g94 +sg95 +g96 +sg97 +g27 +sg98 +g27 sg99 -g100 +I00 +sg100 +g101 sS'update' +p328 +(lp329 +S'.' +p330 +aS'android-libs/Donations' +p331 +aS'android-libs/ActionBarSherlock' +p332 +aS'android-libs/HtmlSpanner/htmlspanner' +p333 +asg105 +I00 +sg106 +I00 +sS'commit' +p334 +S'v2.1' +p335 +sg109 +g110 +sS'buildjni' +p336 +(lp337 +g113 +asg114 +g115 +sg116 +Nsg117 +Nsg118 +g119 +sS'prebuild' +p338 +S'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/' +p339 +sg121 +I00 +sg122 +Nsa(dp340 +g74 +I00 +sg75 +S'42' +p341 +sg77 +I00 +sg78 +I00 +sg79 +I00 +sg80 +I00 +sg81 +g82 +sS'srclibs' p342 (lp343 -S'.' +S'RootCommands@c940b0e503' p344 -aS'android-libs/Donations' +asg85 +NsS'extlibs' p345 -aS'android-libs/ActionBarSherlock' -p346 -aS'android-libs/HtmlSpanner/htmlspanner' +(lp346 +S'htmlcleaner/htmlcleaner-2.2.jar' p347 -asg104 +asS'init' +p348 +S'rm android-libs/Donations/custom_rules.xml && git clone https://github.com/dschuermann/HtmlSpanner android-libs/HtmlSpanner' +p349 +sg89 +S'2.3' +p350 +sS'subdir' +p351 +S'AdAway' +p352 +sg93 +g94 +sg95 +g96 +sg97 +g27 +sg98 +g27 +sg99 I00 -sg105 +sg100 +g101 +sS'update' +p353 +(lp354 +g330 +aS'android-libs/Donations' +p355 +aS'android-libs/ActionBarSherlock' +p356 +aS'android-libs/HtmlSpanner/htmlspanner' +p357 +asg105 +I00 +sg106 I00 sS'commit' -p348 -S'v2.1' -p349 -sg108 -g109 +p358 +S'v2.3' +p359 +sg109 +g110 sS'buildjni' -p350 -(lp351 -S'yes' -p352 -asg113 -g114 -sg115 -Nsg116 +p360 +(lp361 +g113 +asg114 +g115 +sg116 Nsg117 -g118 +Nsg118 +g119 sS'prebuild' -p353 +p362 S'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/' -p354 -sg120 -I00 +p363 sg121 -Nsa(dp355 -g73 I00 -sg74 -S'42' -p356 -sg76 +sg122 +Nsa(dp364 +g74 I00 +sg75 +S'45' +p365 sg77 I00 sg78 I00 sg79 I00 -sg80 -g81 -sS'srclibs' -p357 -(lp358 -S'RootCommands@c940b0e503' -p359 -asg84 -NsS'extlibs' -p360 -(lp361 -S'htmlcleaner/htmlcleaner-2.2.jar' -p362 -asS'init' -p363 -S'rm android-libs/Donations/custom_rules.xml && git clone https://github.com/dschuermann/HtmlSpanner android-libs/HtmlSpanner' -p364 +sg118 +g119 +sg81 +g82 +sg83 +g84 +sg85 +Nsg86 +g87 sg88 -S'2.3' -p365 -sS'subdir' +g27 +sg89 +S'2.6' p366 -S'AdAway' +sS'subdir' p367 -sg92 -g93 -sg94 -g95 -sg96 -g26 -sg97 -g26 -sg98 -I00 -sg99 -g100 -sS'update' +S'AdAway' p368 -(lp369 -g344 -aS'android-libs/Donations' -p370 -aS'android-libs/ActionBarSherlock' -p371 -aS'android-libs/HtmlSpanner/htmlspanner' -p372 -asg104 +sg93 +g94 +sg95 +g80 +sg97 +g27 +sg98 +g27 +sg99 I00 +sS'preassemble' +p369 +(lp370 +S'renameExecutables' +p371 +asg102 +g103 sg105 I00 +sg106 +I00 sS'commit' +p372 +S'v2.6' p373 -S'v2.3' -p374 -sg108 -g109 +sg109 +g110 sS'buildjni' -p375 -(lp376 -S'yes' -p377 -asg113 -g114 -sg115 -Nsg116 +p374 +(lp375 +g113 +asg114 +g115 +sg116 Nsg117 -g118 -sS'prebuild' -p378 -S'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/' -p379 -sg120 -I00 +NsS'gradle' +p376 +(lp377 +g113 +asg120 +g27 sg121 -Nsa(dp380 -g73 I00 -sg74 -S'45' -p381 -sg76 +sg122 +Nsa(dp378 +g74 I00 +sg75 +S'46' +p379 sg77 I00 sg78 I00 -sg117 -g118 -sg80 -g81 -sg82 -g83 -sg84 -Nsg85 -g86 -sg87 -g26 +sg79 +I00 +sg118 +g119 +sg81 +g82 +sg83 +g84 +sg85 +Nsg86 +g87 sg88 -S'2.6' -p382 +g27 +sg89 +S'2.7' +p380 sS'subdir' -p383 +p381 S'AdAway' -p384 -sg92 -g93 -sg94 -g79 -sg96 -g26 +p382 +sg93 +g94 +sg95 +g80 sg97 -g26 +g27 sg98 +g27 +sg99 I00 sS'preassemble' -p385 -(lp386 +p383 +(lp384 S'renameExecutables' -p387 -asg101 -g102 -sg104 -I00 +p385 +asg102 +g103 sg105 I00 +sg106 +I00 sS'commit' -p388 -S'v2.6' -p389 -sg108 -g109 +p386 +S'v2.7' +p387 +sg109 +g110 sS'buildjni' +p388 +(lp389 +g113 +asg114 +g115 +sg116 +Nsg117 +NsS'gradle' p390 (lp391 -S'yes' -p392 -asg113 -g114 -sg115 -Nsg116 -NsS'gradle' -p393 -(lp394 -S'yes' -p395 -asg119 -g26 -sg120 -I00 +g113 +asg120 +g27 sg121 -Nsa(dp396 -g73 I00 -sg74 -S'46' -p397 -sg76 +sg122 +Nsa(dp392 +g74 I00 +sg75 +S'47' +p393 sg77 I00 sg78 I00 -sg117 -g118 -sg80 -g81 -sg82 -g83 -sg84 -Nsg85 -g86 -sg87 -g26 +sg79 +I00 +sg118 +g119 +sg81 +g82 +sg83 +g84 +sg85 +Nsg86 +g87 sg88 -S'2.7' -p398 +g27 +sg89 +S'2.8' +p394 sS'subdir' -p399 +p395 S'AdAway' -p400 -sg92 -g93 -sg94 -g79 -sg96 -g26 +p396 +sg93 +g94 +sg95 +g80 sg97 -g26 +g27 sg98 +g27 +sg99 I00 sS'preassemble' -p401 -(lp402 +p397 +(lp398 S'renameExecutables' -p403 -asg101 -g102 -sg104 -I00 +p399 +asg102 +g103 sg105 I00 +sg106 +I00 sS'commit' -p404 -S'v2.7' -p405 -sg108 -g109 +p400 +S'v2.8' +p401 +sg109 +g110 sS'buildjni' -p406 -(lp407 -S'yes' -p408 -asg113 -g114 -sg115 -Nsg116 +p402 +(lp403 +g113 +asg114 +g115 +sg116 +Nsg117 NsS'gradle' -p409 -(lp410 -g395 -asg119 -g26 -sg120 -I00 +p404 +(lp405 +g113 +asg120 +g27 sg121 -Nsa(dp411 -g73 I00 -sg74 -S'47' -p412 -sg76 +sg122 +Nsa(dp406 +g74 I00 +sg75 +S'48' +p407 sg77 I00 sg78 I00 -sg117 -g118 -sg80 -g81 -sg82 -g83 -sg84 -Nsg85 -g86 -sg87 -g26 +sg79 +I00 +sg118 +g119 +sg81 +g82 +sg83 +g84 +sg85 +Nsg86 +g87 sg88 -S'2.8' -p413 +g27 +sg89 +S'2.8.1' +p408 sS'subdir' -p414 +p409 S'AdAway' -p415 -sg92 -g93 -sg94 -g79 -sg96 -g26 +p410 +sg93 +g94 +sg95 +g80 sg97 -g26 +g27 sg98 +g27 +sg99 I00 sS'preassemble' +p411 +(lp412 +S'renameExecutables' +p413 +asg102 +g103 +sg105 +I00 +sg106 +I00 +sS'commit' +p414 +S'v2.8.1' +p415 +sg109 +g110 +sS'buildjni' p416 (lp417 -S'renameExecutables' -p418 -asg101 -g102 -sg104 -I00 -sg105 -I00 -sS'commit' -p419 -S'v2.8' -p420 -sg108 -g109 -sS'buildjni' -p421 -(lp422 -S'yes' -p423 -asg113 -g114 -sg115 -Nsg116 +g113 +asg114 +g115 +sg116 +Nsg117 NsS'gradle' -p424 -(lp425 -g395 -asg119 -g26 -sg120 -I00 +p418 +(lp419 +g113 +asg120 +g27 sg121 -Nsa(dp426 -g73 I00 -sg74 -S'48' -p427 -sg76 +sg122 +Nsa(dp420 +g74 I00 +sg75 +S'49' +p421 sg77 I00 sg78 I00 -sg117 -g118 -sg80 -g81 -sg82 -g83 -sg84 -Nsg85 -g86 -sg87 -g26 +sg79 +I00 +sg118 +g119 +sg81 +g82 +sg83 +g84 +sg85 +Nsg86 +g87 sg88 -S'2.8.1' -p428 +g27 +sg89 +S'2.9' +p422 sS'subdir' -p429 +p423 S'AdAway' -p430 -sg92 -g93 -sg94 -g79 -sg96 -g26 +p424 +sg93 +g94 +sg95 +g80 sg97 -g26 +g27 sg98 +g27 +sg99 I00 sS'preassemble' -p431 -(lp432 +p425 +(lp426 S'renameExecutables' -p433 -asg101 -g102 -sg104 -I00 +p427 +asg102 +g103 sg105 I00 +sg106 +I00 sS'commit' -p434 -S'v2.8.1' -p435 -sg108 -g109 +p428 +S'v2.9' +p429 +sg109 +g110 sS'buildjni' -p436 -(lp437 -S'yes' -p438 -asg113 -g114 -sg115 -Nsg116 +p430 +(lp431 +g113 +asg114 +g115 +sg116 +Nsg117 NsS'gradle' +p432 +(lp433 +g113 +asg120 +g27 +sg121 +I00 +sg122 +Nsa(dp434 +g74 +I00 +sg75 +S'50' +p435 +sg77 +I00 +sg78 +I00 +sg79 +I00 +sg118 +g119 +sg81 +g82 +sg83 +g84 +sg85 +Nsg86 +g87 +sg88 +g27 +sg89 +S'2.9.1' +p436 +sS'subdir' +p437 +S'AdAway' +p438 +sg93 +g94 +sg95 +g80 +sg97 +g27 +sg98 +g27 +sg99 +I00 +sS'preassemble' p439 (lp440 -g395 -asg119 -g26 -sg120 +S'renameExecutables' +p441 +asg102 +g103 +sg105 I00 -sg121 -Nsa(dp441 -g73 +sg106 I00 -sg74 -S'49' +sS'commit' p442 -sg76 -I00 -sg77 -I00 -sg78 -I00 -sg117 -g118 -sg80 -g81 -sg82 -g83 -sg84 -Nsg85 -g86 -sg87 -g26 -sg88 -S'2.9' +S'v2.9.1' p443 -sS'subdir' +sg109 +g110 +sS'buildjni' p444 -S'AdAway' -p445 -sg92 -g93 -sg94 -g79 -sg96 -g26 -sg97 -g26 -sg98 -I00 -sS'preassemble' +(lp445 +g113 +asg114 +g115 +sg116 +Nsg117 +NsS'gradle' p446 (lp447 -S'renameExecutables' -p448 -asg101 -g102 -sg104 -I00 -sg105 -I00 -sS'commit' -p449 -S'v2.9' -p450 -sg108 -g109 -sS'buildjni' -p451 -(lp452 -S'yes' -p453 -asg113 -g114 -sg115 -Nsg116 -NsS'gradle' -p454 -(lp455 -g395 -asg119 -g26 -sg120 -I00 +g113 +asg120 +g27 sg121 -Nsa(dp456 -g73 I00 -sg74 -S'50' -p457 -sg76 +sg122 +Nsa(dp448 +g74 I00 -sg77 -I00 -sg78 -I00 -sg117 -g118 -sg80 -g81 -sg82 -g83 -sg84 -Nsg85 -g86 -sg87 -g26 -sg88 -S'2.9.1' -p458 -sS'subdir' -p459 -S'AdAway' -p460 -sg92 -g93 -sg94 -g79 -sg96 -g26 -sg97 -g26 -sg98 -I00 -sS'preassemble' -p461 -(lp462 -S'renameExecutables' -p463 -asg101 -g102 -sg104 -I00 -sg105 -I00 -sS'commit' -p464 -S'v2.9.1' -p465 -sg108 -g109 -sS'buildjni' -p466 -(lp467 -S'yes' -p468 -asg113 -g114 -sg115 -Nsg116 -NsS'gradle' -p469 -(lp470 -g395 -asg119 -g26 -sg120 -I00 -sg121 -Nsa(dp471 -g73 -I00 -sg74 +sg75 S'51' -p472 -sg76 -I00 +p449 sg77 I00 sg78 I00 -sg117 -g118 -sg80 -g81 -sg82 -g83 -sg84 -Nsg85 -g86 -sg87 -g26 +sg79 +I00 +sg118 +g119 +sg81 +g82 +sg83 +g84 +sg85 +Nsg86 +g87 sg88 +g27 +sg89 S'2.9.2' -p473 +p450 sS'subdir' -p474 +p451 S'AdAway' -p475 -sg92 -g93 -sg94 -g79 -sg96 -g26 +p452 +sg93 +g94 +sg95 +g80 sg97 -g26 +g27 sg98 +g27 +sg99 I00 sS'preassemble' -p476 -(lp477 +p453 +(lp454 S'renameExecutables' -p478 -asg101 -g102 -sg104 -I00 +p455 +asg102 +g103 sg105 I00 +sg106 +I00 sS'commit' -p479 +p456 S'v2.9.2' -p480 -sg108 -g109 +p457 +sg109 +g110 sS'buildjni' -p481 -(lp482 -S'yes' -p483 -asg113 -g114 -sg115 -Nsg116 +p458 +(lp459 +g113 +asg114 +g115 +sg116 +Nsg117 NsS'gradle' -p484 -(lp485 -g395 -asg119 -g26 -sg120 -I00 +p460 +(lp461 +g113 +asg120 +g27 sg121 -Nsa(dp486 -g73 I00 -sg74 +sg122 +Nsa(dp462 +g74 +I00 +sg75 S'52' -p487 -sg76 -I00 +p463 sg77 I00 sg78 I00 -sg117 -g118 -sg80 -g81 -sg82 -g83 -sg84 -Nsg85 -g86 -sg87 -g26 +sg79 +I00 +sg118 +g119 +sg81 +g82 +sg83 +g84 +sg85 +Nsg86 +g87 sg88 +g27 +sg89 S'3.0' -p488 +p464 sS'subdir' -p489 +p465 S'AdAway' -p490 -sg92 -g93 -sg94 -g79 -sg96 -g26 +p466 +sg93 +g94 +sg95 +g80 sg97 -g26 +g27 sg98 +g27 +sg99 I00 sS'preassemble' -p491 -(lp492 +p467 +(lp468 S'renameExecutables' -p493 -asg101 -g102 -sg104 -I00 +p469 +asg102 +g103 sg105 I00 -sS'commit' -p494 -S'v3.0' -p495 -sg108 -g109 -sS'buildjni' -p496 -(lp497 -S'yes' -p498 -asg113 -g114 -sg115 -Nsg116 -NsS'gradle' -p499 -(lp500 -g395 -asg119 -g26 -sg120 +sg106 I00 +sS'commit' +p470 +S'v3.0' +p471 +sg109 +g110 +sS'buildjni' +p472 +(lp473 +g113 +asg114 +g115 +sg116 +Nsg117 +NsS'gradle' +p474 +(lp475 +g113 +asg120 +g27 sg121 +I00 +sg122 NsasS'FlattrID' -p501 +p476 S'369138' -p502 +p477 sS'Disabled' -p503 +p478 NsS'Update Check Name' -p504 +p479 NsS'Vercode Operation' -p505 +p480 NsS'Current Version' -p506 +p481 S'3.0' -p507 -s. \ No newline at end of file +p482 +s. diff --git a/tests/metadata/org.smssecure.smssecure.pickle b/tests/metadata/org.smssecure.smssecure.pickle index 4cd8f2a8..8885d55e 100644 --- a/tests/metadata/org.smssecure.smssecure.pickle +++ b/tests/metadata/org.smssecure.smssecure.pickle @@ -5,751 +5,752 @@ NsS'Bitcoin' p2 NsS'AntiFeatures' p3 -NsS'Web Site' -p4 -S'http://www.smssecure.org' +(lp4 +sS'Web Site' p5 -sS'Auto Update Mode' +S'http://www.smssecure.org' p6 -S'Version v%v' +sS'Auto Update Mode' p7 -sS'Provides' +S'Version v%v' p8 -NsS'Issue Tracker' +sS'Provides' p9 -S'https://github.com/SMSSecure/SMSSecure/issues' +NsS'Issue Tracker' p10 -sS'Donate' +S'https://github.com/SMSSecure/SMSSecure/issues' p11 -NsS'Repo Type' +sS'Donate' p12 -S'git' +NsS'Repo Type' p13 -sS'Description' +S'git' p14 -(lp15 +sS'Description' +p15 +(lp16 S'SMSSecure is an SMS/MMS application that allows you to protect your privacy while communicating with friends.' -p16 -aS'Using SMSSecure, you can send SMS messages and share media or attachments with complete privacy.' p17 -aS'' +aS'Using SMSSecure, you can send SMS messages and share media or attachments with complete privacy.' p18 -aS"* Easy. SMSSecure works like any other SMS application. There's nothing to sign up for and no new service your friends need to join." +aS'' p19 -aS'* Reliable. SMSSecure communicates using encrypted SMS messages. No servers or internet connection required.' +aS"* Easy. SMSSecure works like any other SMS application. There's nothing to sign up for and no new service your friends need to join." p20 -aS'* Private. SMSSecure uses the TextSecure encryption protocol to provide privacy for every message, every time.' +aS'* Reliable. SMSSecure communicates using encrypted SMS messages. No servers or internet connection required.' p21 -aS'* Safe. All messages are encrypted locally, so if your phone is lost or stolen, your messages are protected.' +aS'* Private. SMSSecure uses the TextSecure encryption protocol to provide privacy for every message, every time.' p22 -aS'* Open Source. SMSSecure is Free and Open Source, enabling anyone to verify its security by auditing the code.' +aS'* Safe. All messages are encrypted locally, so if your phone is lost or stolen, your messages are protected.' p23 -asS'Requires Root' +aS'* Open Source. SMSSecure is Free and Open Source, enabling anyone to verify its security by auditing the code.' p24 +asS'Requires Root' +p25 I00 sS'comments' -p25 -(lp26 +p26 +(lp27 sS'id' -p27 -S'org.smssecure.smssecure' p28 -sS'Repo' +S'org.smssecure.smssecure' p29 -S'https://github.com/SMSSecure/SMSSecure' +sS'Repo' p30 -sS'No Source Since' -p31 -g18 -sS'Auto Name' -p32 -S'SMSSecure' -p33 -sS'Categories' -p34 -(lp35 -S'Phone & SMS' -p36 -asS'Source Code' -p37 S'https://github.com/SMSSecure/SMSSecure' +p31 +sS'No Source Since' +p32 +g19 +sS'Auto Name' +p33 +S'SMSSecure' +p34 +sS'Categories' +p35 +(lp36 +S'Phone & SMS' +p37 +asS'Source Code' p38 -sS'Litecoin' +S'https://github.com/SMSSecure/SMSSecure' p39 -NsS'Update Check Ignore' +sS'Litecoin' p40 -NsS'Name' +NsS'Update Check Ignore' p41 -NsS'License' +NsS'Name' p42 -S'GPLv3' +NsS'License' p43 -sS'Changelog' +S'GPLv3' p44 -g18 -sS'Update Check Mode' +sS'Changelog' p45 -S'Tags' +g19 +sS'Update Check Mode' p46 -sS'Summary' +S'Tags' p47 -S'Send encrypted text messages (SMS)' +sS'Summary' p48 -sS'Dogecoin' +S'Send encrypted text messages (SMS)' p49 -NsS'Maintainer Notes' +sS'Dogecoin' p50 -(lp51 +NsS'Maintainer Notes' +p51 +(lp52 sS'Current Version Code' -p52 -S'102' p53 -sS'Binaries' +S'102' p54 -NsS'Archive Policy' +sS'Binaries' p55 -NsS'builds' +NsS'Archive Policy' p56 -(lp57 -(dp58 +NsS'builds' +p57 +(lp58 +(dp59 S'submodules' -p59 +p60 I00 sS'vercode' -p60 -S'5' p61 -sS'forceversion' +S'5' p62 -I00 -sS'oldsdkloc' +sS'forceversion' p63 I00 -sS'kivy' +sS'oldsdkloc' p64 I00 -sS'patch' +sS'kivy' p65 -(lp66 +I00 +sS'patch' +p66 +(lp67 sS'scanignore' -p67 -(lp68 +p68 +(lp69 sS'srclibs' -p69 -(lp70 +p70 +(lp71 S'GradleWitness@10f1269c0aafdc1d478efc005ed48f3a47d44278' -p71 -aS'PreferenceFragment@717a45433b927d2f0dfc5328f79e77c9682c37bc' p72 -aS'ShortcutBadger@3815ce2ec0c66acd7d7c0b4f2479df8fa70fed87' +aS'PreferenceFragment@717a45433b927d2f0dfc5328f79e77c9682c37bc' p73 -aS'AospMms@android-5.1.0_r3' +aS'ShortcutBadger@3815ce2ec0c66acd7d7c0b4f2479df8fa70fed87' p74 -asS'encoding' +aS'AospMms@android-5.1.0_r3' p75 -NsS'extlibs' +asS'encoding' p76 -(lp77 +NsS'extlibs' +p77 +(lp78 sS'init' -p78 -g18 -sS'version' p79 -S'0.3.3' +g19 +sS'version' p80 -sS'subdir' +S'0.3.3' p81 -NsS'rm' +sS'subdir' p82 -(lp83 +NsS'rm' +p83 +(lp84 S'libs/*' -p84 -asS'type' p85 -S'gradle' +asS'type' p86 -sS'build' +S'gradle' p87 -g18 -sS'ndk_path' +sS'build' p88 -g18 -sS'forcevercode' +g19 +sS'ndk_path' p89 +g19 +sS'forcevercode' +p90 I01 sS'preassemble' -p90 -(lp91 +p91 +(lp92 sS'update' -p92 -(lp93 +p93 +(lp94 S'auto' -p94 -asS'maven' p95 +asS'maven' +p96 I00 sS'disable' -p96 -S'builds, merge changes into upstream' p97 -sS'commit' +S'builds, merge changes into upstream' p98 -S'66367479a4f57f347b5cbe8f6f8f632adaae7727' +sS'commit' p99 -sS'scandelete' +S'66367479a4f57f347b5cbe8f6f8f632adaae7727' p100 -(lp101 +sS'scandelete' +p101 +(lp102 sS'buildjni' -p102 -(lp103 +p103 +(lp104 sS'ndk' -p104 -S'r10e' p105 -sS'target' +S'r10e' p106 -NsS'antcommands' +sS'target' p107 -NsS'gradle' +NsS'antcommands' p108 -(lp109 +NsS'gradle' +p109 +(lp110 S'yes' -p110 -asS'prebuild' p111 -S"touch signing.properties && pushd $$GradleWitness$$ && gradle jar && popd && cp $$GradleWitness$$/build/libs/GradleWitness.jar libs/gradle-witness.jar && sed -i -e '20,22d' build.gradle && pushd $$PreferenceFragment$$ && gradle uploadArchives && popd && sed -i -e '/5470f5872514a6226fa1fc6f4e000991f38805691c534cf0bd2778911fc773ad/d' build.gradle && mkdir smil && pushd smil && wget -c http://www.w3.org/TR/smil-boston-dom/java-binding.zip && unzip java-binding.zip && popd && cp -fR smil/java/org src/ && rm -fR smil && sed -i -e '/org.w3c.smil/d' build.gradle && cp -fR $$AospMms$$/src/org src/ " +asS'prebuild' p112 -sS'novcheck' +S"touch signing.properties && pushd $$GradleWitness$$ && gradle jar && popd && cp $$GradleWitness$$/build/libs/GradleWitness.jar libs/gradle-witness.jar && sed -i -e '20,22d' build.gradle && pushd $$PreferenceFragment$$ && gradle uploadArchives && popd && sed -i -e '/5470f5872514a6226fa1fc6f4e000991f38805691c534cf0bd2778911fc773ad/d' build.gradle && mkdir smil && pushd smil && wget -c http://www.w3.org/TR/smil-boston-dom/java-binding.zip && unzip java-binding.zip && popd && cp -fR smil/java/org src/ && rm -fR smil && sed -i -e '/org.w3c.smil/d' build.gradle && cp -fR $$AospMms$$/src/org src/ " p113 +sS'novcheck' +p114 I00 sS'output' -p114 -Nsa(dp115 +p115 +Nsa(dp116 S'submodules' -p116 -I01 -sg60 -S'6' p117 -sg62 -I00 -sg63 -I00 -sg64 -I00 -sg65 -g66 -sg67 -g68 -sS'srclibs' +I01 +sg61 +S'6' p118 -(lp119 -S'GradleWitness@10f1269c0aafdc1d478efc005ed48f3a47d44278' -p120 -asg75 -Nsg76 -g77 -sg78 -g18 -sg79 -S'0.3.3' -p121 -sg81 -NsS'rm' -p122 -(lp123 -S'libs/*.jar' -p124 -asg85 -g86 -sg87 -g18 -sg88 -g18 -sS'forcevercode' -p125 -I00 -sg90 -g91 -sg92 -g93 -sg95 -I00 -sS'disable' -p126 -S'builds, wait for upstream' -p127 -sS'commit' -p128 -S'9675ce5eecb929dcaddb43b3d9486fdb88b9ae1a' -p129 -sg100 -g101 -sg102 -g103 -sg104 -g105 -sg106 -Nsg107 -NsS'gradle' -p130 -(lp131 -g110 -asS'prebuild' -p132 -S'touch signing.properties && pushd $$GradleWitness$$ && gradle jar && popd && cp $$GradleWitness$$/build/libs/GradleWitness.jar libs/gradle-witness.jar' -p133 -sg113 -I00 -sg114 -Nsa(dp134 -S'submodules' -p135 -I01 -sg60 -S'9' -p136 -sg62 -I00 sg63 I00 sg64 I00 sg65 -g66 -sg67 -g68 +I00 +sg66 +g67 +sg68 +g69 sS'srclibs' +p119 +(lp120 +S'GradleWitness@10f1269c0aafdc1d478efc005ed48f3a47d44278' +p121 +asg76 +Nsg77 +g78 +sg79 +g19 +sg80 +S'0.3.3' +p122 +sg82 +NsS'rm' +p123 +(lp124 +S'libs/*.jar' +p125 +asg86 +g87 +sg88 +g19 +sg89 +g19 +sS'forcevercode' +p126 +I00 +sg91 +g92 +sg93 +g94 +sg96 +I00 +sS'disable' +p127 +S'builds, wait for upstream' +p128 +sS'commit' +p129 +S'9675ce5eecb929dcaddb43b3d9486fdb88b9ae1a' +p130 +sg101 +g102 +sg103 +g104 +sg105 +g106 +sg107 +Nsg108 +NsS'gradle' +p131 +(lp132 +g111 +asS'prebuild' +p133 +S'touch signing.properties && pushd $$GradleWitness$$ && gradle jar && popd && cp $$GradleWitness$$/build/libs/GradleWitness.jar libs/gradle-witness.jar' +p134 +sg114 +I00 +sg115 +Nsa(dp135 +S'submodules' +p136 +I01 +sg61 +S'9' p137 -(lp138 -sg75 -Nsg76 -g77 -sg78 -g18 +sg63 +I00 +sg64 +I00 +sg65 +I00 +sg66 +g67 +sg68 +g69 +sS'srclibs' +p138 +(lp139 +sg76 +Nsg77 +g78 sg79 +g19 +sg80 S'0.4.2' -p139 -sg81 -NsS'rm' p140 -(lp141 +sg82 +NsS'rm' +p141 +(lp142 S'libs/*.jar' -p142 -asg85 -g86 -sg87 -g18 -sg88 -g18 -sg125 -I00 -sg90 -g91 -sg92 -g93 -sg95 -I00 -sS'disable' p143 -S'builds locally, but not on BS' +asg86 +g87 +sg88 +g19 +sg89 +g19 +sg126 +I00 +sg91 +g92 +sg93 +g94 +sg96 +I00 +sS'disable' p144 -sS'commit' +S'builds locally, but not on BS' p145 -S'v0.4.2' +sS'commit' p146 -sg100 -g101 -sg102 -g103 -sg104 -g105 -sg106 -Nsg107 -NsS'gradle' +S'v0.4.2' p147 -(lp148 -g110 +sg101 +g102 +sg103 +g104 +sg105 +g106 +sg107 +Nsg108 +NsS'gradle' +p148 +(lp149 +g111 asS'prebuild' -p149 -S'touch signing.properties && ./build-witness.sh && rm -rf libs/gradle-witness/build && echo "org.gradle.jvmargs=-Xms512m -Xmx512m -XX:MaxPermSize=512m" >> gradle.properties' p150 -sg113 -I00 -sg114 -Nsa(dp151 -S'submodules' -p152 -I01 -sg60 -S'11' -p153 -sg62 -I00 -sg63 -I00 -sg64 -I00 -sg65 -g66 -sg67 -g68 -sg137 -g138 -sg75 -Nsg76 -g77 -sg78 -g18 -sg79 -S'0.5.1' -p154 -sg81 -NsS'rm' -p155 -(lp156 -S'libs/*.jar' -p157 -asg85 -g86 -sg87 -g18 -sg88 -g18 -sg125 -I00 -sg90 -g91 -sg92 -g93 -sg95 -I00 -sS'disable' -p158 -I00 -sS'commit' -p159 -S'v0.5.1' -p160 -sg100 -g101 -sg102 -g103 -sg104 -g105 -sg106 -Nsg107 -NsS'gradle' -p161 -(lp162 -g110 -asS'prebuild' -p163 S'touch signing.properties && ./build-witness.sh && rm -rf libs/gradle-witness/build && echo "org.gradle.jvmargs=-Xms512m -Xmx512m -XX:MaxPermSize=512m" >> gradle.properties' -p164 -sg113 -I00 +p151 sg114 -Nsa(dp165 -S'submodules' -p166 -I01 -sg60 -S'12' -p167 -sg62 I00 +sg115 +Nsa(dp152 +S'submodules' +p153 +I01 +sg61 +S'11' +p154 sg63 I00 sg64 I00 sg65 -g66 -sg67 -g68 -sg137 -g138 -sg75 -Nsg76 -g77 -sg78 -g18 -sg79 -S'0.5.2' -p168 -sg81 -NsS'rm' -p169 -(lp170 -S'libs/*.jar' -p171 -asg85 -g86 -sg87 -g18 -sg88 -g18 -sg125 I00 -sg90 -g91 -sg92 -g93 -sg95 +sg66 +g67 +sg68 +g69 +sg138 +g139 +sg76 +Nsg77 +g78 +sg79 +g19 +sg80 +S'0.5.1' +p155 +sg82 +NsS'rm' +p156 +(lp157 +S'libs/*.jar' +p158 +asg86 +g87 +sg88 +g19 +sg89 +g19 +sg126 +I00 +sg91 +g92 +sg93 +g94 +sg96 I00 sS'disable' +p159 +I00 +sS'commit' +p160 +S'v0.5.1' +p161 +sg101 +g102 +sg103 +g104 +sg105 +g106 +sg107 +Nsg108 +NsS'gradle' +p162 +(lp163 +g111 +asS'prebuild' +p164 +S'touch signing.properties && ./build-witness.sh && rm -rf libs/gradle-witness/build && echo "org.gradle.jvmargs=-Xms512m -Xmx512m -XX:MaxPermSize=512m" >> gradle.properties' +p165 +sg114 +I00 +sg115 +Nsa(dp166 +S'submodules' +p167 +I01 +sg61 +S'12' +p168 +sg63 +I00 +sg64 +I00 +sg65 +I00 +sg66 +g67 +sg68 +g69 +sg138 +g139 +sg76 +Nsg77 +g78 +sg79 +g19 +sg80 +S'0.5.2' +p169 +sg82 +NsS'rm' +p170 +(lp171 +S'libs/*.jar' p172 -S'broken in upstream' +asg86 +g87 +sg88 +g19 +sg89 +g19 +sg126 +I00 +sg91 +g92 +sg93 +g94 +sg96 +I00 +sS'disable' p173 -sS'commit' +S'broken in upstream' p174 -S'v0.5.2' +sS'commit' p175 -sg100 -g101 -sg102 -g103 -sg104 -g105 -sg106 -Nsg107 -NsS'gradle' +S'v0.5.2' p176 -(lp177 -g110 +sg101 +g102 +sg103 +g104 +sg105 +g106 +sg107 +Nsg108 +NsS'gradle' +p177 +(lp178 +g111 asS'prebuild' -p178 -S'touch signing.properties && ./scripts/build-witness.sh && rm -rf libs/gradle-witness/build' p179 -sg113 -I00 +S'touch signing.properties && ./scripts/build-witness.sh && rm -rf libs/gradle-witness/build' +p180 sg114 -Nsa(dp180 +I00 +sg115 +Nsa(dp181 S'submodules' -p181 -I01 -sg60 -S'100' p182 -sg62 -I00 -sg63 -I00 -sg64 -I00 -sg65 -g66 -sg67 -g68 -sg137 -g138 -sg75 -Nsg76 -g77 -sg78 -g18 -sg79 -S'0.5.3' +I01 +sg61 +S'100' p183 -sg81 -NsS'rm' +sg63 +I00 +sg64 +I00 +sg65 +I00 +sg66 +g67 +sg68 +g69 +sg138 +g139 +sg76 +Nsg77 +g78 +sg79 +g19 +sg80 +S'0.5.3' p184 -(lp185 +sg82 +NsS'rm' +p185 +(lp186 S'libs/*.jar' -p186 -asg85 -g86 -sg87 -g18 -sg88 -g18 -sg125 -I00 -sg90 -g91 -sg92 -g93 -sg95 -I00 -sg158 -I00 -sS'commit' p187 -S'v0.5.3' +asg86 +g87 +sg88 +g19 +sg89 +g19 +sg126 +I00 +sg91 +g92 +sg93 +g94 +sg96 +I00 +sg159 +I00 +sS'commit' p188 -sg100 -g101 -sg102 -g103 -sg104 -g105 -sg106 -Nsg107 -NsS'gradle' +S'v0.5.3' p189 -(lp190 -g110 +sg101 +g102 +sg103 +g104 +sg105 +g106 +sg107 +Nsg108 +NsS'gradle' +p190 +(lp191 +g111 asS'prebuild' -p191 -S'touch signing.properties && ./scripts/build-witness.sh && rm -rf libs/gradle-witness/build' p192 -sg113 -I00 +S'touch signing.properties && ./scripts/build-witness.sh && rm -rf libs/gradle-witness/build' +p193 sg114 -Nsa(dp193 +I00 +sg115 +Nsa(dp194 S'submodules' -p194 -I01 -sg60 -S'101' p195 -sg62 -I00 -sg63 -I00 -sg64 -I00 -sg65 -g66 -sg67 -g68 -sg137 -g138 -sg75 -Nsg76 -g77 -sg78 -g18 -sg79 -S'0.5.4' -p196 -sg81 -NsS'rm' -p197 -(lp198 -S'libs/*.jar' -p199 -asg85 -g86 -sg87 -g18 -sg88 -g18 -sg125 -I00 -sg90 -g91 -sg92 -g93 -sg95 -I00 -sg158 -I00 -sS'commit' -p200 -S'v0.5.4' -p201 -sg100 -g101 -sg102 -g103 -sg104 -g105 -sg106 -Nsg107 -NsS'gradle' -p202 -(lp203 -g110 -asS'prebuild' -p204 -S'touch signing.properties && ./scripts/build-witness.sh && rm -rf libs/gradle-witness/build' -p205 -sg113 -I00 -sg114 -Nsa(dp206 -S'submodules' -p207 I01 -sg60 -S'102' -p208 -sg62 -I00 +sg61 +S'101' +p196 sg63 I00 sg64 I00 sg65 -g66 -sg67 -g68 -sg137 -g138 -sg75 -Nsg76 -g77 -sg78 -g18 +I00 +sg66 +g67 +sg68 +g69 +sg138 +g139 +sg76 +Nsg77 +g78 sg79 -S'0.6.0' -p209 -sg81 +g19 +sg80 +S'0.5.4' +p197 +sg82 NsS'rm' -p210 -(lp211 +p198 +(lp199 S'libs/*.jar' -p212 -asg85 -g86 -sg87 -g18 +p200 +asg86 +g87 sg88 -g18 -sg125 +g19 +sg89 +g19 +sg126 I00 -sg90 -g91 -sg92 -g93 -sg95 +sg91 +g92 +sg93 +g94 +sg96 I00 -sg158 +sg159 I00 sS'commit' -p213 -S'v0.6.0' -p214 -sg100 -g101 -sg102 -g103 -sg104 -g105 -sg106 -Nsg107 +p201 +S'v0.5.4' +p202 +sg101 +g102 +sg103 +g104 +sg105 +g106 +sg107 +Nsg108 NsS'gradle' -p215 -(lp216 -g110 +p203 +(lp204 +g111 asS'prebuild' -p217 +p205 S'touch signing.properties && ./scripts/build-witness.sh && rm -rf libs/gradle-witness/build' -p218 -sg113 -I00 +p206 sg114 -NsasS'FlattrID' -p219 -NsS'Disabled' -p220 -NsS'Update Check Name' -p221 -NsS'Vercode Operation' -p222 -NsS'Current Version' -p223 +I00 +sg115 +Nsa(dp207 +S'submodules' +p208 +I01 +sg61 +S'102' +p209 +sg63 +I00 +sg64 +I00 +sg65 +I00 +sg66 +g67 +sg68 +g69 +sg138 +g139 +sg76 +Nsg77 +g78 +sg79 +g19 +sg80 S'0.6.0' +p210 +sg82 +NsS'rm' +p211 +(lp212 +S'libs/*.jar' +p213 +asg86 +g87 +sg88 +g19 +sg89 +g19 +sg126 +I00 +sg91 +g92 +sg93 +g94 +sg96 +I00 +sg159 +I00 +sS'commit' +p214 +S'v0.6.0' +p215 +sg101 +g102 +sg103 +g104 +sg105 +g106 +sg107 +Nsg108 +NsS'gradle' +p216 +(lp217 +g111 +asS'prebuild' +p218 +S'touch signing.properties && ./scripts/build-witness.sh && rm -rf libs/gradle-witness/build' +p219 +sg114 +I00 +sg115 +NsasS'FlattrID' +p220 +NsS'Disabled' +p221 +NsS'Update Check Name' +p222 +NsS'Vercode Operation' +p223 +NsS'Current Version' p224 -s. \ No newline at end of file +S'0.6.0' +p225 +s. From ab145de6bc50568b185827acb75931ea2b1a7a02 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Wed, 22 Jul 2015 18:40:31 -0700 Subject: [PATCH 11/22] support app metadata in XML format While the current text metadata format is good for human readability and editability, it is difficult to produce and parse using code. XML is a widespread standard format for easy automatic parsing and creating, while having decent human readability. The .pickle for testing is a lightly edited version of the real metadata for net.osmand.plus: * comments were removed * "NonFreeNet" was added as an AntiFeature --- fdroidserver/metadata.py | 100 +++++- tests/metadata.TestCase | 2 +- tests/metadata/net.osmand.plus.pickle | 491 ++++++++++++++++++++++++++ tests/metadata/net.osmand.plus.xml | 180 ++++++++++ 4 files changed, 766 insertions(+), 7 deletions(-) create mode 100644 tests/metadata/net.osmand.plus.pickle create mode 100644 tests/metadata/net.osmand.plus.xml diff --git a/fdroidserver/metadata.py b/fdroidserver/metadata.py index 2b75389f..3a389ec2 100644 --- a/fdroidserver/metadata.py +++ b/fdroidserver/metadata.py @@ -20,10 +20,14 @@ import json import os import re +import sys import glob import cgi import logging +# use the C implementation when available +import xml.etree.cElementTree as ElementTree + from collections import OrderedDict import common @@ -79,6 +83,8 @@ app_defaults = OrderedDict([ # In the order in which they are laid out on files # Sorted by their action and their place in the build timeline +# These variables can have varying datatypes. For example, anything with +# flagtype(v) == 'list' is inited as False, then set as a list of strings. flag_defaults = OrderedDict([ ('disable', False), ('commit', None), @@ -494,6 +500,11 @@ def read_metadata(xref=True): check_metadata(appinfo) apps[appid] = appinfo + for metafile in sorted(glob.glob(os.path.join('metadata', '*.xml'))): + appid, appinfo = parse_xml_metadata(metafile) + check_metadata(appinfo) + apps[appid] = appinfo + if xref: # Parse all descriptions at load time, just to ensure cross-referencing # errors are caught early rather than when they hit the build server. @@ -579,6 +590,20 @@ def get_default_app_info_list(): def post_metadata_parse(thisinfo): + for build in thisinfo['builds']: + for k, v in build.iteritems(): + if k == 'versionCode': + build['vercode'] = str(v) + del build['versionCode'] + elif k == 'versionName': + build['version'] = str(v) + del build['versionName'] + elif flagtype(k) == 'bool': + if v == 'no': + build[k] = False + else: + build[k] = True + if not thisinfo['Description']: thisinfo['Description'].append('No description available') @@ -682,12 +707,6 @@ def parse_json_metadata(metafile): build[k] = ['yes'] else: build[k] = ['no'] - elif k == 'versionCode': - build['vercode'] = v - del build['versionCode'] - elif k == 'versionName': - build['version'] = v - del build['versionName'] # TODO create schema using https://pypi.python.org/pypi/jsonschema post_metadata_parse(thisinfo) @@ -695,6 +714,75 @@ def parse_json_metadata(metafile): return (appid, thisinfo) +def parse_xml_metadata(metafile): + + appid = os.path.basename(metafile)[0:-4] # strip path and .xml + thisinfo = get_default_app_info_list() + thisinfo['id'] = appid + + tree = ElementTree.ElementTree(file=metafile) + root = tree.getroot() + + if root.tag != 'resources': + logging.critical(metafile + ' does not have root as !') + sys.exit(1) + + supported_metadata = app_defaults.keys() + for child in root: + if child.tag != 'builds': + # builds does not have name="" attrib + name = child.attrib['name'] + if name not in supported_metadata: + raise MetaDataException("Unrecognised metadata: <" + + child.tag + ' name="' + name + '">' + + child.text + + "') + + if child.tag == 'string': + thisinfo[name] = child.text + elif child.tag == 'string-array': + items = [] + for item in child: + items.append(item.text) + thisinfo[name] = items + elif child.tag == 'builds': + builds = [] + for build in child: + builddict = dict() + for key in build: + builddict[key.tag] = key.text + builds.append(builddict) + thisinfo['builds'] = builds + + # convert to the odd internal format + for k in ('Description', 'Maintainer Notes'): + if isinstance(thisinfo[k], basestring): + text = thisinfo[k].rstrip().lstrip() + thisinfo[k] = text.split('\n') + + supported_flags = flag_defaults.keys() + ['versionCode', 'versionName'] + for build in thisinfo['builds']: + for k, v in build.iteritems(): + if k not in supported_flags: + raise MetaDataException("Unrecognised build flag: {0}={1}" + .format(k, v)) + keyflagtype = flagtype(k) + if keyflagtype == 'bool': + # TODO handle this using + + + + Tracking + NonFreeNet + + + + Navigation + + + GPLv3 + http://osmand.net + https://github.com/osmandapp/Osmand + https://github.com/osmandapp/Osmand/issues + https://code.google.com/p/osmand/#Please_support_the_project + + OsmAnd~ + Offline/online maps and navigation + Osmand~'s features can be extended by enabling the plugins via the settings, +which include online maps from many sources, tracking, OpenStreetMap (OSM) editing and +accessibility enhancements. + +Map data of both vector and raster types can be stored on the phone memory +card for offline usage, and navigation by default uses offline methods. Map +data packages for many territories can be downloaded from within the app and +there is a desktop program available on the website as well for creating your +own. + +Anti-Features: Tracking - It will send your device and application specs to an +Analytics server upon downloading the list of maps you can download. + +[https://osmandapp.github.io/changes.html Changelog] + + + git + https://github.com/mvdan/OsmAnd-submodules + + + + + + + + 182 + 1.8.2 + 76ada6c8a08afe69acb755503373ac36328ef665 + android/OsmAnd + true + bin/OsmAnd-release-unsigned.apk + sed -i 's/"OsmAnd+"/"OsmAnd~"/g' build.xml + ./old-ndk-build.sh && ant -Dsdk.dir="$ANDROID_SDK" -Dndk.dir="$ANDROID_NDK" -DBLACKBERRY_BUILD=false -DBUILD_SUFFIX= -DAPK_NUMBER_VERSION=182 "-DFEATURES=+play_market +gps_status -parking_plugin -blackberry -amazon -route_nav" -DCLEAN_CPP=false -DPACKAGE_TO_BUILT=net.osmand.plus -DAPK_VERSION=1.8.2 -Dnet.osmand.plus= -Dbuild.version=1.8.2 -Dbuild.version.code=182 -Dnativeoff=false "-DversionFeatures=+play_market +gps_status -parking_plugin -blackberry -amazon -route_nav" clean release + no + + + + 1.8.3 + 183 + 1.8.3 + android/OsmAnd + true + bin/OsmAnd-release-unsigned.apk + ../../build + no + + + + 1.9.4 + 196 + 1.9.4 + android/OsmAnd + true + bin/OsmAnd-release-unsigned.apk + ../../build + no + r10d + + + + 1.9.5 + 197 + 1.9.5 + android/OsmAnd + true + bin/OsmAnd-release-unsigned.apk + ../../build + no + r10d + + + + + +No UCMs apply because git never contains actual releases, only pre-releses. + +The build instructions have been moved to a script in the root of the repo, +'build'. This way it can be updated along with the submodules. + + + None + None + 1.9.5 + 197 + + \ No newline at end of file From 014df8426f55cf66d6b4982bec23698d45e91584 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Thu, 23 Jul 2015 16:33:08 -0700 Subject: [PATCH 12/22] eliminate Boolean metadata type, only 'bool' is needed No need for a specific metadata type for 'Requires Root'. Just use 'bool', then convert on output. This keeps the internal representation consistent since all boolean-ish values will be Python bools. This in turn makes parsing metadata in various formats easier. This also makes setting booleans more tolerant since all these values are valid: Yes yes No no True true False false --- fdroidserver/metadata.py | 34 ++++++++++------------------------ fdroidserver/update.py | 6 +++++- 2 files changed, 15 insertions(+), 25 deletions(-) diff --git a/fdroidserver/metadata.py b/fdroidserver/metadata.py index 3a389ec2..fa862876 100644 --- a/fdroidserver/metadata.py +++ b/fdroidserver/metadata.py @@ -195,14 +195,9 @@ valuetypes = { ["Dogecoin"], []), - FieldValidator("Boolean", - ['Yes', 'No'], None, - ["Requires Root"], - []), - FieldValidator("bool", - ['yes', 'no'], None, - [], + r'([Yy]es|[Nn]o|[Tt]rue|[Ff]alse)', None, + ["Requires Root"], ['submodules', 'oldsdkloc', 'forceversion', 'forcevercode', 'novcheck']), @@ -598,11 +593,6 @@ def post_metadata_parse(thisinfo): elif k == 'versionName': build['version'] = str(v) del build['versionName'] - elif flagtype(k) == 'bool': - if v == 'no': - build[k] = False - else: - build[k] = True if not thisinfo['Description']: thisinfo['Description'].append('No description available') @@ -683,17 +673,6 @@ def parse_json_metadata(metafile): parse_float=lambda s: s) supported_metadata = app_defaults.keys() + ['builds', 'comments'] for k, v in jsoninfo.iteritems(): - if k == 'Requires Root': - if isinstance(v, basestring): - if re.match('^\s*(yes|true).*', v, flags=re.IGNORECASE): - jsoninfo[k] = 'Yes' - elif re.match('^\s*(no|false).*', v, flags=re.IGNORECASE): - jsoninfo[k] = 'No' - if isinstance(v, bool): - if v: - jsoninfo[k] = 'Yes' - else: - jsoninfo[k] = 'No' if k not in supported_metadata: logging.warn(metafile + ' contains unknown metadata key, ignoring: ' + k) thisinfo.update(jsoninfo) @@ -754,6 +733,13 @@ def parse_xml_metadata(metafile): builds.append(builddict) thisinfo['builds'] = builds + # TODO handle this using Date: Thu, 23 Jul 2015 15:09:57 -0700 Subject: [PATCH 13/22] consolidate all post-parse metadata checks This puts all of the needed post parsing checks on the metadata into a single method that is used by all parsing methods (.txt, JSON, XML, YAML). This provides the single place to normalize the internal representation of the metadata. It would be good to also change the internal representation to use more Python bool/int types so that less post parsing is needed for JSON, XML, and YAML. The SMSSecure test .pickle was changed to account for the use of lstrip() and rstrip() on all 'script' types. This also changes the example JSON to use ints for versionCodes --- fdroidserver/metadata.py | 87 +- tests/metadata/org.adaway.json | 58 +- tests/metadata/org.adaway.pickle | 2747 ++++++++--------- tests/metadata/org.smssecure.smssecure.pickle | 2 +- 4 files changed, 1449 insertions(+), 1445 deletions(-) diff --git a/fdroidserver/metadata.py b/fdroidserver/metadata.py index fa862876..10976871 100644 --- a/fdroidserver/metadata.py +++ b/fdroidserver/metadata.py @@ -585,14 +585,58 @@ def get_default_app_info_list(): def post_metadata_parse(thisinfo): + supported_metadata = app_defaults.keys() + ['comments', 'builds', 'id'] + for k, v in thisinfo.iteritems(): + if k not in supported_metadata: + raise MetaDataException("Unrecognised metadata: {0}: {1}" + .format(k, v)) + if type(v) in (float, int): + thisinfo[k] = str(v) + + # convert to the odd internal format + for k in ('Description', 'Maintainer Notes'): + if isinstance(thisinfo[k], basestring): + text = thisinfo[k].rstrip().lstrip() + thisinfo[k] = text.split('\n') + + supported_flags = (flag_defaults.keys() + + ['vercode', 'version', 'versionCode', 'versionName']) + esc_newlines = re.compile('\\\\( |\\n)') + for build in thisinfo['builds']: - for k, v in build.iteritems(): + for k, v in build.items(): + if k not in supported_flags: + raise MetaDataException("Unrecognised build flag: {0}={1}" + .format(k, v)) + if k == 'versionCode': build['vercode'] = str(v) del build['versionCode'] elif k == 'versionName': build['version'] = str(v) del build['versionName'] + elif type(v) in (float, int): + build[k] = str(v) + else: + keyflagtype = flagtype(k) + if keyflagtype == 'list': + # these can be bools, strings or lists, but ultimately are lists + if isinstance(v, basestring): + build[k] = [v] + elif isinstance(v, bool): + if v: + build[k] = ['yes'] + else: + build[k] = ['no'] + elif keyflagtype == 'script': + build[k] = re.sub(esc_newlines, '', v).lstrip().rstrip() + elif keyflagtype == 'bool': + # TODO handle this using > 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/' -p339 -sg121 +p336 +sg119 I00 -sg122 -Nsa(dp340 -g74 +sS'commit' +p337 +S'v2.1' +p338 +sa(dp339 +g73 I00 -sg75 +sg74 S'42' -p341 +p340 +sg76 +I00 sg77 I00 sg78 -I00 -sg79 -I00 +g79 sg80 -I00 -sg81 -g82 +g81 sS'srclibs' -p342 -(lp343 +p341 +(lp342 S'RootCommands@c940b0e503' -p344 -asg85 +p343 +asg84 +Nsg85 NsS'extlibs' -p345 -(lp346 +p344 +(lp345 S'htmlcleaner/htmlcleaner-2.2.jar' -p347 +p346 asS'init' -p348 +p347 S'rm android-libs/Donations/custom_rules.xml && git clone https://github.com/dschuermann/HtmlSpanner android-libs/HtmlSpanner' -p349 +p348 sg89 S'2.3' -p350 +p349 sS'subdir' -p351 +p350 S'AdAway' -p352 +p351 sg93 -g94 +g27 +sg94 +I00 sg95 -g96 +g27 +sg96 +I00 sg97 -g27 -sg98 -g27 -sg99 -I00 -sg100 -g101 +g98 sS'update' -p353 -(lp354 -g330 +p352 +(lp353 +g329 aS'android-libs/Donations' -p355 +p354 aS'android-libs/ActionBarSherlock' -p356 +p355 aS'android-libs/HtmlSpanner/htmlspanner' -p357 -asg105 +p356 +asg102 I00 +sg103 +I00 +sg104 +g105 sg106 -I00 -sS'commit' -p358 -S'v2.3' -p359 -sg109 -g110 +g107 sS'buildjni' -p360 -(lp361 -g113 -asg114 +p357 +(lp358 +g110 +asg111 +g112 +sg113 +Nsg114 g115 sg116 Nsg117 -Nsg118 -g119 +I00 sS'prebuild' -p362 +p359 S'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/' -p363 -sg121 +p360 +sg119 I00 -sg122 -Nsa(dp364 -g74 +sS'commit' +p361 +S'v2.3' +p362 +sa(dp363 +g73 I00 -sg75 +sg74 S'45' -p365 +p364 +sg76 +I00 sg77 I00 sg78 -I00 -sg79 -I00 -sg118 -g119 -sg81 -g82 -sg83 -g84 -sg85 +g79 +sS'gradle' +p365 +(lp366 +g110 +asg82 +g83 +sg84 +Nsg85 Nsg86 g87 sg88 g27 sg89 S'2.6' -p366 -sS'subdir' p367 -S'AdAway' +sS'subdir' p368 +S'AdAway' +p369 sg93 -g94 +g27 +sg94 +I00 sg95 -g80 -sg97 g27 -sg98 -g27 -sg99 +sg96 I00 sS'preassemble' -p369 -(lp370 +p370 +(lp371 S'renameExecutables' -p371 -asg102 -g103 -sg105 +p372 +asg99 +g100 +sg102 I00 +sg103 +I00 +sg104 +g105 sg106 +g107 +sS'buildjni' +p373 +(lp374 +g110 +asg111 +g112 +sg113 +Nsg114 +g117 +sg116 +Nsg80 +g81 +sg118 +g27 +sg119 I00 sS'commit' -p372 +p375 S'v2.6' -p373 -sg109 -g110 -sS'buildjni' -p374 -(lp375 -g113 -asg114 -g115 -sg116 -Nsg117 -NsS'gradle' p376 -(lp377 -g113 -asg120 -g27 -sg121 +sa(dp377 +g73 I00 -sg122 -Nsa(dp378 -g74 -I00 -sg75 +sg74 S'46' -p379 +p378 +sg76 +I00 sg77 I00 sg78 -I00 -sg79 -I00 -sg118 -g119 -sg81 -g82 -sg83 -g84 -sg85 +g79 +sS'gradle' +p379 +(lp380 +g110 +asg82 +g83 +sg84 +Nsg85 Nsg86 g87 sg88 g27 sg89 S'2.7' -p380 -sS'subdir' p381 -S'AdAway' +sS'subdir' p382 +S'AdAway' +p383 sg93 -g94 +g27 +sg94 +I00 sg95 -g80 -sg97 g27 -sg98 -g27 -sg99 +sg96 I00 sS'preassemble' -p383 -(lp384 +p384 +(lp385 S'renameExecutables' -p385 -asg102 -g103 -sg105 +p386 +asg99 +g100 +sg102 I00 +sg103 +I00 +sg104 +g105 sg106 +g107 +sS'buildjni' +p387 +(lp388 +g110 +asg111 +g112 +sg113 +Nsg114 +g117 +sg116 +Nsg80 +g81 +sg118 +g27 +sg119 I00 sS'commit' -p386 +p389 S'v2.7' -p387 -sg109 -g110 -sS'buildjni' -p388 -(lp389 -g113 -asg114 -g115 -sg116 -Nsg117 -NsS'gradle' p390 -(lp391 -g113 -asg120 -g27 -sg121 +sa(dp391 +g73 I00 -sg122 -Nsa(dp392 -g74 -I00 -sg75 +sg74 S'47' -p393 +p392 +sg76 +I00 sg77 I00 sg78 -I00 -sg79 -I00 -sg118 -g119 -sg81 -g82 -sg83 -g84 -sg85 +g79 +sS'gradle' +p393 +(lp394 +g110 +asg82 +g83 +sg84 +Nsg85 Nsg86 g87 sg88 g27 sg89 S'2.8' -p394 -sS'subdir' p395 -S'AdAway' +sS'subdir' p396 +S'AdAway' +p397 sg93 -g94 +g27 +sg94 +I00 sg95 -g80 -sg97 g27 -sg98 -g27 -sg99 +sg96 I00 sS'preassemble' -p397 -(lp398 +p398 +(lp399 S'renameExecutables' -p399 -asg102 -g103 -sg105 +p400 +asg99 +g100 +sg102 I00 +sg103 +I00 +sg104 +g105 sg106 +g107 +sS'buildjni' +p401 +(lp402 +g110 +asg111 +g112 +sg113 +Nsg114 +g117 +sg116 +Nsg80 +g81 +sg118 +g27 +sg119 I00 sS'commit' -p400 +p403 S'v2.8' -p401 -sg109 -g110 -sS'buildjni' -p402 -(lp403 -g113 -asg114 -g115 -sg116 -Nsg117 -NsS'gradle' p404 -(lp405 -g113 -asg120 -g27 -sg121 +sa(dp405 +g73 I00 -sg122 -Nsa(dp406 -g74 -I00 -sg75 +sg74 S'48' -p407 +p406 +sg76 +I00 sg77 I00 sg78 -I00 -sg79 -I00 -sg118 -g119 -sg81 -g82 -sg83 -g84 -sg85 +g79 +sS'gradle' +p407 +(lp408 +g110 +asg82 +g83 +sg84 +Nsg85 Nsg86 g87 sg88 g27 sg89 S'2.8.1' -p408 -sS'subdir' p409 -S'AdAway' +sS'subdir' p410 +S'AdAway' +p411 sg93 -g94 +g27 +sg94 +I00 sg95 -g80 -sg97 g27 -sg98 -g27 -sg99 +sg96 I00 sS'preassemble' -p411 -(lp412 +p412 +(lp413 S'renameExecutables' -p413 -asg102 -g103 -sg105 +p414 +asg99 +g100 +sg102 I00 +sg103 +I00 +sg104 +g105 sg106 +g107 +sS'buildjni' +p415 +(lp416 +g110 +asg111 +g112 +sg113 +Nsg114 +g117 +sg116 +Nsg80 +g81 +sg118 +g27 +sg119 I00 sS'commit' -p414 +p417 S'v2.8.1' -p415 -sg109 -g110 -sS'buildjni' -p416 -(lp417 -g113 -asg114 -g115 -sg116 -Nsg117 -NsS'gradle' p418 -(lp419 -g113 -asg120 -g27 -sg121 +sa(dp419 +g73 I00 -sg122 -Nsa(dp420 -g74 -I00 -sg75 +sg74 S'49' -p421 +p420 +sg76 +I00 sg77 I00 sg78 -I00 -sg79 -I00 -sg118 -g119 -sg81 -g82 -sg83 -g84 -sg85 +g79 +sS'gradle' +p421 +(lp422 +g110 +asg82 +g83 +sg84 +Nsg85 Nsg86 g87 sg88 g27 sg89 S'2.9' -p422 -sS'subdir' p423 -S'AdAway' +sS'subdir' p424 +S'AdAway' +p425 sg93 -g94 +g27 +sg94 +I00 sg95 -g80 -sg97 g27 -sg98 -g27 -sg99 +sg96 I00 sS'preassemble' -p425 -(lp426 +p426 +(lp427 S'renameExecutables' -p427 -asg102 -g103 -sg105 +p428 +asg99 +g100 +sg102 I00 +sg103 +I00 +sg104 +g105 sg106 +g107 +sS'buildjni' +p429 +(lp430 +g110 +asg111 +g112 +sg113 +Nsg114 +g117 +sg116 +Nsg80 +g81 +sg118 +g27 +sg119 I00 sS'commit' -p428 +p431 S'v2.9' -p429 -sg109 -g110 -sS'buildjni' -p430 -(lp431 -g113 -asg114 -g115 -sg116 -Nsg117 -NsS'gradle' p432 -(lp433 -g113 -asg120 -g27 -sg121 +sa(dp433 +g73 I00 -sg122 -Nsa(dp434 -g74 -I00 -sg75 +sg74 S'50' -p435 +p434 +sg76 +I00 sg77 I00 sg78 -I00 -sg79 -I00 -sg118 -g119 -sg81 -g82 -sg83 -g84 -sg85 +g79 +sS'gradle' +p435 +(lp436 +g110 +asg82 +g83 +sg84 +Nsg85 Nsg86 g87 sg88 g27 sg89 S'2.9.1' -p436 -sS'subdir' p437 -S'AdAway' +sS'subdir' p438 +S'AdAway' +p439 sg93 -g94 +g27 +sg94 +I00 sg95 -g80 -sg97 g27 -sg98 -g27 -sg99 +sg96 I00 sS'preassemble' -p439 -(lp440 +p440 +(lp441 S'renameExecutables' -p441 -asg102 -g103 -sg105 +p442 +asg99 +g100 +sg102 I00 +sg103 +I00 +sg104 +g105 sg106 +g107 +sS'buildjni' +p443 +(lp444 +g110 +asg111 +g112 +sg113 +Nsg114 +g117 +sg116 +Nsg80 +g81 +sg118 +g27 +sg119 I00 sS'commit' -p442 +p445 S'v2.9.1' -p443 -sg109 -g110 -sS'buildjni' -p444 -(lp445 -g113 -asg114 -g115 -sg116 -Nsg117 -NsS'gradle' p446 -(lp447 -g113 -asg120 -g27 -sg121 +sa(dp447 +g73 I00 -sg122 -Nsa(dp448 -g74 -I00 -sg75 +sg74 S'51' -p449 +p448 +sg76 +I00 sg77 I00 sg78 -I00 -sg79 -I00 -sg118 -g119 -sg81 -g82 -sg83 -g84 -sg85 +g79 +sS'gradle' +p449 +(lp450 +g110 +asg82 +g83 +sg84 +Nsg85 Nsg86 g87 sg88 g27 sg89 S'2.9.2' -p450 -sS'subdir' p451 -S'AdAway' +sS'subdir' p452 +S'AdAway' +p453 sg93 -g94 +g27 +sg94 +I00 sg95 -g80 -sg97 g27 -sg98 -g27 -sg99 +sg96 I00 sS'preassemble' -p453 -(lp454 +p454 +(lp455 S'renameExecutables' -p455 -asg102 -g103 -sg105 +p456 +asg99 +g100 +sg102 I00 +sg103 +I00 +sg104 +g105 sg106 +g107 +sS'buildjni' +p457 +(lp458 +g110 +asg111 +g112 +sg113 +Nsg114 +g117 +sg116 +Nsg80 +g81 +sg118 +g27 +sg119 I00 sS'commit' -p456 +p459 S'v2.9.2' -p457 -sg109 -g110 -sS'buildjni' -p458 -(lp459 -g113 -asg114 -g115 -sg116 -Nsg117 -NsS'gradle' p460 -(lp461 -g113 -asg120 -g27 -sg121 +sa(dp461 +g73 I00 -sg122 -Nsa(dp462 -g74 -I00 -sg75 +sg74 S'52' -p463 +p462 +sg76 +I00 sg77 I00 sg78 -I00 -sg79 -I00 -sg118 -g119 -sg81 -g82 -sg83 -g84 -sg85 +g79 +sS'gradle' +p463 +(lp464 +g110 +asg82 +g83 +sg84 +Nsg85 Nsg86 g87 sg88 g27 sg89 S'3.0' -p464 -sS'subdir' p465 -S'AdAway' +sS'subdir' p466 +S'AdAway' +p467 sg93 -g94 +g27 +sg94 +I00 sg95 -g80 -sg97 g27 -sg98 -g27 -sg99 +sg96 I00 sS'preassemble' -p467 -(lp468 +p468 +(lp469 S'renameExecutables' -p469 -asg102 -g103 -sg105 +p470 +asg99 +g100 +sg102 I00 +sg103 +I00 +sg104 +g105 sg106 +g107 +sS'buildjni' +p471 +(lp472 +g110 +asg111 +g112 +sg113 +Nsg114 +g117 +sg116 +Nsg80 +g81 +sg118 +g27 +sg119 I00 sS'commit' -p470 +p473 S'v3.0' -p471 -sg109 -g110 -sS'buildjni' -p472 -(lp473 -g113 -asg114 -g115 -sg116 -Nsg117 -NsS'gradle' p474 -(lp475 -g113 -asg120 -g27 -sg121 -I00 -sg122 -NsasS'FlattrID' -p476 +sasS'FlattrID' +p475 S'369138' -p477 +p476 sS'Disabled' -p478 +p477 NsS'Update Check Name' -p479 +p478 NsS'Vercode Operation' -p480 +p479 NsS'Current Version' -p481 +p480 S'3.0' -p482 -s. +p481 +s. \ No newline at end of file diff --git a/tests/metadata/org.smssecure.smssecure.pickle b/tests/metadata/org.smssecure.smssecure.pickle index 8885d55e..860acaf7 100644 --- a/tests/metadata/org.smssecure.smssecure.pickle +++ b/tests/metadata/org.smssecure.smssecure.pickle @@ -218,7 +218,7 @@ S'yes' p111 asS'prebuild' p112 -S"touch signing.properties && pushd $$GradleWitness$$ && gradle jar && popd && cp $$GradleWitness$$/build/libs/GradleWitness.jar libs/gradle-witness.jar && sed -i -e '20,22d' build.gradle && pushd $$PreferenceFragment$$ && gradle uploadArchives && popd && sed -i -e '/5470f5872514a6226fa1fc6f4e000991f38805691c534cf0bd2778911fc773ad/d' build.gradle && mkdir smil && pushd smil && wget -c http://www.w3.org/TR/smil-boston-dom/java-binding.zip && unzip java-binding.zip && popd && cp -fR smil/java/org src/ && rm -fR smil && sed -i -e '/org.w3c.smil/d' build.gradle && cp -fR $$AospMms$$/src/org src/ " +S"touch signing.properties && pushd $$GradleWitness$$ && gradle jar && popd && cp $$GradleWitness$$/build/libs/GradleWitness.jar libs/gradle-witness.jar && sed -i -e '20,22d' build.gradle && pushd $$PreferenceFragment$$ && gradle uploadArchives && popd && sed -i -e '/5470f5872514a6226fa1fc6f4e000991f38805691c534cf0bd2778911fc773ad/d' build.gradle && mkdir smil && pushd smil && wget -c http://www.w3.org/TR/smil-boston-dom/java-binding.zip && unzip java-binding.zip && popd && cp -fR smil/java/org src/ && rm -fR smil && sed -i -e '/org.w3c.smil/d' build.gradle && cp -fR $$AospMms$$/src/org src/" p113 sS'novcheck' p114 From 0b62e7f22a4760c29c09e8132529e44f32ec7669 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Fri, 24 Jul 2015 00:38:31 -0700 Subject: [PATCH 14/22] set appid in get_default_app_info_list() --- fdroidserver/metadata.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/fdroidserver/metadata.py b/fdroidserver/metadata.py index 10976871..038c6a84 100644 --- a/fdroidserver/metadata.py +++ b/fdroidserver/metadata.py @@ -572,9 +572,11 @@ def split_list_values(s): return [v for v in l if v] -def get_default_app_info_list(): +def get_default_app_info_list(appid=None): thisinfo = {} thisinfo.update(app_defaults) + if appid is not None: + thisinfo['id'] = appid # General defaults... thisinfo['builds'] = [] @@ -706,8 +708,7 @@ def _decode_dict(data): def parse_json_metadata(metafile): appid = os.path.basename(metafile)[0:-5] # strip path and .json - thisinfo = get_default_app_info_list() - thisinfo['id'] = appid + thisinfo = get_default_app_info_list(appid) # fdroid metadata is only strings and booleans, no floats or ints. And # json returns unicode, and fdroidserver still uses plain python strings @@ -725,8 +726,7 @@ def parse_json_metadata(metafile): def parse_xml_metadata(metafile): appid = os.path.basename(metafile)[0:-4] # strip path and .xml - thisinfo = get_default_app_info_list() - thisinfo['id'] = appid + thisinfo = get_default_app_info_list(appid) tree = ElementTree.ElementTree(file=metafile) root = tree.getroot() From 32e257d742c8d6dc1cd93da1b716979a71758180 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Fri, 24 Jul 2015 00:42:47 -0700 Subject: [PATCH 15/22] support app metadata in YAML format YAML is a format that is quite similar to the .txt format, but is a widespread standard that has editing modes in popular editors. It is also easily parsable in python. The .pickle for testing is a lightly edited version of the real metadata for org.videolan.vlc: * comments were removed --- fdroidserver/metadata.py | 26 + setup.py | 1 + tests/metadata.TestCase | 2 +- tests/metadata/org.videolan.vlc.pickle | 5488 ++++++++++++++++++++++++ tests/metadata/org.videolan.vlc.yaml | 911 ++++ 5 files changed, 6427 insertions(+), 1 deletion(-) create mode 100644 tests/metadata/org.videolan.vlc.pickle create mode 100644 tests/metadata/org.videolan.vlc.yaml diff --git a/fdroidserver/metadata.py b/fdroidserver/metadata.py index 038c6a84..fe45c896 100644 --- a/fdroidserver/metadata.py +++ b/fdroidserver/metadata.py @@ -25,6 +25,15 @@ import glob import cgi import logging +import yaml +# use libyaml if it is available +try: + from yaml import CLoader + YamlLoader = CLoader +except ImportError: + from yaml import Loader + YamlLoader = Loader + # use the C implementation when available import xml.etree.cElementTree as ElementTree @@ -500,6 +509,11 @@ def read_metadata(xref=True): check_metadata(appinfo) apps[appid] = appinfo + for metafile in sorted(glob.glob(os.path.join('metadata', '*.yaml'))): + appid, appinfo = parse_yaml_metadata(metafile) + check_metadata(appinfo) + apps[appid] = appinfo + if xref: # Parse all descriptions at load time, just to ensure cross-referencing # errors are caught early rather than when they hit the build server. @@ -774,6 +788,18 @@ def parse_xml_metadata(metafile): return (appid, thisinfo) +def parse_yaml_metadata(metafile): + + appid = os.path.basename(metafile)[0:-5] # strip path and .yaml + thisinfo = get_default_app_info_list(appid) + + yamlinfo = yaml.load(open(metafile, 'r'), Loader=YamlLoader) + thisinfo.update(yamlinfo) + post_metadata_parse(thisinfo) + + return (appid, thisinfo) + + def parse_txt_metadata(metafile): appid = None diff --git a/setup.py b/setup.py index 7b323f4b..a98fe264 100644 --- a/setup.py +++ b/setup.py @@ -33,6 +33,7 @@ setup(name='fdroidserver', 'apache-libcloud >= 0.14.1', 'pyasn1', 'pyasn1-modules', + 'PyYAML', 'requests', ], classifiers=[ diff --git a/tests/metadata.TestCase b/tests/metadata.TestCase index d5c873e7..8d20ffef 100755 --- a/tests/metadata.TestCase +++ b/tests/metadata.TestCase @@ -37,7 +37,7 @@ class MetadataTest(unittest.TestCase): fdroidserver.common.config = config apps = fdroidserver.metadata.read_metadata(xref=True) - for appid in ('org.smssecure.smssecure', 'org.adaway', 'net.osmand.plus'): + for appid in ('org.smssecure.smssecure', 'org.adaway', 'net.osmand.plus', 'org.videolan.vlc'): frompickle = pickle.load(open(os.path.join('metadata', appid + '.pickle'))) self.assertTrue(appid in apps.keys()) self.assertEquals(apps[appid], frompickle) diff --git a/tests/metadata/org.videolan.vlc.pickle b/tests/metadata/org.videolan.vlc.pickle new file mode 100644 index 00000000..9cb7c2de --- /dev/null +++ b/tests/metadata/org.videolan.vlc.pickle @@ -0,0 +1,5488 @@ +(dp0 +S'Update Check Data' +p1 +NsS'Bitcoin' +p2 +NsS'AntiFeatures' +p3 +(lp4 +sS'Web Site' +p5 +S'http://www.videolan.org/vlc/download-android.html' +p6 +sS'Auto Update Mode' +p7 +S'None' +p8 +sS'Provides' +p9 +NsS'Issue Tracker' +p10 +S'http://www.videolan.org/support/index.html#bugs' +p11 +sS'Donate' +p12 +S'http://www.videolan.org/contribute.html#money' +p13 +sS'Repo Type' +p14 +S'git' +p15 +sS'Description' +p16 +(lp17 +S'Video and audio player that supports a wide range of formats,' +p18 +aS'for both local and remote playback.' +p19 +aS'' +p20 +aS'[http://git.videolan.org/?p=vlc-ports/android.git;a=blob_plain;f=NEWS NEWS]' +p21 +asS'Requires Root' +p22 +I00 +sS'comments' +p23 +(lp24 +sS'id' +p25 +S'org.videolan.vlc' +p26 +sS'Repo' +p27 +S'git://git.videolan.org/vlc-ports/android.git' +p28 +sS'No Source Since' +p29 +g20 +sS'Auto Name' +p30 +S'VLC' +p31 +sS'Categories' +p32 +(lp33 +S'Multimedia' +p34 +asS'Source Code' +p35 +S'http://git.videolan.org/?p=vlc-ports/android.git;a=summary' +p36 +sS'Litecoin' +p37 +NsS'Update Check Ignore' +p38 +NsS'Name' +p39 +NsS'License' +p40 +S'GPLv3' +p41 +sS'Changelog' +p42 +g20 +sS'Update Check Mode' +p43 +S'Tags' +p44 +sS'Summary' +p45 +S'Media player' +p46 +sS'Dogecoin' +p47 +NsS'Maintainer Notes' +p48 +(lp49 +S'Instructions and dependencies here: http://wiki.videolan.org/AndroidCompile' +p50 +aS'see http://buildbot.videolan.org/builders/ for version code scheme' +p51 +aS'The VLC srclib commit can be found out from TESTED_HASH value in compile.sh' +p52 +ag20 +aS'On new releases remove the updatecheck and force the CV to the last working' +p53 +aS"build. This will make sure users don't get notified about the update until" +p54 +aS'the final build from the BS has been reviewed and tested. Once done, undo' +p55 +aS'those changes.' +p56 +asS'Current Version Code' +p57 +S'1030005' +p58 +sS'Binaries' +p59 +NsS'Archive Policy' +p60 +S'9 versions' +p61 +sS'builds' +p62 +(lp63 +(dp64 +S'submodules' +p65 +I00 +sS'vercode' +p66 +S'110' +p67 +sS'forceversion' +p68 +I01 +sS'oldsdkloc' +p69 +I00 +sS'kivy' +p70 +I00 +sS'gradle' +p71 +I00 +sS'scanignore' +p72 +(lp73 +sS'srclibs' +p74 +(lp75 +sS'encoding' +p76 +NsS'extlibs' +p77 +(lp78 +sS'init' +p79 +g20 +sS'version' +p80 +S'0.0.11-ARMv7' +p81 +sS'build' +p82 +S'cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release' +p83 +sS'rm' +p84 +(lp85 +sS'type' +p86 +S'ant' +p87 +sS'subdir' +p88 +S'vlc-android' +p89 +sS'ndk_path' +p90 +g20 +sS'forcevercode' +p91 +I01 +sS'preassemble' +p92 +(lp93 +sS'update' +p94 +(lp95 +S'.' +p96 +aS'../java-libs/SlidingMenu' +p97 +aS'../java-libs/ActionBarSherlock' +p98 +asS'maven' +p99 +I00 +sS'disable' +p100 +I00 +sS'commit' +p101 +S'0.0.11' +p102 +sS'scandelete' +p103 +(lp104 +sS'buildjni' +p105 +(lp106 +S'no' +p107 +asS'ndk' +p108 +S'r10e' +p109 +sS'target' +p110 +NsS'antcommands' +p111 +NsS'patch' +p112 +(lp113 +sS'prebuild' +p114 +S"sed -i '48d' ../Makefile" +p115 +sS'novcheck' +p116 +I00 +sS'output' +p117 +Nsa(dp118 +g65 +I00 +sg66 +S'111' +p119 +sS'forceversion' +p120 +I01 +sg69 +I00 +sg70 +I00 +sg71 +I00 +sg72 +g73 +sg74 +g75 +sg76 +Nsg77 +g78 +sg79 +g20 +sg80 +S'0.0.11-ARM' +p121 +sS'build' +p122 +S'cd ../ && ANDROID_ABI=armeabi ./compile.sh release' +p123 +sg84 +g85 +sg86 +g87 +sS'subdir' +p124 +S'vlc-android' +p125 +sg90 +g20 +sS'forcevercode' +p126 +I01 +sg92 +g93 +sS'update' +p127 +(lp128 +g96 +aS'../java-libs/SlidingMenu' +p129 +aS'../java-libs/ActionBarSherlock' +p130 +asg99 +I00 +sg100 +I00 +sS'commit' +p131 +S'0.0.11' +p132 +sg103 +g104 +sS'buildjni' +p133 +(lp134 +S'no' +p135 +asg108 +g109 +sg110 +Nsg111 +Nsg112 +g113 +sS'prebuild' +p136 +S"sed -i '48d' ../Makefile" +p137 +sg116 +I00 +sg117 +Nsa(dp138 +g65 +I00 +sg66 +S'112' +p139 +sS'forceversion' +p140 +I01 +sg69 +I00 +sg70 +I00 +sg71 +I00 +sg72 +g73 +sg74 +g75 +sg76 +Nsg77 +g78 +sg79 +g20 +sg80 +S'0.0.11-x86' +p141 +sS'build' +p142 +S'cd ../ && ANDROID_ABI=x86 ./compile.sh release' +p143 +sg84 +g85 +sg86 +g87 +sS'subdir' +p144 +S'vlc-android' +p145 +sg90 +g20 +sS'forcevercode' +p146 +I01 +sg92 +g93 +sS'update' +p147 +(lp148 +g96 +aS'../java-libs/SlidingMenu' +p149 +aS'../java-libs/ActionBarSherlock' +p150 +asg99 +I00 +sS'disable' +p151 +S'ffmpeg error 0.0.11' +p152 +sS'commit' +p153 +S'unknown - see disabled' +p154 +sg103 +g104 +sS'buildjni' +p155 +(lp156 +S'no' +p157 +asg108 +g109 +sg110 +Nsg111 +Nsg112 +g113 +sS'prebuild' +p158 +S"sed -i '48d' ../Makefile" +p159 +sg116 +I00 +sg117 +Nsa(dp160 +g65 +I00 +sg66 +S'113' +p161 +sS'forceversion' +p162 +I01 +sg69 +I00 +sg70 +I00 +sg71 +I00 +sg72 +g73 +sg74 +g75 +sg76 +Nsg77 +g78 +sg79 +g20 +sg80 +S'0.0.11-mips' +p163 +sS'build' +p164 +S'cd ../ && ANDROID_ABI=mips ./compile.sh release' +p165 +sg84 +g85 +sg86 +g87 +sS'subdir' +p166 +S'vlc-android' +p167 +sg90 +g20 +sS'forcevercode' +p168 +I01 +sg92 +g93 +sS'update' +p169 +(lp170 +g96 +aS'../java-libs/SlidingMenu' +p171 +aS'../java-libs/ActionBarSherlock' +p172 +asg99 +I00 +sg100 +I00 +sS'commit' +p173 +S'0.0.11' +p174 +sg103 +g104 +sS'buildjni' +p175 +(lp176 +S'no' +p177 +asg108 +g109 +sg110 +Nsg111 +Nsg112 +g113 +sS'prebuild' +p178 +S"sed -i '48d' ../Makefile" +p179 +sg116 +I00 +sg117 +Nsa(dp180 +g65 +I00 +sg66 +S'1301' +p181 +sS'forceversion' +p182 +I01 +sg69 +I00 +sg70 +I00 +sg71 +I00 +sg72 +g73 +sS'srclibs' +p183 +(lp184 +S'VLC@7c52aacbe' +p185 +asg76 +Nsg77 +g78 +sg79 +g20 +sg80 +S'0.1.3-MIPS' +p186 +sS'build' +p187 +S'cd ../ && ANDROID_ABI=mips ./compile.sh release' +p188 +sg84 +g85 +sg86 +g87 +sS'subdir' +p189 +S'vlc-android' +p190 +sg90 +g20 +sS'forcevercode' +p191 +I01 +sg92 +g93 +sS'update' +p192 +(lp193 +S'auto' +p194 +asg99 +I00 +sS'disable' +p195 +S'build failing (at 0.1.3)' +p196 +sS'commit' +p197 +S'0.1.3' +p198 +sg103 +g104 +sS'buildjni' +p199 +(lp200 +S'no' +p201 +asg108 +g109 +sg110 +Nsg111 +NsS'patch' +p202 +(lp203 +S'ndkr9.patch' +p204 +asS'prebuild' +p205 +S"sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC$$ ../vlc" +p206 +sg116 +I00 +sg117 +Nsa(dp207 +g65 +I00 +sg66 +S'1302' +p208 +sS'forceversion' +p209 +I01 +sg69 +I00 +sg70 +I00 +sg71 +I00 +sg72 +g73 +sS'srclibs' +p210 +(lp211 +S'VLC@7c52aacbe' +p212 +asg76 +Nsg77 +g78 +sg79 +g20 +sg80 +S'0.1.3-x86' +p213 +sS'build' +p214 +S'cd ../ && ANDROID_ABI=x86 ./compile.sh release' +p215 +sg84 +g85 +sg86 +g87 +sS'subdir' +p216 +S'vlc-android' +p217 +sg90 +g20 +sS'forcevercode' +p218 +I01 +sg92 +g93 +sg192 +g193 +sg99 +I00 +sg100 +I00 +sS'commit' +p219 +S'0.1.3' +p220 +sg103 +g104 +sS'buildjni' +p221 +(lp222 +S'no' +p223 +asg108 +g109 +sg110 +Nsg111 +NsS'patch' +p224 +(lp225 +S'ndkr9.patch' +p226 +asS'prebuild' +p227 +S"sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC$$ ../vlc" +p228 +sg116 +I00 +sg117 +Nsa(dp229 +g65 +I00 +sg66 +S'1303' +p230 +sS'forceversion' +p231 +I01 +sg69 +I00 +sg70 +I00 +sg71 +I00 +sg72 +g73 +sS'srclibs' +p232 +(lp233 +S'VLC@7c52aacbe' +p234 +asg76 +Nsg77 +g78 +sg79 +g20 +sg80 +S'0.1.3-ARM' +p235 +sS'build' +p236 +S'cd ../ && ANDROID_ABI=armeabi ./compile.sh release' +p237 +sg84 +g85 +sg86 +g87 +sS'subdir' +p238 +S'vlc-android' +p239 +sg90 +g20 +sS'forcevercode' +p240 +I01 +sg92 +g93 +sg192 +g193 +sg99 +I00 +sg100 +I00 +sS'commit' +p241 +S'0.1.3' +p242 +sg103 +g104 +sS'buildjni' +p243 +(lp244 +S'no' +p245 +asg108 +g109 +sg110 +Nsg111 +NsS'patch' +p246 +(lp247 +S'ndkr9.patch' +p248 +asS'prebuild' +p249 +S"sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC$$ ../vlc" +p250 +sg116 +I00 +sg117 +Nsa(dp251 +g65 +I00 +sg66 +S'1304' +p252 +sS'forceversion' +p253 +I01 +sg69 +I00 +sg70 +I00 +sg71 +I00 +sg72 +g73 +sS'srclibs' +p254 +(lp255 +S'VLC@7c52aacbe' +p256 +asg76 +Nsg77 +g78 +sg79 +g20 +sg80 +S'0.1.3-ARMv7' +p257 +sS'build' +p258 +S'cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release' +p259 +sg84 +g85 +sg86 +g87 +sS'subdir' +p260 +S'vlc-android' +p261 +sg90 +g20 +sS'forcevercode' +p262 +I01 +sg92 +g93 +sg192 +g193 +sg99 +I00 +sg100 +I00 +sS'commit' +p263 +S'0.1.3' +p264 +sg103 +g104 +sS'buildjni' +p265 +(lp266 +S'no' +p267 +asg108 +g109 +sg110 +Nsg111 +NsS'patch' +p268 +(lp269 +S'ndkr9.patch' +p270 +asS'prebuild' +p271 +S"sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC$$ ../vlc" +p272 +sg116 +I00 +sg117 +Nsa(dp273 +g65 +I00 +sg66 +S'9002' +p274 +sS'forceversion' +p275 +I00 +sg69 +I00 +sg70 +I00 +sg71 +I00 +sg72 +g73 +sS'srclibs' +p276 +(lp277 +S'VLC@31ffb20309264994' +p278 +asg76 +Nsg77 +g78 +sg79 +g20 +sg80 +S'0.9.0' +p279 +sS'build' +p280 +S'cd ../ && ANDROID_ABI=x86 ./compile.sh release' +p281 +sg84 +g85 +sg86 +g87 +sS'subdir' +p282 +S'vlc-android' +p283 +sg90 +g20 +sS'forcevercode' +p284 +I01 +sg92 +g93 +sg192 +g193 +sg99 +I00 +sg100 +I00 +sS'commit' +p285 +S'0.9.0' +p286 +sg103 +g104 +sS'buildjni' +p287 +(lp288 +S'no' +p289 +asg108 +g109 +sg110 +Nsg111 +Nsg112 +g113 +sS'prebuild' +p290 +S"sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC$$ ../vlc" +p291 +sg116 +I00 +sg117 +Nsa(dp292 +g65 +I00 +sg66 +S'9004' +p293 +sg275 +I00 +sg69 +I00 +sg70 +I00 +sg71 +I00 +sg72 +g73 +sS'srclibs' +p294 +(lp295 +S'VLC@31ffb20309264994' +p296 +asg76 +Nsg77 +g78 +sg79 +g20 +sg80 +S'0.9.0' +p297 +sS'build' +p298 +S'cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release' +p299 +sg84 +g85 +sg86 +g87 +sS'subdir' +p300 +S'vlc-android' +p301 +sg90 +g20 +sS'forcevercode' +p302 +I01 +sg92 +g93 +sg192 +g193 +sg99 +I00 +sg100 +I00 +sS'commit' +p303 +S'0.9.0' +p304 +sg103 +g104 +sS'buildjni' +p305 +(lp306 +S'no' +p307 +asg108 +g109 +sg110 +Nsg111 +Nsg112 +g113 +sS'prebuild' +p308 +S"sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC$$ ../vlc" +p309 +sg116 +I00 +sg117 +Nsa(dp310 +g65 +I00 +sg66 +S'9102' +p311 +sg275 +I00 +sg69 +I00 +sg70 +I00 +sg71 +I00 +sg72 +g73 +sS'srclibs' +p312 +(lp313 +S'VLC@37e886d113b8b567c15208579fb2f' +p314 +asg76 +Nsg77 +g78 +sg79 +g20 +sg80 +S'0.9.1' +p315 +sS'build' +p316 +S'cd ../ && ANDROID_ABI=x86 ./compile.sh release' +p317 +sg84 +g85 +sg86 +g87 +sS'subdir' +p318 +S'vlc-android' +p319 +sg90 +g20 +sS'forcevercode' +p320 +I01 +sg92 +g93 +sg192 +g193 +sg99 +I00 +sg100 +I00 +sS'commit' +p321 +S'0.9.1' +p322 +sg103 +g104 +sS'buildjni' +p323 +(lp324 +S'no' +p325 +asg108 +g109 +sg110 +Nsg111 +Nsg112 +g113 +sS'prebuild' +p326 +S"sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC$$ ../vlc" +p327 +sg116 +I00 +sg117 +Nsa(dp328 +g65 +I00 +sg66 +S'9104' +p329 +sg275 +I00 +sg69 +I00 +sg70 +I00 +sg71 +I00 +sg72 +g73 +sS'srclibs' +p330 +(lp331 +S'VLC@37e886d113b8b567c15208579fb2f' +p332 +asg76 +Nsg77 +g78 +sg79 +g20 +sg80 +S'0.9.1' +p333 +sS'build' +p334 +S'cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release' +p335 +sg84 +g85 +sg86 +g87 +sS'subdir' +p336 +S'vlc-android' +p337 +sg90 +g20 +sS'forcevercode' +p338 +I01 +sg92 +g93 +sg192 +g193 +sg99 +I00 +sg100 +I00 +sS'commit' +p339 +S'0.9.1' +p340 +sg103 +g104 +sS'buildjni' +p341 +(lp342 +S'no' +p343 +asg108 +g109 +sg110 +Nsg111 +Nsg112 +g113 +sS'prebuild' +p344 +S"sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC$$ ../vlc" +p345 +sg116 +I00 +sg117 +Nsa(dp346 +g65 +I00 +sg66 +S'9502' +p347 +sg275 +I00 +sg69 +I00 +sg70 +I00 +sg71 +I00 +sg72 +g73 +sS'srclibs' +p348 +(lp349 +S'VLC@052600173f376ff58ff04d53746961a2' +p350 +asg76 +Nsg77 +g78 +sg79 +g20 +sg80 +S'0.9.5' +p351 +sS'build' +p352 +S'cd ../ && ANDROID_ABI=x86 ./compile.sh release' +p353 +sg84 +g85 +sg86 +g87 +sS'subdir' +p354 +S'vlc-android' +p355 +sg90 +g20 +sS'forcevercode' +p356 +I01 +sg92 +g93 +sg192 +g193 +sg99 +I00 +sS'disable' +p357 +S"can't download gmp" +p358 +sS'commit' +p359 +S'0.9.5' +p360 +sg103 +g104 +sS'buildjni' +p361 +(lp362 +S'no' +p363 +asg108 +g109 +sg110 +Nsg111 +Nsg112 +g113 +sS'prebuild' +p364 +S"sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC$$ ../vlc" +p365 +sg116 +I00 +sg117 +Nsa(dp366 +g65 +I00 +sg66 +S'9504' +p367 +sg275 +I00 +sg69 +I00 +sg70 +I00 +sg71 +I00 +sg72 +g73 +sS'srclibs' +p368 +(lp369 +S'VLC@052600173f376ff58ff04d53746961a2' +p370 +asg76 +Nsg77 +g78 +sg79 +g20 +sg80 +S'0.9.5' +p371 +sS'build' +p372 +S'cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release' +p373 +sg84 +g85 +sg86 +g87 +sS'subdir' +p374 +S'vlc-android' +p375 +sg90 +g20 +sS'forcevercode' +p376 +I01 +sg92 +g93 +sg192 +g193 +sg99 +I00 +sS'disable' +p377 +S"can't download gmp" +p378 +sS'commit' +p379 +S'0.9.5' +p380 +sg103 +g104 +sS'buildjni' +p381 +(lp382 +S'no' +p383 +asg108 +g109 +sg110 +Nsg111 +Nsg112 +g113 +sS'prebuild' +p384 +S"sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC$$ ../vlc" +p385 +sg116 +I00 +sg117 +Nsa(dp386 +g65 +I00 +sg66 +S'9602' +p387 +sg275 +I00 +sg69 +I00 +sg70 +I00 +sg71 +I00 +sg72 +g73 +sS'srclibs' +p388 +(lp389 +S'VLC-2.2@27f4799' +p390 +asg76 +Nsg77 +g78 +sg79 +g20 +sg80 +S'0.9.6' +p391 +sS'build' +p392 +S'cd ../ && ANDROID_ABI=x86 ./compile.sh release' +p393 +sg84 +g85 +sg86 +g87 +sS'subdir' +p394 +S'vlc-android' +p395 +sg90 +g20 +sS'forcevercode' +p396 +I01 +sg92 +g93 +sg192 +g193 +sg99 +I00 +sg100 +I00 +sS'commit' +p397 +S'0.9.6' +p398 +sg103 +g104 +sS'buildjni' +p399 +(lp400 +S'no' +p401 +asg108 +g109 +sg110 +Nsg111 +Nsg112 +g113 +sS'prebuild' +p402 +S"sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc" +p403 +sg116 +I00 +sg117 +Nsa(dp404 +g65 +I00 +sg66 +S'9604' +p405 +sg275 +I00 +sg69 +I00 +sg70 +I00 +sg71 +I00 +sg72 +g73 +sS'srclibs' +p406 +(lp407 +S'VLC-2.2@27f4799' +p408 +asg76 +Nsg77 +g78 +sg79 +g20 +sg80 +S'0.9.6' +p409 +sS'build' +p410 +S'cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release' +p411 +sg84 +g85 +sg86 +g87 +sS'subdir' +p412 +S'vlc-android' +p413 +sg90 +g20 +sS'forcevercode' +p414 +I01 +sg92 +g93 +sg192 +g193 +sg99 +I00 +sg100 +I00 +sS'commit' +p415 +S'0.9.6' +p416 +sg103 +g104 +sS'buildjni' +p417 +(lp418 +S'no' +p419 +asg108 +g109 +sg110 +Nsg111 +Nsg112 +g113 +sS'prebuild' +p420 +S"sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc" +p421 +sg116 +I00 +sg117 +Nsa(dp422 +g65 +I00 +sg66 +S'9702' +p423 +sg275 +I00 +sg69 +I00 +sg70 +I00 +sg71 +I00 +sg72 +g73 +sS'srclibs' +p424 +(lp425 +S'VLC-2.2@9e1c6ff' +p426 +asg76 +Nsg77 +g78 +sg79 +g20 +sg80 +S'0.9.7' +p427 +sS'build' +p428 +S'cd ../ && ANDROID_ABI=x86 ./compile.sh release' +p429 +sg84 +g85 +sg86 +g87 +sS'subdir' +p430 +S'vlc-android' +p431 +sg90 +g20 +sS'forcevercode' +p432 +I01 +sg92 +g93 +sg192 +g193 +sg99 +I00 +sg100 +I00 +sS'commit' +p433 +S'0.9.7' +p434 +sg103 +g104 +sS'buildjni' +p435 +(lp436 +S'no' +p437 +asg108 +g109 +sg110 +Nsg111 +Nsg112 +g113 +sS'prebuild' +p438 +S"sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc" +p439 +sg116 +I00 +sg117 +Nsa(dp440 +g65 +I00 +sg66 +S'9704' +p441 +sg275 +I00 +sg69 +I00 +sg70 +I00 +sg71 +I00 +sg72 +g73 +sS'srclibs' +p442 +(lp443 +S'VLC-2.2@9e1c6ff' +p444 +asg76 +Nsg77 +g78 +sg79 +g20 +sg80 +S'0.9.7' +p445 +sS'build' +p446 +S'cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release' +p447 +sg84 +g85 +sg86 +g87 +sS'subdir' +p448 +S'vlc-android' +p449 +sg90 +g20 +sS'forcevercode' +p450 +I01 +sg92 +g93 +sg192 +g193 +sg99 +I00 +sg100 +I00 +sS'commit' +p451 +S'0.9.7' +p452 +sg103 +g104 +sS'buildjni' +p453 +(lp454 +S'no' +p455 +asg108 +g109 +sg110 +Nsg111 +Nsg112 +g113 +sS'prebuild' +p456 +S"sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc" +p457 +sg116 +I00 +sg117 +Nsa(dp458 +g65 +I00 +sg66 +S'9711' +p459 +sg275 +I00 +sg69 +I00 +sg70 +I00 +sg71 +I00 +sg72 +g73 +sS'srclibs' +p460 +(lp461 +S'VLC-2.2@57cd36b' +p462 +asg76 +Nsg77 +g78 +sg79 +g20 +sg80 +S'0.9.7.1' +p463 +sS'build' +p464 +S'cd ../ && ANDROID_ABI=mips ./compile.sh release' +p465 +sg84 +g85 +sg86 +g87 +sS'subdir' +p466 +S'vlc-android' +p467 +sg90 +g20 +sS'forcevercode' +p468 +I01 +sg92 +g93 +sg192 +g193 +sg99 +I00 +sS'disable' +p469 +S'build fails' +p470 +sS'commit' +p471 +S'0.9.7.1' +p472 +sg103 +g104 +sS'buildjni' +p473 +(lp474 +S'no' +p475 +asg108 +g109 +sg110 +Nsg111 +Nsg112 +g113 +sS'prebuild' +p476 +S"sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc" +p477 +sg116 +I00 +sg117 +Nsa(dp478 +g65 +I00 +sg66 +S'9712' +p479 +sg275 +I00 +sg69 +I00 +sg70 +I00 +sg71 +I00 +sg72 +g73 +sS'srclibs' +p480 +(lp481 +S'VLC-2.2@57cd36b' +p482 +asg76 +Nsg77 +g78 +sg79 +g20 +sg80 +S'0.9.7.1' +p483 +sS'build' +p484 +S'cd ../ && ANDROID_ABI=x86 ./compile.sh release' +p485 +sg84 +g85 +sg86 +g87 +sS'subdir' +p486 +S'vlc-android' +p487 +sg90 +g20 +sS'forcevercode' +p488 +I01 +sg92 +g93 +sg192 +g193 +sg99 +I00 +sg100 +I00 +sS'commit' +p489 +S'0.9.7.1' +p490 +sg103 +g104 +sS'buildjni' +p491 +(lp492 +S'no' +p493 +asg108 +g109 +sg110 +Nsg111 +Nsg112 +g113 +sS'prebuild' +p494 +S"sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc" +p495 +sg116 +I00 +sg117 +Nsa(dp496 +g65 +I00 +sg66 +S'9714' +p497 +sg275 +I00 +sg69 +I00 +sg70 +I00 +sg71 +I00 +sg72 +g73 +sS'srclibs' +p498 +(lp499 +S'VLC-2.2@57cd36b' +p500 +asg76 +Nsg77 +g78 +sg79 +g20 +sg80 +S'0.9.7.1' +p501 +sS'build' +p502 +S'cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release' +p503 +sg84 +g85 +sg86 +g87 +sS'subdir' +p504 +S'vlc-android' +p505 +sg90 +g20 +sS'forcevercode' +p506 +I01 +sg92 +g93 +sg192 +g193 +sg99 +I00 +sg100 +I00 +sS'commit' +p507 +S'0.9.7.1' +p508 +sg103 +g104 +sS'buildjni' +p509 +(lp510 +S'no' +p511 +asg108 +g109 +sg110 +Nsg111 +Nsg112 +g113 +sS'prebuild' +p512 +S"sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc" +p513 +sg116 +I00 +sg117 +Nsa(dp514 +g65 +I00 +sg66 +S'9802' +p515 +sg275 +I00 +sg69 +I00 +sg70 +I00 +sg71 +I00 +sg72 +g73 +sS'srclibs' +p516 +(lp517 +S'VLC-2.2@f2db364' +p518 +asg76 +Nsg77 +g78 +sg79 +g20 +sg80 +S'0.9.8' +p519 +sS'build' +p520 +S'cd ../ && ANDROID_ABI=x86 ./compile.sh release' +p521 +sg84 +g85 +sg86 +g87 +sS'subdir' +p522 +S'vlc-android' +p523 +sg90 +g20 +sS'forcevercode' +p524 +I01 +sg92 +g93 +sg192 +g193 +sg99 +I00 +sg100 +I00 +sS'commit' +p525 +S'0.9.8' +p526 +sg103 +g104 +sS'buildjni' +p527 +(lp528 +S'no' +p529 +asg108 +g109 +sg110 +Nsg111 +Nsg112 +g113 +sS'prebuild' +p530 +S"sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc" +p531 +sg116 +I00 +sg117 +Nsa(dp532 +g65 +I00 +sg66 +S'9803' +p533 +sg275 +I00 +sg69 +I00 +sg70 +I00 +sg71 +I00 +sg72 +g73 +sS'srclibs' +p534 +(lp535 +S'VLC-2.2@f2db364' +p536 +asg76 +Nsg77 +g78 +sg79 +g20 +sg80 +S'0.9.8' +p537 +sS'build' +p538 +S'cd ../ && ANDROID_ABI=armeabi ./compile.sh release' +p539 +sg84 +g85 +sg86 +g87 +sS'subdir' +p540 +S'vlc-android' +p541 +sg90 +g20 +sS'forcevercode' +p542 +I01 +sg92 +g93 +sg192 +g193 +sg99 +I00 +sg100 +I00 +sS'commit' +p543 +S'0.9.8' +p544 +sg103 +g104 +sS'buildjni' +p545 +(lp546 +S'no' +p547 +asg108 +g109 +sg110 +Nsg111 +Nsg112 +g113 +sS'prebuild' +p548 +S"sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc" +p549 +sg116 +I00 +sg117 +Nsa(dp550 +g65 +I00 +sg66 +S'9804' +p551 +sg275 +I00 +sg69 +I00 +sg70 +I00 +sg71 +I00 +sg72 +g73 +sS'srclibs' +p552 +(lp553 +S'VLC-2.2@f2db364' +p554 +asg76 +Nsg77 +g78 +sg79 +g20 +sg80 +S'0.9.8' +p555 +sS'build' +p556 +S'cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release' +p557 +sg84 +g85 +sg86 +g87 +sS'subdir' +p558 +S'vlc-android' +p559 +sg90 +g20 +sS'forcevercode' +p560 +I01 +sg92 +g93 +sg192 +g193 +sg99 +I00 +sg100 +I00 +sS'commit' +p561 +S'0.9.8' +p562 +sg103 +g104 +sS'buildjni' +p563 +(lp564 +S'no' +p565 +asg108 +g109 +sg110 +Nsg111 +Nsg112 +g113 +sS'prebuild' +p566 +S"sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc" +p567 +sg116 +I00 +sg117 +Nsa(dp568 +g65 +I00 +sg66 +S'9902' +p569 +sg275 +I00 +sg69 +I00 +sg70 +I00 +sg71 +I00 +sg72 +g73 +sS'srclibs' +p570 +(lp571 +S'VLC-2.2@e731dc23a4f8ef6782c7cc2236bbbf41c034dad1' +p572 +asg76 +Nsg77 +g78 +sg79 +g20 +sg80 +S'0.9.9' +p573 +sS'build' +p574 +S'cd ../ && ANDROID_ABI=x86 ./compile.sh release' +p575 +sg84 +g85 +sg86 +g87 +sS'subdir' +p576 +S'vlc-android' +p577 +sg90 +g20 +sS'forcevercode' +p578 +I01 +sg92 +g93 +sg192 +g193 +sg99 +I00 +sg100 +I00 +sS'commit' +p579 +S'0.9.9' +p580 +sg103 +g104 +sS'buildjni' +p581 +(lp582 +S'no' +p583 +asg108 +g109 +sg110 +Nsg111 +Nsg112 +g113 +sS'prebuild' +p584 +S"sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc" +p585 +sg116 +I00 +sg117 +Nsa(dp586 +g65 +I00 +sg66 +S'9903' +p587 +sg275 +I00 +sg69 +I00 +sg70 +I00 +sg71 +I00 +sg72 +g73 +sS'srclibs' +p588 +(lp589 +S'VLC-2.2@e731dc23a4f8ef6782c7cc2236bbbf41c034dad1' +p590 +asg76 +Nsg77 +g78 +sg79 +g20 +sg80 +S'0.9.9' +p591 +sS'build' +p592 +S'cd ../ && ANDROID_ABI=armeabi ./compile.sh release' +p593 +sg84 +g85 +sg86 +g87 +sS'subdir' +p594 +S'vlc-android' +p595 +sg90 +g20 +sS'forcevercode' +p596 +I01 +sg92 +g93 +sg192 +g193 +sg99 +I00 +sg100 +I00 +sS'commit' +p597 +S'0.9.9' +p598 +sg103 +g104 +sS'buildjni' +p599 +(lp600 +S'no' +p601 +asg108 +g109 +sg110 +Nsg111 +Nsg112 +g113 +sS'prebuild' +p602 +S"sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc" +p603 +sg116 +I00 +sg117 +Nsa(dp604 +g65 +I00 +sg66 +S'9904' +p605 +sg275 +I00 +sg69 +I00 +sg70 +I00 +sg71 +I00 +sg72 +g73 +sS'srclibs' +p606 +(lp607 +S'VLC-2.2@e731dc23a4f8ef6782c7cc2236bbbf41c034dad1' +p608 +asg76 +Nsg77 +g78 +sg79 +g20 +sg80 +S'0.9.9' +p609 +sS'build' +p610 +S'cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release' +p611 +sg84 +g85 +sg86 +g87 +sS'subdir' +p612 +S'vlc-android' +p613 +sg90 +g20 +sS'forcevercode' +p614 +I01 +sg92 +g93 +sg192 +g193 +sg99 +I00 +sg100 +I00 +sS'commit' +p615 +S'0.9.9' +p616 +sg103 +g104 +sS'buildjni' +p617 +(lp618 +S'no' +p619 +asg108 +g109 +sg110 +Nsg111 +Nsg112 +g113 +sS'prebuild' +p620 +S"sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc" +p621 +sg116 +I00 +sg117 +Nsa(dp622 +g65 +I00 +sg66 +S'10002' +p623 +sg275 +I00 +sg69 +I00 +sg70 +I00 +sg71 +I00 +sg72 +g73 +sS'srclibs' +p624 +(lp625 +S'VLC-2.2@e33e5de' +p626 +asg76 +Nsg77 +g78 +sg79 +g20 +sg80 +S'0.9.10' +p627 +sS'build' +p628 +S'cd ../ && ANDROID_ABI=x86 ./compile.sh release' +p629 +sg84 +g85 +sg86 +g87 +sS'subdir' +p630 +S'vlc-android' +p631 +sg90 +g20 +sS'forcevercode' +p632 +I01 +sg92 +g93 +sg192 +g193 +sg99 +I00 +sg100 +I00 +sS'commit' +p633 +S'0.9.10' +p634 +sg103 +g104 +sS'buildjni' +p635 +(lp636 +S'no' +p637 +asg108 +g109 +sg110 +Nsg111 +Nsg112 +g113 +sS'prebuild' +p638 +S"sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc" +p639 +sg116 +I00 +sg117 +Nsa(dp640 +g65 +I00 +sg66 +S'10003' +p641 +sg275 +I00 +sg69 +I00 +sg70 +I00 +sg71 +I00 +sg72 +g73 +sS'srclibs' +p642 +(lp643 +S'VLC-2.2@e33e5de' +p644 +asg76 +Nsg77 +g78 +sg79 +g20 +sg80 +S'0.9.10' +p645 +sS'build' +p646 +S'cd ../ && ANDROID_ABI=armeabi ./compile.sh release' +p647 +sg84 +g85 +sg86 +g87 +sS'subdir' +p648 +S'vlc-android' +p649 +sg90 +g20 +sS'forcevercode' +p650 +I01 +sg92 +g93 +sg192 +g193 +sg99 +I00 +sg100 +I00 +sS'commit' +p651 +S'0.9.10' +p652 +sg103 +g104 +sS'buildjni' +p653 +(lp654 +S'no' +p655 +asg108 +g109 +sg110 +Nsg111 +Nsg112 +g113 +sS'prebuild' +p656 +S"sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc" +p657 +sg116 +I00 +sg117 +Nsa(dp658 +g65 +I00 +sg66 +S'10004' +p659 +sg275 +I00 +sg69 +I00 +sg70 +I00 +sg71 +I00 +sg72 +g73 +sS'srclibs' +p660 +(lp661 +S'VLC-2.2@e33e5de' +p662 +asg76 +Nsg77 +g78 +sg79 +g20 +sg80 +S'0.9.10' +p663 +sS'build' +p664 +S'cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release' +p665 +sg84 +g85 +sg86 +g87 +sS'subdir' +p666 +S'vlc-android' +p667 +sg90 +g20 +sS'forcevercode' +p668 +I01 +sg92 +g93 +sg192 +g193 +sg99 +I00 +sg100 +I00 +sS'commit' +p669 +S'0.9.10' +p670 +sg103 +g104 +sS'buildjni' +p671 +(lp672 +S'no' +p673 +asg108 +g109 +sg110 +Nsg111 +Nsg112 +g113 +sS'prebuild' +p674 +S"sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc" +p675 +sg116 +I00 +sg117 +Nsa(dp676 +g65 +I00 +sg66 +S'10006' +p677 +sg275 +I00 +sg69 +I00 +sg70 +I00 +sg71 +I00 +sg72 +g73 +sS'srclibs' +p678 +(lp679 +S'VLC-2.2@036010e' +p680 +asg76 +Nsg77 +g78 +sg79 +g20 +sg80 +S'1.0.0' +p681 +sS'build' +p682 +S'cd ../ && ANDROID_ABI=x86 ./compile.sh release' +p683 +sg84 +g85 +sg86 +g87 +sS'subdir' +p684 +S'vlc-android' +p685 +sg90 +g20 +sS'forcevercode' +p686 +I01 +sg92 +g93 +sg192 +g193 +sg99 +I00 +sS'disable' +p687 +S"doesn't build" +p688 +sS'commit' +p689 +S'1.0.0' +p690 +sg103 +g104 +sS'buildjni' +p691 +(lp692 +S'no' +p693 +asg108 +g109 +sg110 +Nsg111 +Nsg112 +g113 +sS'prebuild' +p694 +S"sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc" +p695 +sg116 +I00 +sg117 +Nsa(dp696 +g65 +I00 +sg66 +S'10007' +p697 +sg275 +I00 +sg69 +I00 +sg70 +I00 +sg71 +I00 +sg72 +g73 +sS'srclibs' +p698 +(lp699 +S'VLC-2.2@036010e' +p700 +asg76 +Nsg77 +g78 +sg79 +g20 +sg80 +S'1.0.0' +p701 +sS'build' +p702 +S'cd ../ && ANDROID_ABI=armeabi ./compile.sh release' +p703 +sg84 +g85 +sg86 +g87 +sS'subdir' +p704 +S'vlc-android' +p705 +sg90 +g20 +sS'forcevercode' +p706 +I01 +sg92 +g93 +sg192 +g193 +sg99 +I00 +sS'disable' +p707 +S"doesn't build" +p708 +sS'commit' +p709 +S'1.0.0' +p710 +sg103 +g104 +sS'buildjni' +p711 +(lp712 +S'no' +p713 +asg108 +g109 +sg110 +Nsg111 +Nsg112 +g113 +sS'prebuild' +p714 +S"sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc" +p715 +sg116 +I00 +sg117 +Nsa(dp716 +g65 +I00 +sg66 +S'10008' +p717 +sg275 +I00 +sg69 +I00 +sg70 +I00 +sg71 +I00 +sg72 +g73 +sS'srclibs' +p718 +(lp719 +S'VLC-2.2@036010e' +p720 +asg76 +Nsg77 +g78 +sg79 +g20 +sg80 +S'1.0.0' +p721 +sS'build' +p722 +S'cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release' +p723 +sg84 +g85 +sg86 +g87 +sS'subdir' +p724 +S'vlc-android' +p725 +sg90 +g20 +sS'forcevercode' +p726 +I01 +sg92 +g93 +sg192 +g193 +sg99 +I00 +sS'disable' +p727 +S"doesn't build" +p728 +sS'commit' +p729 +S'1.0.0' +p730 +sg103 +g104 +sS'buildjni' +p731 +(lp732 +S'no' +p733 +asg108 +g109 +sg110 +Nsg111 +Nsg112 +g113 +sS'prebuild' +p734 +S"sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc" +p735 +sg116 +I00 +sg117 +Nsa(dp736 +g65 +I00 +sg66 +S'10102' +p737 +sg275 +I00 +sg69 +I00 +sg70 +I00 +sg71 +I00 +sg72 +g73 +sS'srclibs' +p738 +(lp739 +S'VLC-2.2@59409d5' +p740 +asg76 +Nsg77 +g78 +sg79 +g20 +sg80 +S'1.0.1' +p741 +sS'build' +p742 +S'cd ../ && ANDROID_ABI=x86 ./compile.sh release' +p743 +sg84 +g85 +sg86 +g87 +sS'subdir' +p744 +S'vlc-android' +p745 +sg90 +g20 +sS'forcevercode' +p746 +I01 +sg92 +g93 +sg192 +g193 +sg99 +I00 +sg100 +I00 +sS'commit' +p747 +S'1.0.1' +p748 +sg103 +g104 +sS'buildjni' +p749 +(lp750 +S'no' +p751 +asg108 +g109 +sg110 +Nsg111 +Nsg112 +g113 +sS'prebuild' +p752 +S"sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc" +p753 +sg116 +I00 +sg117 +Nsa(dp754 +g65 +I00 +sg66 +S'10103' +p755 +sg275 +I00 +sg69 +I00 +sg70 +I00 +sg71 +I00 +sg72 +g73 +sS'srclibs' +p756 +(lp757 +S'VLC-2.2@59409d5' +p758 +asg76 +Nsg77 +g78 +sg79 +g20 +sg80 +S'1.0.1' +p759 +sS'build' +p760 +S'cd ../ && ANDROID_ABI=armeabi ./compile.sh release' +p761 +sg84 +g85 +sg86 +g87 +sS'subdir' +p762 +S'vlc-android' +p763 +sg90 +g20 +sS'forcevercode' +p764 +I01 +sg92 +g93 +sg192 +g193 +sg99 +I00 +sg100 +I00 +sS'commit' +p765 +S'1.0.1' +p766 +sg103 +g104 +sS'buildjni' +p767 +(lp768 +S'no' +p769 +asg108 +g109 +sg110 +Nsg111 +Nsg112 +g113 +sS'prebuild' +p770 +S"sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc" +p771 +sg116 +I00 +sg117 +Nsa(dp772 +g65 +I00 +sg66 +S'10104' +p773 +sg275 +I00 +sg69 +I00 +sg70 +I00 +sg71 +I00 +sg72 +g73 +sS'srclibs' +p774 +(lp775 +S'VLC-2.2@59409d5' +p776 +asg76 +Nsg77 +g78 +sg79 +g20 +sg80 +S'1.0.1' +p777 +sS'build' +p778 +S'cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release' +p779 +sg84 +g85 +sg86 +g87 +sS'subdir' +p780 +S'vlc-android' +p781 +sg90 +g20 +sS'forcevercode' +p782 +I01 +sg92 +g93 +sg192 +g193 +sg99 +I00 +sg100 +I00 +sS'commit' +p783 +S'1.0.1' +p784 +sg103 +g104 +sS'buildjni' +p785 +(lp786 +S'no' +p787 +asg108 +g109 +sg110 +Nsg111 +Nsg112 +g113 +sS'prebuild' +p788 +S"sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc" +p789 +sg116 +I00 +sg117 +Nsa(dp790 +g65 +I00 +sg66 +S'1010303' +p791 +sg275 +I00 +sg69 +I00 +sg70 +I00 +sg112 +g113 +sg72 +g73 +sS'srclibs' +p792 +(lp793 +S'VLC@a9b19e4' +p794 +asg76 +Nsg77 +g78 +sg79 +g20 +sg80 +S'1.1.3' +p795 +sS'build' +p796 +S'cd ../ && ./compile.sh -a "armeabi" --release' +p797 +sg84 +g85 +sg86 +g71 +sS'subdir' +p798 +S'vlc-android' +p799 +sg90 +g20 +sS'forcevercode' +p800 +I00 +sg92 +g93 +sg192 +g193 +sg99 +I00 +sg100 +I00 +sS'commit' +p801 +S'1.1.3' +p802 +sg103 +g104 +sS'buildjni' +p803 +(lp804 +S'no' +p805 +asS'ndk' +p806 +S'r10d' +p807 +sg110 +Nsg111 +NsS'gradle' +p808 +(lp809 +S'VanillaARMv6fpu' +p810 +asS'prebuild' +p811 +S'sed -i -e \'/^TARGET/aexit 0\' -e \'s@\\-d \\"gradle\\/wrapper\\"@1@g\' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc' +p812 +sg116 +I00 +sg117 +Nsa(dp813 +g65 +I00 +sg66 +S'1010304' +p814 +sg275 +I00 +sg69 +I00 +sg70 +I00 +sg112 +g113 +sg72 +g73 +sS'srclibs' +p815 +(lp816 +S'VLC@a9b19e4' +p817 +asg76 +Nsg77 +g78 +sg79 +g20 +sg80 +S'1.1.3' +p818 +sS'build' +p819 +S'cd ../ && ./compile.sh -a "armeabi-v7a" --release' +p820 +sg84 +g85 +sg86 +g71 +sS'subdir' +p821 +S'vlc-android' +p822 +sg90 +g20 +sg800 +I00 +sg92 +g93 +sg192 +g193 +sg99 +I00 +sg100 +I00 +sS'commit' +p823 +S'1.1.3' +p824 +sg103 +g104 +sS'buildjni' +p825 +(lp826 +S'no' +p827 +asS'ndk' +p828 +S'r10d' +p829 +sg110 +Nsg111 +NsS'gradle' +p830 +(lp831 +S'VanillaARMv7' +p832 +asS'prebuild' +p833 +S'sed -i -e \'/^TARGET/aexit 0\' -e \'s@\\-d \\"gradle\\/wrapper\\"@1@g\' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc' +p834 +sg116 +I00 +sg117 +Nsa(dp835 +g65 +I00 +sg66 +S'1010305' +p836 +sg275 +I00 +sg69 +I00 +sg70 +I00 +sg112 +g113 +sg72 +g73 +sS'srclibs' +p837 +(lp838 +S'VLC@a9b19e4' +p839 +asg76 +Nsg77 +g78 +sg79 +g20 +sg80 +S'1.1.3' +p840 +sS'build' +p841 +S'cd ../ && ./compile.sh -a "x86" --release' +p842 +sg84 +g85 +sg86 +g71 +sS'subdir' +p843 +S'vlc-android' +p844 +sg90 +g20 +sg800 +I00 +sg92 +g93 +sg192 +g193 +sg99 +I00 +sg100 +I00 +sS'commit' +p845 +S'1.1.3' +p846 +sg103 +g104 +sS'buildjni' +p847 +(lp848 +S'no' +p849 +asS'ndk' +p850 +S'r10d' +p851 +sg110 +Nsg111 +NsS'gradle' +p852 +(lp853 +S'VanillaX86' +p854 +asS'prebuild' +p855 +S'sed -i -e \'/^TARGET/aexit 0\' -e \'s@\\-d \\"gradle\\/wrapper\\"@1@g\' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc' +p856 +sg116 +I00 +sg117 +Nsa(dp857 +g65 +I00 +sg66 +S'1010503' +p858 +sg275 +I00 +sg69 +I00 +sg70 +I00 +sg112 +g113 +sg72 +g73 +sS'srclibs' +p859 +(lp860 +S'VLC@e6b4585' +p861 +asg76 +Nsg77 +g78 +sg79 +g20 +sg80 +S'1.1.5' +p862 +sS'build' +p863 +S'cd ../ && ./compile.sh -a "armeabi" --release' +p864 +sg84 +g85 +sg86 +g71 +sS'subdir' +p865 +S'vlc-android' +p866 +sg90 +g20 +sg800 +I00 +sg92 +g93 +sg192 +g193 +sg99 +I00 +sg100 +I00 +sS'commit' +p867 +S'1.1.5' +p868 +sg103 +g104 +sS'buildjni' +p869 +(lp870 +S'no' +p871 +asS'ndk' +p872 +S'r10d' +p873 +sg110 +Nsg111 +NsS'gradle' +p874 +(lp875 +S'VanillaARMv6fpu' +p876 +asS'prebuild' +p877 +S'sed -i -e \'/^TARGET/aexit 0\' -e \'s@\\-d \\"gradle\\/wrapper\\"@1@g\' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc' +p878 +sg116 +I00 +sg117 +Nsa(dp879 +g65 +I00 +sg66 +S'1010504' +p880 +sg275 +I00 +sg69 +I00 +sg70 +I00 +sg112 +g113 +sg72 +g73 +sS'srclibs' +p881 +(lp882 +S'VLC@e6b4585' +p883 +asg76 +Nsg77 +g78 +sg79 +g20 +sg80 +S'1.1.5' +p884 +sS'build' +p885 +S'cd ../ && ./compile.sh -a "armeabi-v7a" --release' +p886 +sg84 +g85 +sg86 +g71 +sS'subdir' +p887 +S'vlc-android' +p888 +sg90 +g20 +sg800 +I00 +sg92 +g93 +sg192 +g193 +sg99 +I00 +sg100 +I00 +sS'commit' +p889 +S'1.1.5' +p890 +sg103 +g104 +sS'buildjni' +p891 +(lp892 +S'no' +p893 +asS'ndk' +p894 +S'r10d' +p895 +sg110 +Nsg111 +NsS'gradle' +p896 +(lp897 +S'VanillaARMv7' +p898 +asS'prebuild' +p899 +S'sed -i -e \'/^TARGET/aexit 0\' -e \'s@\\-d \\"gradle\\/wrapper\\"@1@g\' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc' +p900 +sg116 +I00 +sg117 +Nsa(dp901 +g65 +I00 +sg66 +S'1010505' +p902 +sg275 +I00 +sg69 +I00 +sg70 +I00 +sg112 +g113 +sg72 +g73 +sS'srclibs' +p903 +(lp904 +S'VLC@e6b4585' +p905 +asg76 +Nsg77 +g78 +sg79 +g20 +sg80 +S'1.1.5' +p906 +sS'build' +p907 +S'cd ../ && ./compile.sh -a "x86" --release' +p908 +sg84 +g85 +sg86 +g71 +sS'subdir' +p909 +S'vlc-android' +p910 +sg90 +g20 +sg800 +I00 +sg92 +g93 +sg192 +g193 +sg99 +I00 +sg100 +I00 +sS'commit' +p911 +S'1.1.5' +p912 +sg103 +g104 +sS'buildjni' +p913 +(lp914 +S'no' +p915 +asS'ndk' +p916 +S'r10d' +p917 +sg110 +Nsg111 +NsS'gradle' +p918 +(lp919 +S'VanillaX86' +p920 +asS'prebuild' +p921 +S'sed -i -e \'/^TARGET/aexit 0\' -e \'s@\\-d \\"gradle\\/wrapper\\"@1@g\' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc' +p922 +sg116 +I00 +sg117 +Nsa(dp923 +g65 +I00 +sg66 +S'1010603' +p924 +sg275 +I00 +sg69 +I00 +sg70 +I00 +sg112 +g113 +sg72 +g73 +sS'srclibs' +p925 +(lp926 +S'VLC@551b670' +p927 +asg76 +Nsg77 +g78 +sg79 +g20 +sg80 +S'1.1.6' +p928 +sS'build' +p929 +S'cd ../ && ./compile.sh -a "armeabi" --release' +p930 +sg84 +g85 +sg86 +g71 +sS'subdir' +p931 +S'vlc-android' +p932 +sg90 +g20 +sg800 +I00 +sg92 +g93 +sg192 +g193 +sg99 +I00 +sg100 +I00 +sS'commit' +p933 +S'1.1.6' +p934 +sg103 +g104 +sS'buildjni' +p935 +(lp936 +S'no' +p937 +asS'ndk' +p938 +S'r10d' +p939 +sg110 +Nsg111 +NsS'gradle' +p940 +(lp941 +S'VanillaARMv6fpu' +p942 +asS'prebuild' +p943 +S'sed -i -e \'/^TARGET/aexit 0\' -e \'s@\\-d \\"gradle\\/wrapper\\"@1@g\' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc' +p944 +sg116 +I00 +sg117 +Nsa(dp945 +g65 +I00 +sg66 +S'1010604' +p946 +sg275 +I00 +sg69 +I00 +sg70 +I00 +sg112 +g113 +sg72 +g73 +sS'srclibs' +p947 +(lp948 +S'VLC@551b670' +p949 +asg76 +Nsg77 +g78 +sg79 +g20 +sg80 +S'1.1.6' +p950 +sS'build' +p951 +S'cd ../ && ./compile.sh -a "armeabi-v7a" --release' +p952 +sg84 +g85 +sg86 +g71 +sS'subdir' +p953 +S'vlc-android' +p954 +sg90 +g20 +sg800 +I00 +sg92 +g93 +sg192 +g193 +sg99 +I00 +sg100 +I00 +sS'commit' +p955 +S'1.1.6' +p956 +sg103 +g104 +sS'buildjni' +p957 +(lp958 +S'no' +p959 +asS'ndk' +p960 +S'r10d' +p961 +sg110 +Nsg111 +NsS'gradle' +p962 +(lp963 +S'VanillaARMv7' +p964 +asS'prebuild' +p965 +S'sed -i -e \'/^TARGET/aexit 0\' -e \'s@\\-d \\"gradle\\/wrapper\\"@1@g\' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc' +p966 +sg116 +I00 +sg117 +Nsa(dp967 +g65 +I00 +sg66 +S'1010605' +p968 +sg275 +I00 +sg69 +I00 +sg70 +I00 +sg112 +g113 +sg72 +g73 +sS'srclibs' +p969 +(lp970 +S'VLC@551b670' +p971 +asg76 +Nsg77 +g78 +sg79 +g20 +sg80 +S'1.1.6' +p972 +sS'build' +p973 +S'cd ../ && ./compile.sh -a "x86" --release' +p974 +sg84 +g85 +sg86 +g71 +sS'subdir' +p975 +S'vlc-android' +p976 +sg90 +g20 +sg800 +I00 +sg92 +g93 +sg192 +g193 +sg99 +I00 +sg100 +I00 +sS'commit' +p977 +S'1.1.6' +p978 +sg103 +g104 +sS'buildjni' +p979 +(lp980 +S'no' +p981 +asS'ndk' +p982 +S'r10d' +p983 +sg110 +Nsg111 +NsS'gradle' +p984 +(lp985 +S'VanillaX86' +p986 +asS'prebuild' +p987 +S'sed -i -e \'/^TARGET/aexit 0\' -e \'s@\\-d \\"gradle\\/wrapper\\"@1@g\' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc' +p988 +sg116 +I00 +sg117 +Nsa(dp989 +g65 +I00 +sg66 +S'1020003' +p990 +sg275 +I00 +sg69 +I00 +sg70 +I00 +sg112 +g113 +sg72 +g73 +sS'srclibs' +p991 +(lp992 +S'VLC@23c8d86' +p993 +asg76 +Nsg77 +g78 +sg79 +g20 +sg80 +S'1.2.0' +p994 +sS'build' +p995 +S'cd ../ && ./compile.sh -a "armeabi" --release' +p996 +sg84 +g85 +sg86 +g71 +sS'subdir' +p997 +S'vlc-android' +p998 +sg90 +g20 +sg800 +I00 +sg92 +g93 +sg192 +g193 +sg99 +I00 +sg100 +I00 +sS'commit' +p999 +S'1.2.0' +p1000 +sg103 +g104 +sS'buildjni' +p1001 +(lp1002 +S'no' +p1003 +asS'ndk' +p1004 +S'r10d' +p1005 +sg110 +Nsg111 +NsS'gradle' +p1006 +(lp1007 +S'VanillaARMv6fpu' +p1008 +asS'prebuild' +p1009 +S'sed -i -e \'/^TARGET/aexit 0\' -e \'s@\\-d \\"gradle\\/wrapper\\"@1@g\' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc' +p1010 +sg116 +I00 +sg117 +Nsa(dp1011 +g65 +I00 +sg66 +S'1020004' +p1012 +sg275 +I00 +sg69 +I00 +sg70 +I00 +sg112 +g113 +sg72 +g73 +sS'srclibs' +p1013 +(lp1014 +S'VLC@23c8d86' +p1015 +asg76 +Nsg77 +g78 +sg79 +g20 +sg80 +S'1.2.0' +p1016 +sS'build' +p1017 +S'cd ../ && ./compile.sh -a "armeabi-v7a" --release' +p1018 +sg84 +g85 +sg86 +g71 +sS'subdir' +p1019 +S'vlc-android' +p1020 +sg90 +g20 +sg800 +I00 +sg92 +g93 +sg192 +g193 +sg99 +I00 +sg100 +I00 +sS'commit' +p1021 +S'1.2.0' +p1022 +sg103 +g104 +sS'buildjni' +p1023 +(lp1024 +S'no' +p1025 +asS'ndk' +p1026 +S'r10d' +p1027 +sg110 +Nsg111 +NsS'gradle' +p1028 +(lp1029 +S'VanillaARMv7' +p1030 +asS'prebuild' +p1031 +S'sed -i -e \'/^TARGET/aexit 0\' -e \'s@\\-d \\"gradle\\/wrapper\\"@1@g\' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc' +p1032 +sg116 +I00 +sg117 +Nsa(dp1033 +g65 +I00 +sg66 +S'1020005' +p1034 +sg275 +I00 +sg69 +I00 +sg70 +I00 +sg112 +g113 +sg72 +g73 +sS'srclibs' +p1035 +(lp1036 +S'VLC@23c8d86' +p1037 +asg76 +Nsg77 +g78 +sg79 +g20 +sg80 +S'1.2.0' +p1038 +sS'build' +p1039 +S'cd ../ && ./compile.sh -a "x86" --release' +p1040 +sg84 +g85 +sg86 +g71 +sS'subdir' +p1041 +S'vlc-android' +p1042 +sg90 +g20 +sg800 +I00 +sg92 +g93 +sg192 +g193 +sg99 +I00 +sg100 +I00 +sS'commit' +p1043 +S'1.2.0' +p1044 +sg103 +g104 +sS'buildjni' +p1045 +(lp1046 +S'no' +p1047 +asS'ndk' +p1048 +S'r10d' +p1049 +sg110 +Nsg111 +NsS'gradle' +p1050 +(lp1051 +S'VanillaX86' +p1052 +asS'prebuild' +p1053 +S'sed -i -e \'/^TARGET/aexit 0\' -e \'s@\\-d \\"gradle\\/wrapper\\"@1@g\' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc' +p1054 +sg116 +I00 +sg117 +Nsa(dp1055 +g65 +I00 +sg66 +S'1020103' +p1056 +sg275 +I00 +sg69 +I00 +sg70 +I00 +sg112 +g113 +sg72 +g73 +sS'srclibs' +p1057 +(lp1058 +S'VLC@23c8d86' +p1059 +asg76 +Nsg77 +g78 +sg79 +g20 +sg80 +S'1.2.1' +p1060 +sS'build' +p1061 +S'cd ../ && ./compile.sh -a "armeabi" --release' +p1062 +sg84 +g85 +sg86 +g71 +sS'subdir' +p1063 +S'vlc-android' +p1064 +sg90 +g20 +sg800 +I00 +sg92 +g93 +sg192 +g193 +sg99 +I00 +sg100 +I00 +sS'commit' +p1065 +S'1.2.1' +p1066 +sg103 +g104 +sS'buildjni' +p1067 +(lp1068 +S'no' +p1069 +asS'ndk' +p1070 +S'r10d' +p1071 +sg110 +Nsg111 +NsS'gradle' +p1072 +(lp1073 +S'VanillaARMv6fpu' +p1074 +asS'prebuild' +p1075 +S'sed -i -e \'/^TARGET/aexit 0\' -e \'s@\\-d \\"gradle\\/wrapper\\"@1@g\' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc' +p1076 +sg116 +I00 +sg117 +Nsa(dp1077 +g65 +I00 +sg66 +S'1020104' +p1078 +sg275 +I00 +sg69 +I00 +sg70 +I00 +sg112 +g113 +sg72 +g73 +sS'srclibs' +p1079 +(lp1080 +S'VLC@23c8d86' +p1081 +asg76 +Nsg77 +g78 +sg79 +g20 +sg80 +S'1.2.1' +p1082 +sS'build' +p1083 +S'cd ../ && ./compile.sh -a "armeabi-v7a" --release' +p1084 +sg84 +g85 +sg86 +g71 +sS'subdir' +p1085 +S'vlc-android' +p1086 +sg90 +g20 +sg800 +I00 +sg92 +g93 +sg192 +g193 +sg99 +I00 +sg100 +I00 +sS'commit' +p1087 +S'1.2.1' +p1088 +sg103 +g104 +sS'buildjni' +p1089 +(lp1090 +S'no' +p1091 +asS'ndk' +p1092 +S'r10d' +p1093 +sg110 +Nsg111 +NsS'gradle' +p1094 +(lp1095 +S'VanillaARMv7' +p1096 +asS'prebuild' +p1097 +S'sed -i -e \'/^TARGET/aexit 0\' -e \'s@\\-d \\"gradle\\/wrapper\\"@1@g\' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc' +p1098 +sg116 +I00 +sg117 +Nsa(dp1099 +g65 +I00 +sg66 +S'1020105' +p1100 +sg275 +I00 +sg69 +I00 +sg70 +I00 +sg112 +g113 +sg72 +g73 +sS'srclibs' +p1101 +(lp1102 +S'VLC@23c8d86' +p1103 +asg76 +Nsg77 +g78 +sg79 +g20 +sg80 +S'1.2.1' +p1104 +sS'build' +p1105 +S'cd ../ && ./compile.sh -a "x86" --release' +p1106 +sg84 +g85 +sg86 +g71 +sS'subdir' +p1107 +S'vlc-android' +p1108 +sg90 +g20 +sg800 +I00 +sg92 +g93 +sg192 +g193 +sg99 +I00 +sg100 +I00 +sS'commit' +p1109 +S'1.2.1' +p1110 +sg103 +g104 +sS'buildjni' +p1111 +(lp1112 +S'no' +p1113 +asS'ndk' +p1114 +S'r10d' +p1115 +sg110 +Nsg111 +NsS'gradle' +p1116 +(lp1117 +S'VanillaX86' +p1118 +asS'prebuild' +p1119 +S'sed -i -e \'/^TARGET/aexit 0\' -e \'s@\\-d \\"gradle\\/wrapper\\"@1@g\' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc' +p1120 +sg116 +I00 +sg117 +Nsa(dp1121 +g65 +I00 +sg66 +S'1020203' +p1122 +sg275 +I00 +sg69 +I00 +sg70 +I00 +sg112 +g113 +sg72 +g73 +sS'srclibs' +p1123 +(lp1124 +S'VLC@7491a5f' +p1125 +asg76 +Nsg77 +g78 +sg79 +g20 +sg80 +S'1.2.2' +p1126 +sS'build' +p1127 +S'cd ../ && ./compile.sh -a "armeabi" --release' +p1128 +sg84 +g85 +sg86 +g71 +sS'subdir' +p1129 +S'vlc-android' +p1130 +sg90 +g20 +sg800 +I00 +sg92 +g93 +sg192 +g193 +sg99 +I00 +sg100 +I00 +sS'commit' +p1131 +S'1.2.2' +p1132 +sg103 +g104 +sS'buildjni' +p1133 +(lp1134 +S'no' +p1135 +asS'ndk' +p1136 +S'r10d' +p1137 +sg110 +Nsg111 +NsS'gradle' +p1138 +(lp1139 +S'VanillaARMv6fpu' +p1140 +asS'prebuild' +p1141 +S'sed -i -e \'/^TARGET/aexit 0\' -e \'s@\\-d \\"gradle\\/wrapper\\"@1@g\' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc' +p1142 +sg116 +I00 +sg117 +Nsa(dp1143 +g65 +I00 +sg66 +S'1020204' +p1144 +sg275 +I00 +sg69 +I00 +sg70 +I00 +sg112 +g113 +sg72 +g73 +sS'srclibs' +p1145 +(lp1146 +S'VLC@7491a5f' +p1147 +asg76 +Nsg77 +g78 +sg79 +g20 +sg80 +S'1.2.2' +p1148 +sS'build' +p1149 +S'cd ../ && ./compile.sh -a "armeabi-v7a" --release' +p1150 +sg84 +g85 +sg86 +g71 +sS'subdir' +p1151 +S'vlc-android' +p1152 +sg90 +g20 +sg800 +I00 +sg92 +g93 +sg192 +g193 +sg99 +I00 +sg100 +I00 +sS'commit' +p1153 +S'1.2.2' +p1154 +sg103 +g104 +sS'buildjni' +p1155 +(lp1156 +S'no' +p1157 +asS'ndk' +p1158 +S'r10d' +p1159 +sg110 +Nsg111 +NsS'gradle' +p1160 +(lp1161 +S'VanillaARMv7' +p1162 +asS'prebuild' +p1163 +S'sed -i -e \'/^TARGET/aexit 0\' -e \'s@\\-d \\"gradle\\/wrapper\\"@1@g\' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc' +p1164 +sg116 +I00 +sg117 +Nsa(dp1165 +g65 +I00 +sg66 +S'1020205' +p1166 +sg275 +I00 +sg69 +I00 +sg70 +I00 +sg112 +g113 +sg72 +g73 +sS'srclibs' +p1167 +(lp1168 +S'VLC@7491a5f' +p1169 +asg76 +Nsg77 +g78 +sg79 +g20 +sg80 +S'1.2.2' +p1170 +sS'build' +p1171 +S'cd ../ && ./compile.sh -a "x86" --release' +p1172 +sg84 +g85 +sg86 +g71 +sS'subdir' +p1173 +S'vlc-android' +p1174 +sg90 +g20 +sg800 +I00 +sg92 +g93 +sg192 +g193 +sg99 +I00 +sg100 +I00 +sS'commit' +p1175 +S'1.2.2' +p1176 +sg103 +g104 +sS'buildjni' +p1177 +(lp1178 +S'no' +p1179 +asS'ndk' +p1180 +S'r10d' +p1181 +sg110 +Nsg111 +NsS'gradle' +p1182 +(lp1183 +S'VanillaX86' +p1184 +asS'prebuild' +p1185 +S'sed -i -e \'/^TARGET/aexit 0\' -e \'s@\\-d \\"gradle\\/wrapper\\"@1@g\' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc' +p1186 +sg116 +I00 +sg117 +Nsa(dp1187 +g65 +I00 +sg66 +S'1020303' +p1188 +sg275 +I00 +sg69 +I00 +sg70 +I00 +sg112 +g113 +sg72 +g73 +sS'srclibs' +p1189 +(lp1190 +S'VLC@7491a5f' +p1191 +asg76 +Nsg77 +g78 +sg79 +g20 +sg80 +S'1.2.3' +p1192 +sS'build' +p1193 +S'cd ../ && ./compile.sh -a "armeabi" --release' +p1194 +sg84 +g85 +sg86 +g71 +sS'subdir' +p1195 +S'vlc-android' +p1196 +sg90 +g20 +sg800 +I00 +sg92 +g93 +sg192 +g193 +sg99 +I00 +sg100 +I00 +sS'commit' +p1197 +S'1.2.3' +p1198 +sg103 +g104 +sS'buildjni' +p1199 +(lp1200 +S'no' +p1201 +asS'ndk' +p1202 +S'r10d' +p1203 +sg110 +Nsg111 +NsS'gradle' +p1204 +(lp1205 +S'VanillaARMv6fpu' +p1206 +asS'prebuild' +p1207 +S'sed -i -e \'/^TARGET/aexit 0\' -e \'s@\\-d \\"gradle\\/wrapper\\"@1@g\' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc' +p1208 +sg116 +I00 +sg117 +Nsa(dp1209 +g65 +I00 +sg66 +S'1020304' +p1210 +sg275 +I00 +sg69 +I00 +sg70 +I00 +sg112 +g113 +sg72 +g73 +sS'srclibs' +p1211 +(lp1212 +S'VLC@7491a5f' +p1213 +asg76 +Nsg77 +g78 +sg79 +g20 +sg80 +S'1.2.3' +p1214 +sS'build' +p1215 +S'cd ../ && ./compile.sh -a "armeabi-v7a" --release' +p1216 +sg84 +g85 +sg86 +g71 +sS'subdir' +p1217 +S'vlc-android' +p1218 +sg90 +g20 +sg800 +I00 +sg92 +g93 +sg192 +g193 +sg99 +I00 +sg100 +I00 +sS'commit' +p1219 +S'1.2.3' +p1220 +sg103 +g104 +sS'buildjni' +p1221 +(lp1222 +S'no' +p1223 +asS'ndk' +p1224 +S'r10d' +p1225 +sg110 +Nsg111 +NsS'gradle' +p1226 +(lp1227 +S'VanillaARMv7' +p1228 +asS'prebuild' +p1229 +S'sed -i -e \'/^TARGET/aexit 0\' -e \'s@\\-d \\"gradle\\/wrapper\\"@1@g\' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc' +p1230 +sg116 +I00 +sg117 +Nsa(dp1231 +g65 +I00 +sg66 +S'1020305' +p1232 +sg275 +I00 +sg69 +I00 +sg70 +I00 +sg112 +g113 +sg72 +g73 +sS'srclibs' +p1233 +(lp1234 +S'VLC@7491a5f' +p1235 +asg76 +Nsg77 +g78 +sg79 +g20 +sg80 +S'1.2.3' +p1236 +sS'build' +p1237 +S'cd ../ && ./compile.sh -a "x86" --release' +p1238 +sg84 +g85 +sg86 +g71 +sS'subdir' +p1239 +S'vlc-android' +p1240 +sg90 +g20 +sg800 +I00 +sg92 +g93 +sg192 +g193 +sg99 +I00 +sg100 +I00 +sS'commit' +p1241 +S'1.2.3' +p1242 +sg103 +g104 +sS'buildjni' +p1243 +(lp1244 +S'no' +p1245 +asS'ndk' +p1246 +S'r10d' +p1247 +sg110 +Nsg111 +NsS'gradle' +p1248 +(lp1249 +S'VanillaX86' +p1250 +asS'prebuild' +p1251 +S'sed -i -e \'/^TARGET/aexit 0\' -e \'s@\\-d \\"gradle\\/wrapper\\"@1@g\' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc' +p1252 +sg116 +I00 +sg117 +Nsa(dp1253 +g65 +I00 +sg66 +S'1020403' +p1254 +sg275 +I00 +sg69 +I00 +sg70 +I00 +sg112 +g113 +sg72 +g73 +sS'srclibs' +p1255 +(lp1256 +S'VLC@7491a5f' +p1257 +asg76 +Nsg77 +g78 +sg79 +g20 +sg80 +S'1.2.4' +p1258 +sS'build' +p1259 +S'cd ../ && ./compile.sh -a "armeabi" --release' +p1260 +sg84 +g85 +sg86 +g71 +sS'subdir' +p1261 +S'vlc-android' +p1262 +sg90 +g20 +sg800 +I00 +sg92 +g93 +sg192 +g193 +sg99 +I00 +sg100 +I00 +sS'commit' +p1263 +S'1.2.4' +p1264 +sg103 +g104 +sS'buildjni' +p1265 +(lp1266 +S'no' +p1267 +asS'ndk' +p1268 +S'r10d' +p1269 +sg110 +Nsg111 +NsS'gradle' +p1270 +(lp1271 +S'VanillaARMv6fpu' +p1272 +asS'prebuild' +p1273 +S'sed -i -e \'/^TARGET/aexit 0\' -e \'s@\\-d \\"gradle\\/wrapper\\"@1@g\' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc' +p1274 +sg116 +I00 +sg117 +Nsa(dp1275 +g65 +I00 +sg66 +S'1020404' +p1276 +sg275 +I00 +sg69 +I00 +sg70 +I00 +sg112 +g113 +sg72 +g73 +sS'srclibs' +p1277 +(lp1278 +S'VLC@7491a5f' +p1279 +asg76 +Nsg77 +g78 +sg79 +g20 +sg80 +S'1.2.4' +p1280 +sS'build' +p1281 +S'cd ../ && ./compile.sh -a "armeabi-v7a" --release' +p1282 +sg84 +g85 +sg86 +g71 +sS'subdir' +p1283 +S'vlc-android' +p1284 +sg90 +g20 +sg800 +I00 +sg92 +g93 +sg192 +g193 +sg99 +I00 +sg100 +I00 +sS'commit' +p1285 +S'1.2.4' +p1286 +sg103 +g104 +sS'buildjni' +p1287 +(lp1288 +S'no' +p1289 +asS'ndk' +p1290 +S'r10d' +p1291 +sg110 +Nsg111 +NsS'gradle' +p1292 +(lp1293 +S'VanillaARMv7' +p1294 +asS'prebuild' +p1295 +S'sed -i -e \'/^TARGET/aexit 0\' -e \'s@\\-d \\"gradle\\/wrapper\\"@1@g\' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc' +p1296 +sg116 +I00 +sg117 +Nsa(dp1297 +g65 +I00 +sg66 +S'1020405' +p1298 +sg275 +I00 +sg69 +I00 +sg70 +I00 +sg112 +g113 +sg72 +g73 +sS'srclibs' +p1299 +(lp1300 +S'VLC@7491a5f' +p1301 +asg76 +Nsg77 +g78 +sg79 +g20 +sg80 +S'1.2.4' +p1302 +sS'build' +p1303 +S'cd ../ && ./compile.sh -a "x86" --release' +p1304 +sg84 +g85 +sg86 +g71 +sS'subdir' +p1305 +S'vlc-android' +p1306 +sg90 +g20 +sg800 +I00 +sg92 +g93 +sg192 +g193 +sg99 +I00 +sg100 +I00 +sS'commit' +p1307 +S'1.2.4' +p1308 +sg103 +g104 +sS'buildjni' +p1309 +(lp1310 +S'no' +p1311 +asS'ndk' +p1312 +S'r10d' +p1313 +sg110 +Nsg111 +NsS'gradle' +p1314 +(lp1315 +S'VanillaX86' +p1316 +asS'prebuild' +p1317 +S'sed -i -e \'/^TARGET/aexit 0\' -e \'s@\\-d \\"gradle\\/wrapper\\"@1@g\' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc' +p1318 +sg116 +I00 +sg117 +Nsa(dp1319 +g65 +I00 +sg66 +S'1020503' +p1320 +sg275 +I00 +sg69 +I00 +sg70 +I00 +sg112 +g113 +sg72 +g73 +sS'srclibs' +p1321 +(lp1322 +S'VLC@50accb8' +p1323 +asg76 +Nsg77 +g78 +sg79 +g20 +sg80 +S'1.2.5' +p1324 +sS'build' +p1325 +S'cd ../ && ./compile.sh -a "armeabi" --release' +p1326 +sg84 +g85 +sg86 +g71 +sS'subdir' +p1327 +S'vlc-android' +p1328 +sg90 +g20 +sg800 +I00 +sg92 +g93 +sg192 +g193 +sg99 +I00 +sg100 +I00 +sS'commit' +p1329 +S'1.2.5' +p1330 +sg103 +g104 +sS'buildjni' +p1331 +(lp1332 +S'no' +p1333 +asS'ndk' +p1334 +S'r10d' +p1335 +sg110 +Nsg111 +NsS'gradle' +p1336 +(lp1337 +S'VanillaARMv6fpu' +p1338 +asS'prebuild' +p1339 +S'sed -i -e \'/^TARGET/aexit 0\' -e \'s@\\-d \\"gradle\\/wrapper\\"@1@g\' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc' +p1340 +sg116 +I00 +sg117 +Nsa(dp1341 +g65 +I00 +sg66 +S'1020504' +p1342 +sg275 +I00 +sg69 +I00 +sg70 +I00 +sg112 +g113 +sg72 +g73 +sS'srclibs' +p1343 +(lp1344 +S'VLC@50accb8' +p1345 +asg76 +Nsg77 +g78 +sg79 +g20 +sg80 +S'1.2.5' +p1346 +sS'build' +p1347 +S'cd ../ && ./compile.sh -a "armeabi-v7a" --release' +p1348 +sg84 +g85 +sg86 +g71 +sS'subdir' +p1349 +S'vlc-android' +p1350 +sg90 +g20 +sg800 +I00 +sg92 +g93 +sg192 +g193 +sg99 +I00 +sg100 +I00 +sS'commit' +p1351 +S'1.2.5' +p1352 +sg103 +g104 +sS'buildjni' +p1353 +(lp1354 +S'no' +p1355 +asS'ndk' +p1356 +S'r10d' +p1357 +sg110 +Nsg111 +NsS'gradle' +p1358 +(lp1359 +S'VanillaARMv7' +p1360 +asS'prebuild' +p1361 +S'sed -i -e \'/^TARGET/aexit 0\' -e \'s@\\-d \\"gradle\\/wrapper\\"@1@g\' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc' +p1362 +sg116 +I00 +sg117 +Nsa(dp1363 +g65 +I00 +sg66 +S'1020505' +p1364 +sg275 +I00 +sg69 +I00 +sg70 +I00 +sg112 +g113 +sg72 +g73 +sS'srclibs' +p1365 +(lp1366 +S'VLC@50accb8' +p1367 +asg76 +Nsg77 +g78 +sg79 +g20 +sg80 +S'1.2.5' +p1368 +sS'build' +p1369 +S'cd ../ && ./compile.sh -a "x86" --release' +p1370 +sg84 +g85 +sg86 +g71 +sS'subdir' +p1371 +S'vlc-android' +p1372 +sg90 +g20 +sg800 +I00 +sg92 +g93 +sg192 +g193 +sg99 +I00 +sg100 +I00 +sS'commit' +p1373 +S'1.2.5' +p1374 +sg103 +g104 +sS'buildjni' +p1375 +(lp1376 +S'no' +p1377 +asS'ndk' +p1378 +S'r10d' +p1379 +sg110 +Nsg111 +NsS'gradle' +p1380 +(lp1381 +S'VanillaX86' +p1382 +asS'prebuild' +p1383 +S'sed -i -e \'/^TARGET/aexit 0\' -e \'s@\\-d \\"gradle\\/wrapper\\"@1@g\' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc' +p1384 +sg116 +I00 +sg117 +Nsa(dp1385 +g65 +I00 +sg66 +S'1030003' +p1386 +sg275 +I00 +sg69 +I00 +sg70 +I00 +sg112 +g113 +sg72 +g73 +sS'srclibs' +p1387 +(lp1388 +S'VLC@d59b81a' +p1389 +asg76 +Nsg77 +g78 +sg79 +g20 +sg80 +S'1.2.6' +p1390 +sS'build' +p1391 +S'cd ../ && ./compile.sh -a "armeabi" --release' +p1392 +sg84 +g85 +sg86 +g71 +sS'subdir' +p1393 +S'vlc-android' +p1394 +sg90 +g20 +sg800 +I00 +sg92 +g93 +sg192 +g193 +sg99 +I00 +sg100 +I00 +sS'commit' +p1395 +S'1.2.6' +p1396 +sg103 +g104 +sS'buildjni' +p1397 +(lp1398 +S'no' +p1399 +asS'ndk' +p1400 +S'r10d' +p1401 +sg110 +Nsg111 +NsS'gradle' +p1402 +(lp1403 +S'VanillaARMv6fpu' +p1404 +asS'prebuild' +p1405 +S'sed -i -e \'/^TARGET/aexit 0\' -e \'s@\\-d \\"gradle\\/wrapper\\"@1@g\' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc' +p1406 +sg116 +I00 +sg117 +Nsa(dp1407 +g65 +I00 +sg66 +S'1030004' +p1408 +sg275 +I00 +sg69 +I00 +sg70 +I00 +sg112 +g113 +sg72 +g73 +sS'srclibs' +p1409 +(lp1410 +S'VLC@d59b81a' +p1411 +asg76 +Nsg77 +g78 +sg79 +g20 +sg80 +S'1.2.6' +p1412 +sS'build' +p1413 +S'cd ../ && ./compile.sh -a "armeabi-v7a" --release' +p1414 +sg84 +g85 +sg86 +g71 +sS'subdir' +p1415 +S'vlc-android' +p1416 +sg90 +g20 +sg800 +I00 +sg92 +g93 +sg192 +g193 +sg99 +I00 +sg100 +I00 +sS'commit' +p1417 +S'1.2.6' +p1418 +sg103 +g104 +sS'buildjni' +p1419 +(lp1420 +S'no' +p1421 +asS'ndk' +p1422 +S'r10d' +p1423 +sg110 +Nsg111 +NsS'gradle' +p1424 +(lp1425 +S'VanillaARMv7' +p1426 +asS'prebuild' +p1427 +S'sed -i -e \'/^TARGET/aexit 0\' -e \'s@\\-d \\"gradle\\/wrapper\\"@1@g\' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc' +p1428 +sg116 +I00 +sg117 +Nsa(dp1429 +g65 +I00 +sg66 +S'1030005' +p1430 +sg275 +I00 +sg69 +I00 +sg70 +I00 +sg112 +g113 +sg72 +g73 +sS'srclibs' +p1431 +(lp1432 +S'VLC@d59b81a' +p1433 +asg76 +Nsg77 +g78 +sg79 +g20 +sg80 +S'1.2.6' +p1434 +sS'build' +p1435 +S'cd ../ && ./compile.sh -a "x86" --release' +p1436 +sg84 +g85 +sg86 +g71 +sS'subdir' +p1437 +S'vlc-android' +p1438 +sg90 +g20 +sg800 +I00 +sg92 +g93 +sg192 +g193 +sg99 +I00 +sg100 +I00 +sS'commit' +p1439 +S'1.2.6' +p1440 +sg103 +g104 +sS'buildjni' +p1441 +(lp1442 +S'no' +p1443 +asS'ndk' +p1444 +S'r10d' +p1445 +sg110 +Nsg111 +NsS'gradle' +p1446 +(lp1447 +S'VanillaX86' +p1448 +asS'prebuild' +p1449 +S'sed -i -e \'/^TARGET/aexit 0\' -e \'s@\\-d \\"gradle\\/wrapper\\"@1@g\' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc' +p1450 +sg116 +I00 +sg117 +NsasS'FlattrID' +p1451 +NsS'Disabled' +p1452 +NsS'Update Check Name' +p1453 +NsS'Vercode Operation' +p1454 +S'%c + 5' +p1455 +sS'Current Version' +p1456 +S'1.2.6' +p1457 +s. diff --git a/tests/metadata/org.videolan.vlc.yaml b/tests/metadata/org.videolan.vlc.yaml new file mode 100644 index 00000000..67983880 --- /dev/null +++ b/tests/metadata/org.videolan.vlc.yaml @@ -0,0 +1,911 @@ +Categories: + - Multimedia +License: GPLv3 +Web Site: http://www.videolan.org/vlc/download-android.html +Source Code: http://git.videolan.org/?p=vlc-ports/android.git;a=summary +Issue Tracker: "http://www.videolan.org/support/index.html#bugs" +Donate: "http://www.videolan.org/contribute.html#money" + +Auto Name: VLC +Summary: Media player +Description: | + Video and audio player that supports a wide range of formats, + for both local and remote playback. + + [http://git.videolan.org/?p=vlc-ports/android.git;a=blob_plain;f=NEWS NEWS] + +Repo Type: git +Repo: git://git.videolan.org/vlc-ports/android.git + +builds: + - versionName: 0.0.11-ARMv7 + versionCode: 110 + commit: 0.0.11 + subdir: vlc-android + forceversion: yes + forcevercode: yes + prebuild: sed -i '48d' ../Makefile + update: + - . + - ../java-libs/SlidingMenu + - ../java-libs/ActionBarSherlock + build: cd ../ && \ + ANDROID_ABI=armeabi-v7a ./compile.sh release + buildjni: no + + - versionName: 0.0.11-ARM + versionCode: 111 + commit: 0.0.11 + subdir: vlc-android + forceversion: yes + forcevercode: yes + prebuild: sed -i '48d' ../Makefile + update: + - . + - ../java-libs/SlidingMenu + - ../java-libs/ActionBarSherlock + build: | + cd ../ && \ + ANDROID_ABI=armeabi ./compile.sh release + buildjni: no + + - versionName: 0.0.11-x86 + versionCode: 112 + disable: ffmpeg error 0.0.11 + commit: unknown - see disabled + subdir: vlc-android + forceversion: yes + forcevercode: yes + prebuild: sed -i '48d' ../Makefile + update: + - . + - ../java-libs/SlidingMenu + - ../java-libs/ActionBarSherlock + build: | + cd ../ && \ + ANDROID_ABI=x86 ./compile.sh release + buildjni: no + + - versionName: 0.0.11-mips + versionCode: 113 + commit: 0.0.11 + subdir: vlc-android + forceversion: yes + forcevercode: yes + prebuild: sed -i '48d' ../Makefile + update: + - . + - ../java-libs/SlidingMenu + - ../java-libs/ActionBarSherlock + build: > + cd ../ && \ + ANDROID_ABI=mips ./compile.sh release + buildjni: no + + - versionName: 0.1.3-MIPS + versionCode: 1301 + disable: build failing (at 0.1.3) + commit: 0.1.3 + subdir: vlc-android + patch: ndkr9.patch + 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 + buildjni: no + + - versionName: 0.1.3-x86 + versionCode: 1302 + commit: 0.1.3 + subdir: vlc-android + patch: ndkr9.patch + srclibs: VLC@7c52aacbe + forceversion: yes + forcevercode: yes + prebuild: sed -i '/ant/d' ../Makefile && \ + ln -s vlc-android/$$VLC$$ ../vlc + build: cd ../ && \ + ANDROID_ABI=x86 ./compile.sh release + buildjni: no + + - versionName: 0.1.3-ARM + versionCode: 1303 + commit: 0.1.3 + subdir: vlc-android + patch: ndkr9.patch + srclibs: VLC@7c52aacbe + forceversion: yes + forcevercode: yes + prebuild: sed -i '/ant/d' ../Makefile && \ + ln -s vlc-android/$$VLC$$ ../vlc + build: cd ../ && \ + ANDROID_ABI=armeabi ./compile.sh release + buildjni: no + + - versionName: 0.1.3-ARMv7 + versionCode: 1304 + commit: 0.1.3 + subdir: vlc-android + patch: ndkr9.patch + srclibs: VLC@7c52aacbe + forceversion: yes + forcevercode: yes + prebuild: sed -i '/ant/d' ../Makefile && \ + ln -s vlc-android/$$VLC$$ ../vlc + build: cd ../ && \ + ANDROID_ABI=armeabi-v7a ./compile.sh release + buildjni: no + + - versionName: 0.9.0 + versionCode: 9002 + commit: 0.9.0 + subdir: vlc-android + srclibs: VLC@31ffb20309264994 + forcevercode: yes + prebuild: sed -i '/ant/d' ../Makefile && \ + ln -s vlc-android/$$VLC$$ ../vlc + build: cd ../ && \ + ANDROID_ABI=x86 ./compile.sh release + buildjni: no + + - versionName: 0.9.0 + versionCode: 9004 + commit: 0.9.0 + subdir: vlc-android + srclibs: VLC@31ffb20309264994 + forcevercode: yes + prebuild: sed -i '/ant/d' ../Makefile && \ + ln -s vlc-android/$$VLC$$ ../vlc + build: cd ../ && \ + ANDROID_ABI=armeabi-v7a ./compile.sh release + buildjni: no + + - versionName: 0.9.1 + versionCode: 9102 + commit: 0.9.1 + subdir: vlc-android + srclibs: VLC@37e886d113b8b567c15208579fb2f + forcevercode: yes + prebuild: sed -i '/ant/d' ../Makefile && \ + ln -s vlc-android/$$VLC$$ ../vlc + build: cd ../ && \ + ANDROID_ABI=x86 ./compile.sh release + buildjni: no + + - versionName: 0.9.1 + versionCode: 9104 + commit: 0.9.1 + subdir: vlc-android + srclibs: VLC@37e886d113b8b567c15208579fb2f + forcevercode: yes + prebuild: sed -i '/ant/d' ../Makefile && \ + ln -s vlc-android/$$VLC$$ ../vlc + build: cd ../ && \ + ANDROID_ABI=armeabi-v7a ./compile.sh release + buildjni: no + + - versionName: 0.9.5 + versionCode: 9502 + disable: can't download gmp + commit: 0.9.5 + subdir: vlc-android + srclibs: VLC@052600173f376ff58ff04d53746961a2 + forcevercode: yes + prebuild: sed -i '/ant/d' ../Makefile && \ + ln -s vlc-android/$$VLC$$ ../vlc + build: cd ../ && \ + ANDROID_ABI=x86 ./compile.sh release + buildjni: no + + - versionName: 0.9.5 + versionCode: 9504 + disable: can't download gmp + commit: 0.9.5 + subdir: vlc-android + srclibs: VLC@052600173f376ff58ff04d53746961a2 + forcevercode: yes + prebuild: sed -i '/ant/d' ../Makefile && \ + ln -s vlc-android/$$VLC$$ ../vlc + build: cd ../ && \ + ANDROID_ABI=armeabi-v7a ./compile.sh release + buildjni: no + + - versionName: 0.9.6 + versionCode: 9602 + commit: 0.9.6 + subdir: vlc-android + srclibs: VLC-2.2@27f4799 + forcevercode: yes + prebuild: sed -i '/ant/d' ../Makefile && \ + ln -s vlc-android/$$VLC-2.2$$ ../vlc + build: cd ../ && \ + ANDROID_ABI=x86 ./compile.sh release + buildjni: no + + - versionName: 0.9.6 + versionCode: 9604 + commit: 0.9.6 + subdir: vlc-android + srclibs: VLC-2.2@27f4799 + 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 + buildjni: no + + - versionName: 0.9.7 + versionCode: 9702 + commit: 0.9.7 + subdir: vlc-android + srclibs: VLC-2.2@9e1c6ff + forcevercode: yes + prebuild: sed -i '/ant/d' ../Makefile && \ + ln -s vlc-android/$$VLC-2.2$$ ../vlc + build: cd ../ && \ + ANDROID_ABI=x86 ./compile.sh release + buildjni: no + + - versionName: 0.9.7 + versionCode: 9704 + commit: 0.9.7 + subdir: vlc-android + srclibs: VLC-2.2@9e1c6ff + 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 + buildjni: no + + - versionName: 0.9.7.1 + versionCode: 9711 + disable: build fails + commit: 0.9.7.1 + subdir: vlc-android + srclibs: VLC-2.2@57cd36b + forcevercode: yes + prebuild: sed -i '/ant/d' ../Makefile && \ + ln -s vlc-android/$$VLC-2.2$$ ../vlc + build: cd ../ && \ + ANDROID_ABI=mips ./compile.sh release + buildjni: no + + - versionName: 0.9.7.1 + versionCode: 9712 + commit: 0.9.7.1 + subdir: vlc-android + srclibs: VLC-2.2@57cd36b + forcevercode: yes + prebuild: sed -i '/ant/d' ../Makefile && \ + ln -s vlc-android/$$VLC-2.2$$ ../vlc + build: cd ../ && \ + ANDROID_ABI=x86 ./compile.sh release + buildjni: no + + - versionName: 0.9.7.1 + versionCode: 9714 + commit: 0.9.7.1 + subdir: vlc-android + srclibs: VLC-2.2@57cd36b + 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 + buildjni: no + + - versionName: 0.9.8 + versionCode: 9802 + commit: 0.9.8 + subdir: vlc-android + srclibs: VLC-2.2@f2db364 + forcevercode: yes + prebuild: sed -i '/ant/d' ../Makefile && \ + ln -s vlc-android/$$VLC-2.2$$ ../vlc + build: cd ../ && \ + ANDROID_ABI=x86 ./compile.sh release + buildjni: no + + - versionName: 0.9.8 + versionCode: 9803 + commit: 0.9.8 + subdir: vlc-android + srclibs: VLC-2.2@f2db364 + forcevercode: yes + prebuild: sed -i '/ant/d' ../Makefile && \ + ln -s vlc-android/$$VLC-2.2$$ ../vlc + build: cd ../ && \ + ANDROID_ABI=armeabi ./compile.sh release + buildjni: no + + - versionName: 0.9.8 + versionCode: 9804 + commit: 0.9.8 + subdir: vlc-android + srclibs: VLC-2.2@f2db364 + 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 + buildjni: no + + - versionName: 0.9.9 + versionCode: 9902 + commit: 0.9.9 + subdir: vlc-android + srclibs: VLC-2.2@e731dc23a4f8ef6782c7cc2236bbbf41c034dad1 + forcevercode: yes + prebuild: sed -i '/ant/d' ../Makefile && \ + ln -s vlc-android/$$VLC-2.2$$ ../vlc + build: cd ../ && \ + ANDROID_ABI=x86 ./compile.sh release + buildjni: no + + - versionName: 0.9.9 + versionCode: 9903 + commit: 0.9.9 + subdir: vlc-android + srclibs: VLC-2.2@e731dc23a4f8ef6782c7cc2236bbbf41c034dad1 + forcevercode: yes + prebuild: sed -i '/ant/d' ../Makefile && \ + ln -s vlc-android/$$VLC-2.2$$ ../vlc + build: cd ../ && \ + ANDROID_ABI=armeabi ./compile.sh release + buildjni: no + + - versionName: 0.9.9 + versionCode: 9904 + commit: 0.9.9 + subdir: vlc-android + srclibs: VLC-2.2@e731dc23a4f8ef6782c7cc2236bbbf41c034dad1 + 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 + buildjni: no + + - versionName: 0.9.10 + versionCode: 10002 + commit: 0.9.10 + subdir: vlc-android + srclibs: VLC-2.2@e33e5de + forcevercode: yes + prebuild: sed -i '/ant/d' ../Makefile && \ + ln -s vlc-android/$$VLC-2.2$$ ../vlc + build: cd ../ && \ + ANDROID_ABI=x86 ./compile.sh release + buildjni: no + + - versionName: 0.9.10 + versionCode: 10003 + commit: 0.9.10 + subdir: vlc-android + srclibs: VLC-2.2@e33e5de + forcevercode: yes + prebuild: sed -i '/ant/d' ../Makefile && \ + ln -s vlc-android/$$VLC-2.2$$ ../vlc + build: cd ../ && \ + ANDROID_ABI=armeabi ./compile.sh release + buildjni: no + + - versionName: 0.9.10 + versionCode: 10004 + commit: 0.9.10 + subdir: vlc-android + srclibs: VLC-2.2@e33e5de + 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 + buildjni: no + +#0.9.10 vercodes were off + - versionName: 1.0.0 + versionCode: 10006 + disable: doesn't build + commit: 1.0.0 + subdir: vlc-android + srclibs: VLC-2.2@036010e + forcevercode: yes + prebuild: sed -i '/ant/d' ../Makefile && \ + ln -s vlc-android/$$VLC-2.2$$ ../vlc + build: cd ../ && \ + ANDROID_ABI=x86 ./compile.sh release + buildjni: no + +#0.9.10 vercodes were off + - versionName: 1.0.0 + versionCode: 10007 + disable: doesn't build + commit: 1.0.0 + subdir: vlc-android + srclibs: VLC-2.2@036010e + forcevercode: yes + prebuild: sed -i '/ant/d' ../Makefile && \ + ln -s vlc-android/$$VLC-2.2$$ ../vlc + build: cd ../ && \ + ANDROID_ABI=armeabi ./compile.sh release + buildjni: no + +#0.9.10 vercodes were off + - versionName: 1.0.0 + versionCode: 10008 + disable: doesn't build + commit: 1.0.0 + subdir: vlc-android + srclibs: VLC-2.2@036010e + 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 + buildjni: no + + - versionName: 1.0.1 + versionCode: 10102 + commit: 1.0.1 + subdir: vlc-android + srclibs: VLC-2.2@59409d5 + forcevercode: yes + prebuild: sed -i '/ant/d' ../Makefile && \ + ln -s vlc-android/$$VLC-2.2$$ ../vlc + build: cd ../ && \ + ANDROID_ABI=x86 ./compile.sh release + buildjni: no + + - versionName: 1.0.1 + versionCode: 10103 + commit: 1.0.1 + subdir: vlc-android + srclibs: VLC-2.2@59409d5 + forcevercode: yes + prebuild: sed -i '/ant/d' ../Makefile && \ + ln -s vlc-android/$$VLC-2.2$$ ../vlc + build: cd ../ && \ + ANDROID_ABI=armeabi ./compile.sh release + buildjni: no + + - versionName: 1.0.1 + versionCode: 10104 + commit: 1.0.1 + subdir: vlc-android + srclibs: VLC-2.2@59409d5 + 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 + buildjni: no + + - versionName: 1.1.3 + versionCode: 1010303 + commit: 1.1.3 + subdir: vlc-android + gradle: VanillaARMv6fpu + srclibs: VLC@a9b19e4 + 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 + buildjni: no + ndk: r10d + + - versionName: 1.1.3 + versionCode: 1010304 + commit: 1.1.3 + subdir: vlc-android + gradle: VanillaARMv7 + srclibs: VLC@a9b19e4 + 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 + buildjni: no + ndk: r10d + + - versionName: 1.1.3 + versionCode: 1010305 + commit: 1.1.3 + subdir: vlc-android + gradle: VanillaX86 + srclibs: VLC@a9b19e4 + 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 + buildjni: no + ndk: r10d + + - versionName: 1.1.5 + versionCode: 1010503 + commit: 1.1.5 + subdir: vlc-android + gradle: VanillaARMv6fpu + srclibs: VLC@e6b4585 + 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 + buildjni: no + ndk: r10d + + - versionName: 1.1.5 + versionCode: 1010504 + commit: 1.1.5 + subdir: vlc-android + gradle: VanillaARMv7 + srclibs: VLC@e6b4585 + 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 + buildjni: no + ndk: r10d + + - versionName: 1.1.5 + versionCode: 1010505 + commit: 1.1.5 + subdir: vlc-android + gradle: VanillaX86 + srclibs: VLC@e6b4585 + 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 + buildjni: no + ndk: r10d + + - versionName: 1.1.6 + versionCode: 1010603 + commit: 1.1.6 + subdir: vlc-android + gradle: VanillaARMv6fpu + srclibs: VLC@551b670 + 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 + buildjni: no + ndk: r10d + + - versionName: 1.1.6 + versionCode: 1010604 + commit: 1.1.6 + subdir: vlc-android + gradle: VanillaARMv7 + srclibs: VLC@551b670 + 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 + buildjni: no + ndk: r10d + + - versionName: 1.1.6 + versionCode: 1010605 + commit: 1.1.6 + subdir: vlc-android + gradle: VanillaX86 + srclibs: VLC@551b670 + 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 + buildjni: no + ndk: r10d + + - versionName: 1.2.0 + versionCode: 1020003 + commit: 1.2.0 + subdir: vlc-android + gradle: VanillaARMv6fpu + srclibs: VLC@23c8d86 + 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 + buildjni: no + ndk: r10d + + - versionName: 1.2.0 + versionCode: 1020004 + commit: 1.2.0 + subdir: vlc-android + gradle: VanillaARMv7 + srclibs: VLC@23c8d86 + 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 + buildjni: no + ndk: r10d + + - versionName: 1.2.0 + versionCode: 1020005 + commit: 1.2.0 + subdir: vlc-android + gradle: VanillaX86 + srclibs: VLC@23c8d86 + 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 + buildjni: no + ndk: r10d + + - versionName: 1.2.1 + versionCode: 1020103 + commit: 1.2.1 + subdir: vlc-android + gradle: VanillaARMv6fpu + srclibs: VLC@23c8d86 + 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 + buildjni: no + ndk: r10d + + - versionName: 1.2.1 + versionCode: 1020104 + commit: 1.2.1 + subdir: vlc-android + gradle: VanillaARMv7 + srclibs: VLC@23c8d86 + 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 + buildjni: no + ndk: r10d + + - versionName: 1.2.1 + versionCode: 1020105 + commit: 1.2.1 + subdir: vlc-android + gradle: VanillaX86 + srclibs: VLC@23c8d86 + 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 + buildjni: no + ndk: r10d + + - versionName: 1.2.2 + versionCode: 1020203 + commit: 1.2.2 + subdir: vlc-android + gradle: VanillaARMv6fpu + srclibs: VLC@7491a5f + 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 + buildjni: no + ndk: r10d + + - versionName: 1.2.2 + versionCode: 1020204 + commit: 1.2.2 + subdir: vlc-android + gradle: VanillaARMv7 + srclibs: VLC@7491a5f + 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 + buildjni: no + ndk: r10d + + - versionName: 1.2.2 + versionCode: 1020205 + commit: 1.2.2 + subdir: vlc-android + gradle: VanillaX86 + srclibs: VLC@7491a5f + 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 + buildjni: no + ndk: r10d + + - versionName: 1.2.3 + versionCode: 1020303 + commit: 1.2.3 + subdir: vlc-android + gradle: VanillaARMv6fpu + srclibs: VLC@7491a5f + 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 + buildjni: no + ndk: r10d + + - versionName: 1.2.3 + versionCode: 1020304 + commit: 1.2.3 + subdir: vlc-android + gradle: VanillaARMv7 + srclibs: VLC@7491a5f + 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 + buildjni: no + ndk: r10d + + - versionName: 1.2.3 + versionCode: 1020305 + commit: 1.2.3 + subdir: vlc-android + gradle: VanillaX86 + srclibs: VLC@7491a5f + 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 + buildjni: no + ndk: r10d + + - versionName: 1.2.4 + versionCode: 1020403 + commit: 1.2.4 + subdir: vlc-android + gradle: VanillaARMv6fpu + srclibs: VLC@7491a5f + 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 + buildjni: no + ndk: r10d + + - versionName: 1.2.4 + versionCode: 1020404 + commit: 1.2.4 + subdir: vlc-android + gradle: VanillaARMv7 + srclibs: VLC@7491a5f + 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 + buildjni: no + ndk: r10d + + - versionName: 1.2.4 + versionCode: 1020405 + commit: 1.2.4 + subdir: vlc-android + gradle: VanillaX86 + srclibs: VLC@7491a5f + 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 + buildjni: no + ndk: r10d + + - versionName: 1.2.5 + versionCode: 1020503 + commit: 1.2.5 + subdir: vlc-android + gradle: VanillaARMv6fpu + srclibs: VLC@50accb8 + 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 + buildjni: no + ndk: r10d + + - versionName: 1.2.5 + versionCode: 1020504 + commit: 1.2.5 + subdir: vlc-android + gradle: VanillaARMv7 + srclibs: VLC@50accb8 + 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 + buildjni: no + ndk: r10d + + - versionName: 1.2.5 + versionCode: 1020505 + commit: 1.2.5 + subdir: vlc-android + gradle: VanillaX86 + srclibs: VLC@50accb8 + 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 + buildjni: no + ndk: r10d + + - versionName: 1.2.6 + versionCode: 1030003 + commit: 1.2.6 + subdir: vlc-android + gradle: VanillaARMv6fpu + srclibs: VLC@d59b81a + 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 + buildjni: no + ndk: r10d + + - versionName: 1.2.6 + versionCode: 1030004 + commit: 1.2.6 + subdir: vlc-android + gradle: VanillaARMv7 + srclibs: VLC@d59b81a + 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 + buildjni: no + ndk: r10d + + - versionName: 1.2.6 + versionCode: 1030005 + commit: 1.2.6 + subdir: vlc-android + gradle: VanillaX86 + srclibs: VLC@d59b81a + 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 + buildjni: no + ndk: r10d + +Maintainer Notes: | + Instructions and dependencies here: http://wiki.videolan.org/AndroidCompile + see http://buildbot.videolan.org/builders/ for version code scheme + The VLC srclib commit can be found out from TESTED_HASH value in compile.sh + + On new releases remove the updatecheck and force the CV to the last working + build. This will make sure users don't get notified about the update until + the final build from the BS has been reviewed and tested. Once done, undo + those changes. + +# NEW BUILDS +# +0: vanilla +# +1: armv5 +# +2: armv6nofpu +# +3: armv6fpu +# +4: armv7 +# +5: x86 +# +6: mips +# +7: armv8 +# +8: x86_64 +# +9: mips64 +# OLD BUILD SYSTEM +# +0: - (upstream) +# +1: mips +# +2: x86 +# +3: arm +# +4: armv7 (CV) +Archive Policy: 9 versions +Auto Update Mode: None +Update Check Mode: Tags +# Only use higher vercode ops, if we do build those arches +Vercode Operation: "%c + 5" +Current Version: 1.2.6 +Current Version Code: 1030005 From 285c06d1560376f43288f4bf5816c75218371c61 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Wed, 5 Aug 2015 10:50:01 +0200 Subject: [PATCH 16/22] metadata: use unified method for getting default app metadata dict This puts process of setting up the defaults for the internal dict that represents a parsed app into a single method that is reused for all metadata formats. --- fdroidserver/metadata.py | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/fdroidserver/metadata.py b/fdroidserver/metadata.py index fe45c896..6502d338 100644 --- a/fdroidserver/metadata.py +++ b/fdroidserver/metadata.py @@ -586,7 +586,8 @@ def split_list_values(s): return [v for v in l if v] -def get_default_app_info_list(appid=None): +def get_default_app_info_list(metafile=None): + appid = os.path.splitext(os.path.basename(metafile))[0] thisinfo = {} thisinfo.update(app_defaults) if appid is not None: @@ -596,7 +597,7 @@ def get_default_app_info_list(appid=None): thisinfo['builds'] = [] thisinfo['comments'] = [] - return thisinfo + return appid, thisinfo def post_metadata_parse(thisinfo): @@ -721,8 +722,7 @@ def _decode_dict(data): def parse_json_metadata(metafile): - appid = os.path.basename(metafile)[0:-5] # strip path and .json - thisinfo = get_default_app_info_list(appid) + appid, thisinfo = get_default_app_info_list(metafile) # fdroid metadata is only strings and booleans, no floats or ints. And # json returns unicode, and fdroidserver still uses plain python strings @@ -739,8 +739,7 @@ def parse_json_metadata(metafile): def parse_xml_metadata(metafile): - appid = os.path.basename(metafile)[0:-4] # strip path and .xml - thisinfo = get_default_app_info_list(appid) + appid, thisinfo = get_default_app_info_list(metafile) tree = ElementTree.ElementTree(file=metafile) root = tree.getroot() @@ -790,8 +789,7 @@ def parse_xml_metadata(metafile): def parse_yaml_metadata(metafile): - appid = os.path.basename(metafile)[0:-5] # strip path and .yaml - thisinfo = get_default_app_info_list(appid) + appid, thisinfo = get_default_app_info_list(metafile) yamlinfo = yaml.load(open(metafile, 'r'), Loader=YamlLoader) thisinfo.update(yamlinfo) @@ -802,7 +800,6 @@ def parse_yaml_metadata(metafile): def parse_txt_metadata(metafile): - appid = None linedesc = None def add_buildflag(p, thisbuild): @@ -877,14 +874,8 @@ def parse_txt_metadata(metafile): thisinfo['comments'].append([key, comment]) del curcomments[:] - thisinfo = get_default_app_info_list() - if metafile: - if not isinstance(metafile, file): - metafile = open(metafile, "r") - appid = metafile.name[9:-4] - thisinfo['id'] = appid - else: - return appid, thisinfo + appid, thisinfo = get_default_app_info_list(metafile) + metafile = open(metafile, "r") mode = 0 buildlines = [] From 6f334558df689b6361ee8c4e79bdd86a9e85f578 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Wed, 5 Aug 2015 11:37:30 +0200 Subject: [PATCH 17/22] metadata: rename metafile to metadatapath when it is a path To keep the code clear, change the code to use separate variables for the path to the metadata file, and for the file object of the opened metadata. --- fdroidserver/checkupdates.py | 8 ++--- fdroidserver/import.py | 6 ++-- fdroidserver/metadata.py | 62 ++++++++++++++++++------------------ 3 files changed, 38 insertions(+), 38 deletions(-) diff --git a/fdroidserver/checkupdates.py b/fdroidserver/checkupdates.py index 494a1834..1962dded 100644 --- a/fdroidserver/checkupdates.py +++ b/fdroidserver/checkupdates.py @@ -493,14 +493,14 @@ def checkupdates_app(app, first=True): logging.warn('Invalid auto update mode "' + mode + '" on ' + app['id']) if commitmsg: - metafile = os.path.join('metadata', app['id'] + '.txt') - metadata.write_metadata(metafile, app) + metadatapath = os.path.join('metadata', app['id'] + '.txt') + metadata.write_metadata(metadatapath, app) if options.commit: - logging.info("Commiting update for " + metafile) + logging.info("Commiting update for " + metadatapath) gitcmd = ["git", "commit", "-m", commitmsg] if 'auto_author' in config: gitcmd.extend(['--author', config['auto_author']]) - gitcmd.extend(["--", metafile]) + gitcmd.extend(["--", metadatapath]) if subprocess.call(gitcmd) != 0: logging.error("Git commit failed") sys.exit(1) diff --git a/fdroidserver/import.py b/fdroidserver/import.py index 5c47f780..31757dbe 100644 --- a/fdroidserver/import.py +++ b/fdroidserver/import.py @@ -234,9 +234,9 @@ def main(): with open('build/.fdroidvcs-' + package, 'w') as f: f.write(repotype + ' ' + repo) - metafile = os.path.join('metadata', package + '.txt') - metadata.write_metadata(metafile, app) - logging.info("Wrote " + metafile) + metadatapath = os.path.join('metadata', package + '.txt') + metadata.write_metadata(metadatapath, app) + logging.info("Wrote " + metadatapath) if __name__ == "__main__": diff --git a/fdroidserver/metadata.py b/fdroidserver/metadata.py index 6502d338..03701db9 100644 --- a/fdroidserver/metadata.py +++ b/fdroidserver/metadata.py @@ -418,11 +418,9 @@ def description_html(lines, linkres): return ps.text_html -def parse_srclib(metafile): +def parse_srclib(metadatapath): thisinfo = {} - if metafile and not isinstance(metafile, file): - metafile = open(metafile, "r") # Defaults for fields that come from metadata thisinfo['Repo Type'] = '' @@ -430,9 +428,11 @@ def parse_srclib(metafile): thisinfo['Subdir'] = None thisinfo['Prepare'] = None - if metafile is None: + if not os.path.exists(metadatapath): return thisinfo + metafile = open(metadatapath, "r") + n = 0 for line in metafile: n += 1 @@ -475,9 +475,9 @@ def read_srclibs(): if not os.path.exists(srcdir): os.makedirs(srcdir) - for metafile in sorted(glob.glob(os.path.join(srcdir, '*.txt'))): - srclibname = os.path.basename(metafile[:-4]) - srclibs[srclibname] = parse_srclib(metafile) + for metadatapath in sorted(glob.glob(os.path.join(srcdir, '*.txt'))): + srclibname = os.path.basename(metadatapath[:-4]) + srclibs[srclibname] = parse_srclib(metadatapath) # Read all metadata. Returns a list of 'app' objects (which are dictionaries as @@ -494,23 +494,23 @@ def read_metadata(xref=True): if not os.path.exists(basedir): os.makedirs(basedir) - for metafile in sorted(glob.glob(os.path.join('metadata', '*.txt'))): - appid, appinfo = parse_txt_metadata(metafile) + for metadatapath in sorted(glob.glob(os.path.join('metadata', '*.txt'))): + appid, appinfo = parse_txt_metadata(metadatapath) check_metadata(appinfo) apps[appid] = appinfo - for metafile in sorted(glob.glob(os.path.join('metadata', '*.json'))): - appid, appinfo = parse_json_metadata(metafile) + for metadatapath in sorted(glob.glob(os.path.join('metadata', '*.json'))): + appid, appinfo = parse_json_metadata(metadatapath) check_metadata(appinfo) apps[appid] = appinfo - for metafile in sorted(glob.glob(os.path.join('metadata', '*.xml'))): - appid, appinfo = parse_xml_metadata(metafile) + for metadatapath in sorted(glob.glob(os.path.join('metadata', '*.xml'))): + appid, appinfo = parse_xml_metadata(metadatapath) check_metadata(appinfo) apps[appid] = appinfo - for metafile in sorted(glob.glob(os.path.join('metadata', '*.yaml'))): - appid, appinfo = parse_yaml_metadata(metafile) + for metadatapath in sorted(glob.glob(os.path.join('metadata', '*.yaml'))): + appid, appinfo = parse_yaml_metadata(metadatapath) check_metadata(appinfo) apps[appid] = appinfo @@ -586,8 +586,8 @@ def split_list_values(s): return [v for v in l if v] -def get_default_app_info_list(metafile=None): - appid = os.path.splitext(os.path.basename(metafile))[0] +def get_default_app_info_list(metadatapath): + appid = os.path.splitext(os.path.basename(metadatapath))[0] thisinfo = {} thisinfo.update(app_defaults) if appid is not None: @@ -666,7 +666,7 @@ def post_metadata_parse(thisinfo): # Parse metadata for a single application. # -# 'metafile' - the filename to read. The package id for the application comes +# 'metadatapath' - the filename to read. The package id for the application comes # from this filename. Pass None to get a blank entry. # # Returns a dictionary containing all the details of the application. There are @@ -720,14 +720,14 @@ def _decode_dict(data): return rv -def parse_json_metadata(metafile): +def parse_json_metadata(metadatapath): - appid, thisinfo = get_default_app_info_list(metafile) + appid, thisinfo = get_default_app_info_list(metadatapath) # fdroid metadata is only strings and booleans, no floats or ints. And # json returns unicode, and fdroidserver still uses plain python strings # TODO create schema using https://pypi.python.org/pypi/jsonschema - jsoninfo = json.load(open(metafile, 'r'), + jsoninfo = json.load(open(metadatapath, 'r'), object_hook=_decode_dict, parse_int=lambda s: s, parse_float=lambda s: s) @@ -737,15 +737,15 @@ def parse_json_metadata(metafile): return (appid, thisinfo) -def parse_xml_metadata(metafile): +def parse_xml_metadata(metadatapath): - appid, thisinfo = get_default_app_info_list(metafile) + appid, thisinfo = get_default_app_info_list(metadatapath) - tree = ElementTree.ElementTree(file=metafile) + tree = ElementTree.ElementTree(file=metadatapath) root = tree.getroot() if root.tag != 'resources': - logging.critical(metafile + ' does not have root as !') + logging.critical(metadatapath + ' does not have root as !') sys.exit(1) supported_metadata = app_defaults.keys() @@ -787,18 +787,18 @@ def parse_xml_metadata(metafile): return (appid, thisinfo) -def parse_yaml_metadata(metafile): +def parse_yaml_metadata(metadatapath): - appid, thisinfo = get_default_app_info_list(metafile) + appid, thisinfo = get_default_app_info_list(metadatapath) - yamlinfo = yaml.load(open(metafile, 'r'), Loader=YamlLoader) + yamlinfo = yaml.load(open(metadatapath, 'r'), Loader=YamlLoader) thisinfo.update(yamlinfo) post_metadata_parse(thisinfo) return (appid, thisinfo) -def parse_txt_metadata(metafile): +def parse_txt_metadata(metadatapath): linedesc = None @@ -874,8 +874,8 @@ def parse_txt_metadata(metafile): thisinfo['comments'].append([key, comment]) del curcomments[:] - appid, thisinfo = get_default_app_info_list(metafile) - metafile = open(metafile, "r") + appid, thisinfo = get_default_app_info_list(metadatapath) + metafile = open(metadatapath, "r") mode = 0 buildlines = [] From 8d6e0aebb9c482e9ddcabae22327d4a5ca41d87c Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Wed, 5 Aug 2015 12:53:17 +0200 Subject: [PATCH 18/22] exit with error if duplicate metadata file is found In order to prevent confusion caused by multiple metadata files for a given app, fdroid will exit with an error if it finds any app metadata file with the same package ID as one that has already been parsed. --- fdroidserver/metadata.py | 39 ++++++++++++------- tests/metadata/net.osmand.plus.pickle | 6 ++- tests/metadata/org.adaway.pickle | 4 ++ tests/metadata/org.smssecure.smssecure.pickle | 6 ++- tests/metadata/org.videolan.vlc.pickle | 6 ++- tests/run-tests | 38 ++++++++++++++++++ 6 files changed, 82 insertions(+), 17 deletions(-) diff --git a/fdroidserver/metadata.py b/fdroidserver/metadata.py index 03701db9..a333a512 100644 --- a/fdroidserver/metadata.py +++ b/fdroidserver/metadata.py @@ -494,23 +494,28 @@ def read_metadata(xref=True): if not os.path.exists(basedir): os.makedirs(basedir) + # If there are multiple metadata files for a single appid, then the first + # file that is parsed wins over all the others, and the rest throw an + # exception. So the original .txt format is parsed first, at least until + # newer formats stabilize. + for metadatapath in sorted(glob.glob(os.path.join('metadata', '*.txt'))): - appid, appinfo = parse_txt_metadata(metadatapath) + appid, appinfo = parse_txt_metadata(apps, metadatapath) check_metadata(appinfo) apps[appid] = appinfo for metadatapath in sorted(glob.glob(os.path.join('metadata', '*.json'))): - appid, appinfo = parse_json_metadata(metadatapath) + appid, appinfo = parse_json_metadata(apps, metadatapath) check_metadata(appinfo) apps[appid] = appinfo for metadatapath in sorted(glob.glob(os.path.join('metadata', '*.xml'))): - appid, appinfo = parse_xml_metadata(metadatapath) + appid, appinfo = parse_xml_metadata(apps, metadatapath) check_metadata(appinfo) apps[appid] = appinfo for metadatapath in sorted(glob.glob(os.path.join('metadata', '*.yaml'))): - appid, appinfo = parse_yaml_metadata(metadatapath) + appid, appinfo = parse_yaml_metadata(apps, metadatapath) check_metadata(appinfo) apps[appid] = appinfo @@ -586,10 +591,16 @@ def split_list_values(s): return [v for v in l if v] -def get_default_app_info_list(metadatapath): +def get_default_app_info_list(apps, metadatapath): appid = os.path.splitext(os.path.basename(metadatapath))[0] + if appid in apps: + logging.critical("'%s' is a duplicate! '%s' is already provided by '%s'" + % (metadatapath, appid, apps[appid]['metadatapath'])) + sys.exit(1) + thisinfo = {} thisinfo.update(app_defaults) + thisinfo['metadatapath'] = metadatapath if appid is not None: thisinfo['id'] = appid @@ -602,7 +613,7 @@ def get_default_app_info_list(metadatapath): def post_metadata_parse(thisinfo): - supported_metadata = app_defaults.keys() + ['comments', 'builds', 'id'] + supported_metadata = app_defaults.keys() + ['comments', 'builds', 'id', 'metadatapath'] for k, v in thisinfo.iteritems(): if k not in supported_metadata: raise MetaDataException("Unrecognised metadata: {0}: {1}" @@ -720,9 +731,9 @@ def _decode_dict(data): return rv -def parse_json_metadata(metadatapath): +def parse_json_metadata(apps, metadatapath): - appid, thisinfo = get_default_app_info_list(metadatapath) + appid, thisinfo = get_default_app_info_list(apps, metadatapath) # fdroid metadata is only strings and booleans, no floats or ints. And # json returns unicode, and fdroidserver still uses plain python strings @@ -737,9 +748,9 @@ def parse_json_metadata(metadatapath): return (appid, thisinfo) -def parse_xml_metadata(metadatapath): +def parse_xml_metadata(apps, metadatapath): - appid, thisinfo = get_default_app_info_list(metadatapath) + appid, thisinfo = get_default_app_info_list(apps, metadatapath) tree = ElementTree.ElementTree(file=metadatapath) root = tree.getroot() @@ -787,9 +798,9 @@ def parse_xml_metadata(metadatapath): return (appid, thisinfo) -def parse_yaml_metadata(metadatapath): +def parse_yaml_metadata(apps, metadatapath): - appid, thisinfo = get_default_app_info_list(metadatapath) + appid, thisinfo = get_default_app_info_list(apps, metadatapath) yamlinfo = yaml.load(open(metadatapath, 'r'), Loader=YamlLoader) thisinfo.update(yamlinfo) @@ -798,7 +809,7 @@ def parse_yaml_metadata(metadatapath): return (appid, thisinfo) -def parse_txt_metadata(metadatapath): +def parse_txt_metadata(apps, metadatapath): linedesc = None @@ -874,7 +885,7 @@ def parse_txt_metadata(metadatapath): thisinfo['comments'].append([key, comment]) del curcomments[:] - appid, thisinfo = get_default_app_info_list(metadatapath) + appid, thisinfo = get_default_app_info_list(apps, metadatapath) metafile = open(metadatapath, "r") mode = 0 diff --git a/tests/metadata/net.osmand.plus.pickle b/tests/metadata/net.osmand.plus.pickle index 6a2fa2bd..68b5d41b 100644 --- a/tests/metadata/net.osmand.plus.pickle +++ b/tests/metadata/net.osmand.plus.pickle @@ -488,4 +488,8 @@ NsS'Current Version' p176 S'1.9.5' p177 -s. +sS'metadatapath' +p178 +S'metadata/net.osmand.plus.xml' +p179 +s. \ No newline at end of file diff --git a/tests/metadata/org.adaway.pickle b/tests/metadata/org.adaway.pickle index 04cbd409..5e8ffb3e 100644 --- a/tests/metadata/org.adaway.pickle +++ b/tests/metadata/org.adaway.pickle @@ -2231,4 +2231,8 @@ NsS'Current Version' p480 S'3.0' p481 +sS'metadatapath' +p482 +S'metadata/org.adaway.json' +p483 s. \ No newline at end of file diff --git a/tests/metadata/org.smssecure.smssecure.pickle b/tests/metadata/org.smssecure.smssecure.pickle index 860acaf7..1d7f1b66 100644 --- a/tests/metadata/org.smssecure.smssecure.pickle +++ b/tests/metadata/org.smssecure.smssecure.pickle @@ -753,4 +753,8 @@ NsS'Current Version' p224 S'0.6.0' p225 -s. +sS'metadatapath' +p226 +S'metadata/org.smssecure.smssecure.txt' +p227 +s. \ No newline at end of file diff --git a/tests/metadata/org.videolan.vlc.pickle b/tests/metadata/org.videolan.vlc.pickle index 9cb7c2de..663a51fb 100644 --- a/tests/metadata/org.videolan.vlc.pickle +++ b/tests/metadata/org.videolan.vlc.pickle @@ -5485,4 +5485,8 @@ sS'Current Version' p1456 S'1.2.6' p1457 -s. +sS'metadatapath' +p1458 +S'metadata/org.videolan.vlc.yaml' +p1459 +s. \ No newline at end of file diff --git a/tests/run-tests b/tests/run-tests index 7891e3c9..65ab0d88 100755 --- a/tests/run-tests +++ b/tests/run-tests @@ -109,6 +109,44 @@ cd $WORKSPACE/docs ./gendocs.sh -o html --email admin@f-droid.org fdroid "F-Droid Server Manual" +#------------------------------------------------------------------------------# +echo_header "test metadata checks" + +REPOROOT=`create_test_dir` +cd $REPOROOT + +touch config.py +mkdir repo +cp $WORKSPACE/tests/urzip.apk $REPOROOT/repo/ + +set +e +$fdroid build +if [ $? -eq 0 ]; then + echo "This should have failed because there is no metadata!" + exit 1 +else + echo "testing metadata checks passed" +fi +set -e + +mkdir $REPOROOT/metadata/ +cp $WORKSPACE/tests/metadata/org.smssecure.smssecure.txt $REPOROOT/metadata/ +$fdroid readmeta + +# now make a fake duplicate +touch $REPOROOT/metadata/org.smssecure.smssecure.yaml + +set +e +$fdroid readmeta +if [ $? -eq 0 ]; then + echo "This should have failed because there is a duplicate metadata file!" + exit 1 +else + echo "testing duplicate metadata checks passed" +fi +set -e + + #------------------------------------------------------------------------------# echo_header "create a source tarball and use that to build a repo" From beb217b6ae03d45f783231c8e23b7233ece2428a Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Tue, 1 Sep 2015 11:52:56 +0200 Subject: [PATCH 19/22] add 'gradleprops' to .pickle files for the metadata tests --- tests/metadata/net.osmand.plus.pickle | 475 +- tests/metadata/org.adaway.pickle | 2153 +++--- tests/metadata/org.smssecure.smssecure.pickle | 775 +- tests/metadata/org.videolan.vlc.pickle | 6823 +++++++++-------- tests/metadata/update-pickle.py | 15 + 5 files changed, 5236 insertions(+), 5005 deletions(-) create mode 100755 tests/metadata/update-pickle.py diff --git a/tests/metadata/net.osmand.plus.pickle b/tests/metadata/net.osmand.plus.pickle index 68b5d41b..e900a8e5 100644 --- a/tests/metadata/net.osmand.plus.pickle +++ b/tests/metadata/net.osmand.plus.pickle @@ -28,9 +28,9 @@ sS'Donate' p14 S'https://code.google.com/p/osmand/#Please_support_the_project' p15 -sS'Repo Type' +sS'id' p16 -S'git' +S'net.osmand.plus' p17 sS'Description' p18 @@ -67,9 +67,9 @@ I00 sS'comments' p33 (lp34 -sS'id' +sS'Repo Type' p35 -S'net.osmand.plus' +S'git' p36 sS'Repo' p37 @@ -150,346 +150,355 @@ I00 sS'oldsdkloc' p74 I00 -sS'kivy' +sS'gradleprops' p75 -I00 -sS'gradle' -p76 -I00 +(lp76 sS'scanignore' p77 (lp78 -sS'srclibs' +sS'patch' p79 (lp80 -sS'encoding' +sS'srclibs' p81 -NsS'extlibs' -p82 -(lp83 -sS'init' +(lp82 +sS'output' +p83 +S'bin/OsmAnd-release-unsigned.apk' p84 +sS'encoding' +p85 +NsS'extlibs' +p86 +(lp87 +sS'init' +p88 g23 sS'version' -p85 -S'1.8.2' -p86 -sS'build' -p87 -S'./old-ndk-build.sh && ant -Dsdk.dir="$ANDROID_SDK" -Dndk.dir="$ANDROID_NDK" -DBLACKBERRY_BUILD=false -DBUILD_SUFFIX= -DAPK_NUMBER_VERSION=182 "-DFEATURES=+play_market +gps_status -parking_plugin -blackberry -amazon -route_nav" -DCLEAN_CPP=false -DPACKAGE_TO_BUILT=net.osmand.plus -DAPK_VERSION=1.8.2 -Dnet.osmand.plus= -Dbuild.version=1.8.2 -Dbuild.version.code=182 -Dnativeoff=false "-DversionFeatures=+play_market +gps_status -parking_plugin -blackberry -amazon -route_nav" clean release' -p88 -sS'rm' p89 -(lp90 -sS'type' +S'1.8.2' +p90 +sS'build' p91 -S'raw' +S'./old-ndk-build.sh && ant -Dsdk.dir="$ANDROID_SDK" -Dndk.dir="$ANDROID_NDK" -DBLACKBERRY_BUILD=false -DBUILD_SUFFIX= -DAPK_NUMBER_VERSION=182 "-DFEATURES=+play_market +gps_status -parking_plugin -blackberry -amazon -route_nav" -DCLEAN_CPP=false -DPACKAGE_TO_BUILT=net.osmand.plus -DAPK_VERSION=1.8.2 -Dnet.osmand.plus= -Dbuild.version=1.8.2 -Dbuild.version.code=182 -Dnativeoff=false "-DversionFeatures=+play_market +gps_status -parking_plugin -blackberry -amazon -route_nav" clean release' p92 -sS'subdir' -p93 -S'android/OsmAnd' -p94 sS'ndk_path' -p95 +p93 g23 -sS'forcevercode' +sS'kivy' +p94 +I00 +sS'subdir' +p95 +S'android/OsmAnd' p96 +sS'forcevercode' +p97 I00 sS'preassemble' -p97 -(lp98 +p98 +(lp99 sS'update' -p99 -(lp100 +p100 +(lp101 S'auto' -p101 -asS'maven' p102 -I00 -sS'disable' +asS'maven' p103 I00 -sS'commit' +sS'disable' p104 -S'76ada6c8a08afe69acb755503373ac36328ef665' -p105 -sS'scandelete' -p106 -(lp107 -sS'buildjni' -p108 -(lp109 -S'no' -p110 -asS'ndk' -p111 -S'r10e' -p112 -sS'target' -p113 -NsS'antcommands' -p114 -NsS'patch' -p115 -(lp116 -sS'prebuild' -p117 -S'sed -i \'s/"OsmAnd+"/"OsmAnd~"/g\' build.xml' -p118 -sS'novcheck' -p119 I00 -sS'output' +sS'rm' +p105 +(lp106 +sS'scandelete' +p107 +(lp108 +sS'buildjni' +p109 +(lp110 +S'no' +p111 +asS'ndk' +p112 +S'r10e' +p113 +sS'target' +p114 +NsS'type' +p115 +S'raw' +p116 +sS'antcommands' +p117 +NsS'gradle' +p118 +I00 +sS'prebuild' +p119 +S'sed -i \'s/"OsmAnd+"/"OsmAnd~"/g\' build.xml' p120 -S'bin/OsmAnd-release-unsigned.apk' +sS'novcheck' p121 -sa(dp122 -S'submodules' +I00 +sS'commit' +p122 +S'76ada6c8a08afe69acb755503373ac36328ef665' p123 +sa(dp124 +S'submodules' +p125 I01 sg71 S'183' -p124 +p126 sg73 I00 sg74 I00 sg75 -I00 -sg76 -I00 +(lp127 sg77 g78 sg79 g80 sg81 -Nsg82 -g83 -sg84 -g23 -sg85 -S'1.8.3' -p125 -sS'subdir' -p126 -S'android/OsmAnd' -p127 -sg89 -g90 -sg91 -g92 -sS'build' +g82 +sS'output' p128 -S'../../build' +S'bin/OsmAnd-release-unsigned.apk' p129 -sg95 +sg85 +Nsg86 +g87 +sg88 g23 -sg96 +sg89 +S'1.8.3' +p130 +sS'subdir' +p131 +S'android/OsmAnd' +p132 +sg93 +g23 +sg94 I00 +sS'build' +p133 +S'../../build' +p134 sg97 -g98 -sg99 -g100 -sg102 I00 +sg98 +g99 +sg100 +g101 sg103 I00 -sS'commit' -p130 -S'1.8.3' -p131 -sg106 -g107 +sg104 +I00 +sg105 +g106 +sg107 +g108 sS'buildjni' -p132 -(lp133 +p135 +(lp136 S'no' -p134 -asg111 -g112 -sg113 -Nsg114 +p137 +asg112 +g113 +sg114 Nsg115 g116 -sS'prebuild' -p135 -g23 -sg119 +sg117 +Nsg118 I00 -sS'output' -p136 -S'bin/OsmAnd-release-unsigned.apk' -p137 -sa(dp138 -S'submodules' +sS'prebuild' +p138 +g23 +sg121 +I00 +sS'commit' p139 +S'1.8.3' +p140 +sa(dp141 +S'submodules' +p142 I01 sg71 S'196' -p140 +p143 sg73 I00 sg74 I00 sg75 -I00 -sg76 -I00 +(lp144 sg77 g78 sg79 g80 sg81 -Nsg82 -g83 -sg84 -g23 -sg85 -S'1.9.4' -p141 -sS'subdir' -p142 -S'android/OsmAnd' -p143 -sg89 -g90 -sg91 -g92 -sS'build' -p144 -S'../../build' +g82 +sS'output' p145 -sg95 -g23 -sg96 -I00 -sg97 -g98 -sg99 -g100 -sg102 -I00 -sg103 -I00 -sS'commit' +S'bin/OsmAnd-release-unsigned.apk' p146 +sg85 +Nsg86 +g87 +sg88 +g23 +sg89 S'1.9.4' p147 -sg106 -g107 -sS'buildjni' +sS'subdir' p148 -(lp149 -S'no' +S'android/OsmAnd' +p149 +sg93 +g23 +sg94 +I00 +sS'build' p150 -asS'ndk' +S'../../build' p151 -S'r10d' +sg97 +I00 +sg98 +g99 +sg100 +g101 +sg103 +I00 +sg104 +I00 +sg105 +g106 +sg107 +g108 +sS'buildjni' p152 -sg113 -Nsg114 +(lp153 +S'no' +p154 +asS'ndk' +p155 +S'r10d' +p156 +sg114 Nsg115 g116 -sg135 -g23 -sg119 +sg117 +Nsg118 I00 -sS'output' -p153 -S'bin/OsmAnd-release-unsigned.apk' -p154 -sa(dp155 +sg138 +g23 +sg121 +I00 +sS'commit' +p157 +S'1.9.4' +p158 +sa(dp159 S'submodules' -p156 +p160 I01 sg71 S'197' -p157 +p161 sg73 I00 sg74 I00 sg75 -I00 -sg76 -I00 +(lp162 sg77 g78 sg79 g80 sg81 -Nsg82 -g83 -sg84 -g23 +g82 +sS'output' +p163 +S'bin/OsmAnd-release-unsigned.apk' +p164 sg85 -S'1.9.5' -p158 -sS'subdir' -p159 -S'android/OsmAnd' -p160 -sg89 -g90 -sg91 -g92 -sS'build' -p161 -S'../../build' -p162 -sg95 +Nsg86 +g87 +sg88 g23 -sg96 +sg89 +S'1.9.5' +p165 +sS'subdir' +p166 +S'android/OsmAnd' +p167 +sg93 +g23 +sg94 I00 +sS'build' +p168 +S'../../build' +p169 sg97 -g98 -sg99 -g100 -sg102 I00 +sg98 +g99 +sg100 +g101 sg103 I00 -sS'commit' -p163 -S'1.9.5' -p164 -sg106 -g107 +sg104 +I00 +sg105 +g106 +sg107 +g108 sS'buildjni' -p165 -(lp166 +p170 +(lp171 S'no' -p167 +p172 asS'ndk' -p168 +p173 S'r10d' -p169 -sg113 -Nsg114 +p174 +sg114 Nsg115 g116 -sg135 -g23 -sg119 +sg117 +Nsg118 I00 -sS'output' -p170 -S'bin/OsmAnd-release-unsigned.apk' -p171 -sasS'FlattrID' -p172 -NsS'Disabled' -p173 -NsS'Update Check Name' -p174 -NsS'Vercode Operation' +sg138 +g23 +sg121 +I00 +sS'commit' p175 -NsS'Current Version' -p176 S'1.9.5' +p176 +sasS'FlattrID' p177 -sS'metadatapath' +NsS'metadatapath' p178 S'metadata/net.osmand.plus.xml' p179 +sS'Disabled' +p180 +NsS'Update Check Name' +p181 +NsS'Vercode Operation' +p182 +NsS'Current Version' +p183 +S'1.9.5' +p184 s. \ No newline at end of file diff --git a/tests/metadata/org.adaway.pickle b/tests/metadata/org.adaway.pickle index 5e8ffb3e..4617b6c1 100644 --- a/tests/metadata/org.adaway.pickle +++ b/tests/metadata/org.adaway.pickle @@ -26,9 +26,9 @@ sS'Donate' p13 S'http://sufficientlysecure.org/index.php/adaway' p14 -sS'id' +sS'Repo Type' p15 -S'org.adaway' +S'git' p16 sS'Description' p17 @@ -74,9 +74,9 @@ S'build:42' p38 aS'#RootCommands srclib needs changing on fdroidserver' p39 -aasS'Repo Type' +aasS'id' p40 -S'git' +S'org.adaway' p41 sS'Repo' p42 @@ -151,18 +151,19 @@ I00 sS'oldsdkloc' p77 I00 -sS'scanignore' +sS'gradleprops' p78 (lp79 -sS'patch' +sS'scanignore' p80 (lp81 -sS'srclibs' +sS'gradle' p82 -(lp83 -sS'output' -p84 -NsS'encoding' +I00 +sS'srclibs' +p83 +(lp84 +sS'encoding' p85 NsS'extlibs' p86 @@ -178,35 +179,35 @@ sS'subdir' p91 S'org_adaway/' p92 -sS'ndk_path' +sS'rm' p93 -g27 +(lp94 sS'kivy' -p94 +p95 I00 sS'build' -p95 +p96 g27 sS'forcevercode' -p96 +p97 I00 sS'preassemble' -p97 -(lp98 +p98 +(lp99 sS'update' -p99 -(lp100 +p100 +(lp101 S'auto' -p101 -asS'maven' p102 -I00 -sS'disable' +asS'maven' p103 I00 -sS'rm' +sS'disable' p104 -(lp105 +I00 +sS'ndk_path' +p105 +g27 sS'scandelete' p106 (lp107 @@ -225,42 +226,42 @@ NsS'type' p114 S'ant' p115 -sS'antcommands' +sS'commit' p116 -NsS'gradle' +S'ea5378a94ee0dc1d99d2cec95fae7e6d81afb2b9' p117 -I00 -sS'prebuild' +sS'antcommands' p118 +NsS'patch' +p119 +(lp120 +sS'prebuild' +p121 g27 sS'novcheck' -p119 +p122 I00 -sS'commit' -p120 -S'ea5378a94ee0dc1d99d2cec95fae7e6d81afb2b9' -p121 -sa(dp122 +sS'output' +p123 +Nsa(dp124 g73 I00 sg74 S'16' -p123 +p125 sg76 I00 sg77 I00 sg78 -g79 -sS'patch' -p124 -(lp125 -S'defprop.patch' -p126 -asg82 -g83 -sg84 -Nsg85 +(lp126 +sg80 +g81 +sg82 +I00 +sg83 +g84 +sg85 Nsg86 g87 sg88 @@ -273,23 +274,23 @@ p128 S'org_adaway/' p129 sg93 -g27 -sg94 -I00 +g94 sg95 -g27 +I00 sg96 -I00 +g27 sg97 -g98 -sg99 -g100 -sg102 I00 +sg98 +g99 +sg100 +g101 sg103 I00 sg104 -g105 +I00 +sg105 +g27 sg106 g107 sS'buildjni' @@ -301,633 +302,581 @@ g112 sg113 Nsg114 g115 -sg116 -Nsg117 -I00 -sg118 -g27 -sg119 -I00 sS'commit' p132 S'4128e59da2eac5c2904c7c7568d298ca51e79540' p133 -sa(dp134 +sg118 +NsS'patch' +p134 +(lp135 +S'defprop.patch' +p136 +asg121 +g27 +sg122 +I00 +sg123 +Nsa(dp137 g73 I00 sg74 S'19' -p135 +p138 sg76 I00 sg77 I00 sg78 -g79 -sS'patch' -p136 -(lp137 -S'defprop.patch' -p138 -asg82 -g83 -sg84 -Nsg85 +(lp139 +sg80 +g81 +sg82 +I00 +sg83 +g84 +sg85 Nsg86 g87 sg88 g27 sg89 S'1.18' -p139 -sS'subdir' p140 -S'org_adaway/' +sS'subdir' p141 +S'org_adaway/' +p142 sg93 -g27 -sg94 -I00 +g94 sg95 -g27 +I00 sg96 -I00 +g27 sg97 -g98 -sg99 -g100 -sg102 I00 +sg98 +g99 +sg100 +g101 sg103 I00 sg104 -g105 +I00 +sg105 +g27 sg106 g107 sS'buildjni' -p142 -(lp143 +p143 +(lp144 g110 asg111 g112 sg113 Nsg114 g115 -sg116 -Nsg117 -I00 -sg118 -g27 -sg119 -I00 sS'commit' -p144 -S'0b9985398b9eef7baf6aadd0dbb12002bc199d2e' p145 -sa(dp146 +S'0b9985398b9eef7baf6aadd0dbb12002bc199d2e' +p146 +sg118 +NsS'patch' +p147 +(lp148 +S'defprop.patch' +p149 +asg121 +g27 +sg122 +I00 +sg123 +Nsa(dp150 g73 I00 sg74 S'20' -p147 +p151 sg76 I00 sg77 I00 sg78 -g79 -sS'patch' -p148 -(lp149 -S'defprop.patch' -p150 -asg82 -g83 -sg84 -Nsg85 +(lp152 +sg80 +g81 +sg82 +I00 +sg83 +g84 +sg85 Nsg86 g87 sg88 g27 sg89 S'1.19' -p151 -sS'subdir' -p152 -S'org_adaway/' p153 +sS'subdir' +p154 +S'org_adaway/' +p155 sg93 -g27 -sg94 -I00 +g94 sg95 -g27 +I00 sg96 -I00 +g27 sg97 -g98 -sg99 -g100 -sg102 I00 +sg98 +g99 +sg100 +g101 sg103 I00 sg104 -g105 +I00 +sg105 +g27 sg106 g107 sS'buildjni' -p154 -(lp155 +p156 +(lp157 g110 asg111 g112 sg113 Nsg114 g115 -sg116 -Nsg117 -I00 -sg118 -g27 -sg119 -I00 sS'commit' -p156 +p158 S'ab27f4dab5f3ea5e228cfb4a6b0e1fbf53695f22' -p157 -sa(dp158 +p159 +sg118 +NsS'patch' +p160 +(lp161 +S'defprop.patch' +p162 +asg121 +g27 +sg122 +I00 +sg123 +Nsa(dp163 g73 I00 sg74 S'21' -p159 +p164 sg76 I00 sg77 I00 sg78 -g79 -sS'patch' -p160 -(lp161 -S'defprop.patch' -p162 -asg82 -g83 -sg84 -Nsg85 +(lp165 +sg80 +g81 +sg82 +I00 +sg83 +g84 +sg85 Nsg86 g87 sg88 g27 sg89 S'1.20' -p163 +p166 sS'subdir' -p164 +p167 S'org_adaway/' -p165 +p168 sg93 -g27 -sg94 -I00 +g94 sg95 -g27 +I00 sg96 -I00 +g27 sg97 -g98 -sg99 -g100 -sg102 I00 +sg98 +g99 +sg100 +g101 sg103 I00 sg104 -g105 +I00 +sg105 +g27 sg106 g107 sS'buildjni' -p166 -(lp167 +p169 +(lp170 g110 asg111 g112 sg113 Nsg114 g115 -sg116 -Nsg117 -I00 -sg118 -g27 -sg119 -I00 sS'commit' -p168 +p171 S'695e3801e4081026c8f7213a2345fc451d5eb89c' -p169 -sa(dp170 +p172 +sg118 +NsS'patch' +p173 +(lp174 +S'defprop.patch' +p175 +asg121 +g27 +sg122 +I00 +sg123 +Nsa(dp176 g73 I00 sg74 S'22' -p171 +p177 sg76 I00 sg77 I00 sg78 -g79 -sS'patch' -p172 -(lp173 -S'defprop.patch' -p174 -asg82 -g83 -sg84 -Nsg85 +(lp178 +sg80 +g81 +sg82 +I00 +sg83 +g84 +sg85 Nsg86 g87 sg88 g27 sg89 S'1.21' -p175 +p179 sS'subdir' -p176 +p180 S'org_adaway/' -p177 +p181 sg93 -g27 -sg94 -I00 +g94 sg95 -g27 +I00 sg96 -I00 +g27 sg97 -g98 -sg99 -g100 -sg102 I00 +sg98 +g99 +sg100 +g101 sg103 I00 sg104 -g105 +I00 +sg105 +g27 sg106 g107 sS'buildjni' -p178 -(lp179 +p182 +(lp183 g110 asg111 g112 sg113 Nsg114 g115 -sg116 -Nsg117 -I00 -sg118 -g27 -sg119 -I00 sS'commit' -p180 +p184 S'65138c11cc8b6affd28b68e125fbc1dff0886a4e' -p181 -sa(dp182 +p185 +sg118 +NsS'patch' +p186 +(lp187 +S'defprop.patch' +p188 +asg121 +g27 +sg122 +I00 +sg123 +Nsa(dp189 g73 I00 sg74 S'24' -p183 +p190 sg76 I00 sg77 I00 sg78 -g79 +(lp191 sg80 g81 sg82 -g83 -sg84 -Nsg85 +I00 +sg83 +g84 +sg85 Nsg86 g87 sg88 g27 sg89 S'1.23' -p184 +p192 sS'subdir' -p185 +p193 Nsg93 -g27 -sg94 -I00 +g94 sg95 -g27 -sg96 I00 +sg96 +g27 sg97 -g98 -sg99 -g100 -sg102 +I00 +sg98 +g99 +sg100 +g101 +sg103 I00 sS'disable' -p186 +p194 S'no source in repo' -p187 -sg104 -g105 +p195 +sg105 +g27 sg106 g107 sS'buildjni' -p188 -(lp189 +p196 +(lp197 sg111 g112 sg113 Nsg114 g115 -sg116 -Nsg117 -I00 -sg118 -g27 -sg119 -I00 sS'commit' -p190 +p198 S'unknown - see disabled' -p191 -sa(dp192 +p199 +sg118 +Nsg119 +g120 +sg121 +g27 +sg122 +I00 +sg123 +Nsa(dp200 g73 I00 sg74 S'25' -p193 +p201 sg76 I00 sg77 I00 sg78 -g79 +(lp202 sg80 g81 sg82 -g83 -sg84 -Nsg85 +I00 +sg83 +g84 +sg85 Nsg86 g87 sg88 g27 sg89 S'1.24' -p194 +p203 sS'subdir' -p195 +p204 S'org_adaway/' -p196 +p205 sg93 -g27 -sg94 -I00 +g94 sg95 -g27 +I00 sg96 -I00 +g27 sg97 -g98 -sg99 -g100 -sg102 I00 +sg98 +g99 +sg100 +g101 sg103 I00 sg104 -g105 +I00 +sg105 +g27 sg106 g107 sS'buildjni' -p197 -(lp198 +p206 +(lp207 g110 asg111 g112 sg113 Nsg114 g115 -sg116 -Nsg117 -I00 -sS'prebuild' -p199 -S'android update project -p ../com_actionbarsherlock' -p200 -sg119 -I00 sS'commit' -p201 +p208 S'f811e53e1e1d2ee047b18715fd7d2072b90ae76b' -p202 -sa(dp203 +p209 +sg118 +Nsg119 +g120 +sS'prebuild' +p210 +S'android update project -p ../com_actionbarsherlock' +p211 +sg122 +I00 +sg123 +Nsa(dp212 g73 I00 sg74 S'26' -p204 +p213 sg76 I00 sg77 I00 sg78 -g79 +(lp214 sg80 g81 sg82 -g83 -sg84 -Nsg85 +I00 +sg83 +g84 +sg85 Nsg86 g87 sg88 g27 sg89 S'1.25' -p205 +p215 sS'subdir' -p206 +p216 S'org_adaway/' -p207 +p217 sg93 -g27 -sg94 -I00 +g94 sg95 -g27 +I00 sg96 -I00 +g27 sg97 -g98 -sg99 -g100 -sg102 I00 +sg98 +g99 +sg100 +g101 sg103 I00 sg104 -g105 +I00 +sg105 +g27 sg106 g107 sS'buildjni' -p208 -(lp209 +p218 +(lp219 g110 asg111 g112 sg113 Nsg114 g115 -sg116 -Nsg117 -I00 -sS'prebuild' -p210 -S'android update project -p ../com_actionbarsherlock' -p211 -sg119 -I00 sS'commit' -p212 +p220 S'ff97932761cdee68638dc2550751a64b2cbe18e7' -p213 -sa(dp214 +p221 +sg118 +Nsg119 +g120 +sS'prebuild' +p222 +S'android update project -p ../com_actionbarsherlock' +p223 +sg122 +I00 +sg123 +Nsa(dp224 g73 I00 sg74 S'27' -p215 +p225 sg76 I00 sg77 I00 sg78 -g79 +(lp226 sg80 g81 sg82 -g83 -sg84 -Nsg85 +I00 +sg83 +g84 +sg85 Nsg86 g87 sg88 g27 sg89 S'1.26' -p216 -sS'subdir' -p217 -S'org_adaway/' -p218 -sg93 -g27 -sg94 -I00 -sg95 -g27 -sg96 -I00 -sg97 -g98 -sg99 -g100 -sg102 -I00 -sg103 -I00 -sg104 -g105 -sg106 -g107 -sS'buildjni' -p219 -(lp220 -g110 -asg111 -g112 -sg113 -Nsg114 -g115 -sg116 -Nsg117 -I00 -sS'prebuild' -p221 -S'android update project -p ../com_actionbarsherlock' -p222 -sg119 -I00 -sS'commit' -p223 -S'33d4d80998f30bafc88c04c80cbae00b03916f99' -p224 -sa(dp225 -g73 -I00 -sg74 -S'28' -p226 -sg76 -I00 -sg77 -I00 -sg78 -g79 -sg80 -g81 -sg82 -g83 -sg84 -Nsg85 -Nsg86 -g87 -sg88 -g27 -sg89 -S'1.27' p227 sS'subdir' p228 S'org_adaway/' p229 sg93 -g27 -sg94 -I00 +g94 sg95 -g27 +I00 sg96 -I00 +g27 sg97 -g98 -sg99 -g100 -sg102 I00 +sg98 +g99 +sg100 +g101 sg103 I00 sg104 -g105 +I00 +sg105 +g27 sg106 g107 sS'buildjni' @@ -939,1300 +888,1408 @@ g112 sg113 Nsg114 g115 -sg116 -Nsg117 -I00 -sS'prebuild' -p232 -S'android update project -p ../com_actionbarsherlock' -p233 -sg119 -I00 sS'commit' +p232 +S'33d4d80998f30bafc88c04c80cbae00b03916f99' +p233 +sg118 +Nsg119 +g120 +sS'prebuild' p234 -S'743d25a7e287505461f33f4b8e57e4cf988fffea' +S'android update project -p ../com_actionbarsherlock' p235 -sa(dp236 +sg122 +I00 +sg123 +Nsa(dp236 g73 I00 sg74 -S'30' +S'28' p237 sg76 I00 sg77 I00 sg78 -g79 +(lp238 sg80 g81 sg82 -g83 -sg84 -Nsg85 +I00 +sg83 +g84 +sg85 +Nsg86 +g87 +sg88 +g27 +sg89 +S'1.27' +p239 +sS'subdir' +p240 +S'org_adaway/' +p241 +sg93 +g94 +sg95 +I00 +sg96 +g27 +sg97 +I00 +sg98 +g99 +sg100 +g101 +sg103 +I00 +sg104 +I00 +sg105 +g27 +sg106 +g107 +sS'buildjni' +p242 +(lp243 +g110 +asg111 +g112 +sg113 +Nsg114 +g115 +sS'commit' +p244 +S'743d25a7e287505461f33f4b8e57e4cf988fffea' +p245 +sg118 +Nsg119 +g120 +sS'prebuild' +p246 +S'android update project -p ../com_actionbarsherlock' +p247 +sg122 +I00 +sg123 +Nsa(dp248 +g73 +I00 +sg74 +S'30' +p249 +sg76 +I00 +sg77 +I00 +sg78 +(lp250 +sg80 +g81 +sg82 +I00 +sg83 +g84 +sg85 Nsg86 g87 sg88 g27 sg89 S'1.29' -p238 +p251 sS'subdir' -p239 +p252 S'org_adaway/' -p240 +p253 sg93 -g27 -sg94 -I00 +g94 sg95 -g27 +I00 sg96 -I00 +g27 sg97 -g98 -sg99 -g100 -sg102 I00 +sg98 +g99 +sg100 +g101 sg103 I00 sg104 -g105 +I00 +sg105 +g27 sg106 g107 sS'buildjni' -p241 -(lp242 +p254 +(lp255 g110 asg111 g112 sg113 Nsg114 g115 -sg116 -Nsg117 -I00 -sS'prebuild' -p243 -S'android update project -p ../com_actionbarsherlock && rm -rf libs/armeabi/*' -p244 -sg119 -I00 sS'commit' -p245 +p256 S'eaa07f4' -p246 -sa(dp247 +p257 +sg118 +Nsg119 +g120 +sS'prebuild' +p258 +S'android update project -p ../com_actionbarsherlock && rm -rf libs/armeabi/*' +p259 +sg122 +I00 +sg123 +Nsa(dp260 g73 I00 sg74 S'33' -p248 +p261 sg76 I00 sg77 I00 sg78 -g79 +(lp262 sg80 g81 sg82 -g83 -sg84 -Nsg85 +I00 +sg83 +g84 +sg85 Nsg86 g87 sg88 g27 sg89 S'1.32' -p249 +p263 sS'subdir' -p250 +p264 S'org_adaway/' -p251 +p265 sg93 -g27 -sg94 -I00 +g94 sg95 -g27 +I00 sg96 -I00 +g27 sg97 -g98 -sg99 -g100 -sg102 I00 +sg98 +g99 +sg100 +g101 sg103 I00 sg104 -g105 +I00 +sg105 +g27 sg106 g107 sS'buildjni' -p252 -(lp253 +p266 +(lp267 S'no' -p254 +p268 asg111 g112 sg113 Nsg114 g115 -sg116 -Nsg117 -I00 -sS'prebuild' -p255 -S'android update project -p ../com_actionbarsherlock && rm -rf libs/armeabi/* && rm libs/android-support-v4.jar' -p256 -sg119 -I00 sS'commit' -p257 +p269 S'71ced3f' -p258 -sa(dp259 +p270 +sg118 +Nsg119 +g120 +sS'prebuild' +p271 +S'android update project -p ../com_actionbarsherlock && rm -rf libs/armeabi/* && rm libs/android-support-v4.jar' +p272 +sg122 +I00 +sg123 +Nsa(dp273 g73 I00 sg74 S'34' -p260 +p274 sg76 I00 sg77 I00 sg78 -g79 +(lp275 sg80 g81 sg82 -g83 -sg84 -Nsg85 +I00 +sg83 +g84 +sg85 Nsg86 g87 sg88 g27 sg89 S'1.33' -p261 +p276 sS'subdir' -p262 +p277 S'org_adaway/' -p263 +p278 sg93 -g27 -sg94 -I00 +g94 sg95 -g27 +I00 sg96 -I00 +g27 sg97 -g98 -sg99 -g100 -sg102 I00 +sg98 +g99 +sg100 +g101 sg103 I00 sg104 -g105 +I00 +sg105 +g27 sg106 g107 sS'buildjni' -p264 -(lp265 -g254 +p279 +(lp280 +g268 asg111 g112 sg113 Nsg114 g115 -sg116 -Nsg117 -I00 -sS'prebuild' -p266 -S'android update project -p ../com_actionbarsherlock && rm -rf libs/armeabi/*' -p267 -sg119 -I00 sS'commit' -p268 +p281 S'9d63c18' -p269 -sa(dp270 +p282 +sg118 +Nsg119 +g120 +sS'prebuild' +p283 +S'android update project -p ../com_actionbarsherlock && rm -rf libs/armeabi/*' +p284 +sg122 +I00 +sg123 +Nsa(dp285 g73 I00 sg74 S'35' -p271 +p286 sg76 I00 sg77 I00 sg78 -g79 +(lp287 sg80 g81 sg82 -g83 -sg84 -Nsg85 +I00 +sg83 +g84 +sg85 Nsg86 g87 sg88 g27 sg89 S'1.34' -p272 +p288 sS'subdir' -p273 +p289 S'org_adaway/' -p274 +p290 sg93 -g27 -sg94 -I00 +g94 sg95 -g27 +I00 sg96 -I00 +g27 sg97 -g98 -sg99 -g100 -sg102 I00 +sg98 +g99 +sg100 +g101 sg103 I00 sg104 -g105 +I00 +sg105 +g27 sg106 g107 sS'buildjni' -p275 -(lp276 -g254 +p291 +(lp292 +g268 asg111 g112 sg113 Nsg114 g115 -sg116 -Nsg117 -I00 -sS'prebuild' -p277 -S'android update project -p ../com_actionbarsherlock && rm -rf libs/armeabi/* && android update project -p ../org_donations' -p278 -sg119 -I00 sS'commit' -p279 +p293 S'f2568b1' -p280 -sa(dp281 +p294 +sg118 +Nsg119 +g120 +sS'prebuild' +p295 +S'android update project -p ../com_actionbarsherlock && rm -rf libs/armeabi/* && android update project -p ../org_donations' +p296 +sg122 +I00 +sg123 +Nsa(dp297 g73 I00 sg74 S'36' -p282 +p298 sg76 I00 sg77 I00 sg78 -g79 +(lp299 sg80 g81 sg82 -g83 -sg84 -Nsg85 +I00 +sg83 +g84 +sg85 Nsg86 g87 sg88 g27 sg89 S'1.35' -p283 +p300 sS'subdir' -p284 +p301 S'org_adaway/' -p285 +p302 sg93 -g27 -sg94 -I00 +g94 sg95 -g27 +I00 sg96 -I00 +g27 sg97 -g98 -sg99 -g100 -sg102 I00 +sg98 +g99 +sg100 +g101 sg103 I00 sg104 -g105 +I00 +sg105 +g27 sg106 g107 sS'buildjni' -p286 -(lp287 -g254 +p303 +(lp304 +g268 asg111 g112 sg113 Nsg114 g115 -sg116 -Nsg117 -I00 -sS'prebuild' -p288 -S'android update project -p ../com_actionbarsherlock && rm -rf libs/armeabi/* && android update project -p ../org_donations' -p289 -sg119 -I00 sS'commit' -p290 +p305 S'7442d5d' -p291 -sa(dp292 +p306 +sg118 +Nsg119 +g120 +sS'prebuild' +p307 +S'android update project -p ../com_actionbarsherlock && rm -rf libs/armeabi/* && android update project -p ../org_donations' +p308 +sg122 +I00 +sg123 +Nsa(dp309 g73 I00 sg74 S'37' -p293 +p310 sg76 I00 sg77 I00 sg78 -g79 +(lp311 sg80 g81 sg82 -g83 -sg84 -Nsg85 +I00 +sg83 +g84 +sg85 Nsg86 g87 sg88 g27 sg89 S'1.36' -p294 +p312 sS'subdir' -p295 +p313 S'org_adaway/' -p296 +p314 sg93 -g27 -sg94 -I00 +g94 sg95 -g27 +I00 sg96 -I00 +g27 sg97 -g98 -sg99 -g100 -sg102 I00 +sg98 +g99 +sg100 +g101 sg103 I00 sg104 -g105 +I00 +sg105 +g27 sg106 g107 sS'buildjni' -p297 -(lp298 -g254 +p315 +(lp316 +g268 asg111 g112 sg113 Nsg114 g115 -sg116 -Nsg117 -I00 -sS'prebuild' -p299 -S'android update project -p ../com_actionbarsherlock && rm -rf libs/armeabi/* && android update project -p ../org_donations' -p300 -sg119 -I00 sS'commit' -p301 +p317 S'83fc713' -p302 -sa(dp303 +p318 +sg118 +Nsg119 +g120 +sS'prebuild' +p319 +S'android update project -p ../com_actionbarsherlock && rm -rf libs/armeabi/* && android update project -p ../org_donations' +p320 +sg122 +I00 +sg123 +Nsa(dp321 g73 I00 sg74 S'38' -p304 +p322 sg76 I00 sg77 I00 sg78 -g79 +(lp323 sg80 g81 sg82 -g83 -sg84 -Nsg85 +I00 +sg83 +g84 +sg85 Nsg86 g87 sg88 g27 sg89 S'1.37' -p305 +p324 sS'subdir' -p306 +p325 S'org_adaway/' -p307 +p326 sg93 -g27 -sg94 -I00 +g94 sg95 -g27 +I00 sg96 -I00 +g27 sg97 -g98 -sg99 -g100 -sg102 I00 +sg98 +g99 +sg100 +g101 sg103 I00 sg104 -g105 +I00 +sg105 +g27 sg106 g107 sS'buildjni' -p308 -(lp309 -g254 +p327 +(lp328 +g268 asg111 g112 sg113 Nsg114 g115 -sg116 -Nsg117 -I00 -sS'prebuild' -p310 -S'android update project -p ../com_actionbarsherlock && rm -rf libs/armeabi/* && android update project -p ../org_donations' -p311 -sg119 -I00 sS'commit' -p312 +p329 S'70da32b567122b701cdcb1609b780eb85732028f' -p313 -sa(dp314 +p330 +sg118 +Nsg119 +g120 +sS'prebuild' +p331 +S'android update project -p ../com_actionbarsherlock && rm -rf libs/armeabi/* && android update project -p ../org_donations' +p332 +sg122 +I00 +sg123 +Nsa(dp333 g73 I00 sg74 S'40' -p315 +p334 sg76 I00 sg77 I00 sg78 -g79 +(lp335 sg80 g81 +sg82 +I00 sS'srclibs' -p316 -(lp317 +p336 +(lp337 S'RootCommands@c940b0e503' -p318 -asg84 -Nsg85 +p338 +asg85 NsS'extlibs' -p319 -(lp320 +p339 +(lp340 S'htmlcleaner/htmlcleaner-2.2.jar' -p321 +p341 asS'init' -p322 +p342 S'rm android-libs/Donations/custom_rules.xml && git clone https://github.com/dschuermann/HtmlSpanner android-libs/HtmlSpanner' -p323 +p343 sg89 S'2.1' -p324 +p344 sS'subdir' -p325 +p345 S'AdAway' -p326 +p346 sg93 -g27 -sg94 -I00 +g94 sg95 -g27 +I00 sg96 -I00 +g27 sg97 -g98 -sS'update' -p327 -(lp328 -S'.' -p329 -aS'android-libs/Donations' -p330 -aS'android-libs/ActionBarSherlock' -p331 -aS'android-libs/HtmlSpanner/htmlspanner' -p332 -asg102 I00 -sg103 +sg98 +g99 +sS'update' +p347 +(lp348 +S'.' +p349 +aS'android-libs/Donations' +p350 +aS'android-libs/ActionBarSherlock' +p351 +aS'android-libs/HtmlSpanner/htmlspanner' +p352 +asg103 I00 sg104 -g105 +I00 +sg105 +g27 sg106 g107 sS'buildjni' -p333 -(lp334 +p353 +(lp354 g110 asg111 g112 sg113 Nsg114 g115 -sg116 -Nsg117 -I00 -sS'prebuild' -p335 -S'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/' -p336 -sg119 -I00 sS'commit' -p337 +p355 S'v2.1' -p338 -sa(dp339 +p356 +sg118 +Nsg119 +g120 +sS'prebuild' +p357 +S'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/' +p358 +sg122 +I00 +sg123 +Nsa(dp359 g73 I00 sg74 S'42' -p340 +p360 sg76 I00 sg77 I00 sg78 -g79 +(lp361 sg80 g81 +sg82 +I00 sS'srclibs' -p341 -(lp342 +p362 +(lp363 S'RootCommands@c940b0e503' -p343 -asg84 -Nsg85 +p364 +asg85 NsS'extlibs' -p344 -(lp345 +p365 +(lp366 S'htmlcleaner/htmlcleaner-2.2.jar' -p346 +p367 asS'init' -p347 +p368 S'rm android-libs/Donations/custom_rules.xml && git clone https://github.com/dschuermann/HtmlSpanner android-libs/HtmlSpanner' -p348 +p369 sg89 S'2.3' -p349 +p370 sS'subdir' -p350 +p371 S'AdAway' -p351 +p372 sg93 -g27 -sg94 -I00 +g94 sg95 -g27 +I00 sg96 -I00 +g27 sg97 -g98 -sS'update' -p352 -(lp353 -g329 -aS'android-libs/Donations' -p354 -aS'android-libs/ActionBarSherlock' -p355 -aS'android-libs/HtmlSpanner/htmlspanner' -p356 -asg102 I00 -sg103 +sg98 +g99 +sS'update' +p373 +(lp374 +g349 +aS'android-libs/Donations' +p375 +aS'android-libs/ActionBarSherlock' +p376 +aS'android-libs/HtmlSpanner/htmlspanner' +p377 +asg103 I00 sg104 -g105 +I00 +sg105 +g27 sg106 g107 sS'buildjni' -p357 -(lp358 +p378 +(lp379 g110 asg111 g112 sg113 Nsg114 g115 -sg116 -Nsg117 -I00 -sS'prebuild' -p359 -S'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/' -p360 -sg119 -I00 sS'commit' -p361 +p380 S'v2.3' -p362 -sa(dp363 +p381 +sg118 +Nsg119 +g120 +sS'prebuild' +p382 +S'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/' +p383 +sg122 +I00 +sg123 +Nsa(dp384 g73 I00 sg74 S'45' -p364 +p385 sg76 I00 sg77 I00 sg78 -g79 -sS'gradle' -p365 -(lp366 -g110 -asg82 -g83 -sg84 -Nsg85 +(lp386 +sg80 +g81 +sg119 +g120 +sg83 +g84 +sg85 Nsg86 g87 sg88 g27 sg89 S'2.6' -p367 +p387 sS'subdir' -p368 +p388 S'AdAway' -p369 +p389 sg93 -g27 -sg94 -I00 +g94 sg95 -g27 +I00 sg96 +g27 +sg97 I00 sS'preassemble' -p370 -(lp371 +p390 +(lp391 S'renameExecutables' -p372 -asg99 -g100 -sg102 -I00 +p392 +asg100 +g101 sg103 I00 sg104 -g105 +I00 +sg105 +g27 sg106 g107 sS'buildjni' -p373 -(lp374 +p393 +(lp394 g110 asg111 g112 sg113 Nsg114 -g117 -sg116 -Nsg80 -g81 -sg118 -g27 -sg119 -I00 +g82 sS'commit' -p375 +p395 S'v2.6' -p376 -sa(dp377 +p396 +sg118 +NsS'gradle' +p397 +(lp398 +g110 +asg121 +g27 +sg122 +I00 +sg123 +Nsa(dp399 g73 I00 sg74 S'46' -p378 +p400 sg76 I00 sg77 I00 sg78 -g79 -sS'gradle' -p379 -(lp380 -g110 -asg82 -g83 -sg84 -Nsg85 +(lp401 +sg80 +g81 +sg119 +g120 +sg83 +g84 +sg85 Nsg86 g87 sg88 g27 sg89 S'2.7' -p381 +p402 sS'subdir' -p382 +p403 S'AdAway' -p383 +p404 sg93 -g27 -sg94 -I00 +g94 sg95 -g27 +I00 sg96 +g27 +sg97 I00 sS'preassemble' -p384 -(lp385 +p405 +(lp406 S'renameExecutables' -p386 -asg99 -g100 -sg102 -I00 +p407 +asg100 +g101 sg103 I00 sg104 -g105 +I00 +sg105 +g27 sg106 g107 sS'buildjni' -p387 -(lp388 +p408 +(lp409 g110 asg111 g112 sg113 Nsg114 -g117 -sg116 -Nsg80 -g81 -sg118 -g27 -sg119 -I00 +g82 sS'commit' -p389 +p410 S'v2.7' -p390 -sa(dp391 +p411 +sg118 +NsS'gradle' +p412 +(lp413 +g110 +asg121 +g27 +sg122 +I00 +sg123 +Nsa(dp414 g73 I00 sg74 S'47' -p392 +p415 sg76 I00 sg77 I00 sg78 -g79 -sS'gradle' -p393 -(lp394 -g110 -asg82 -g83 -sg84 -Nsg85 +(lp416 +sg80 +g81 +sg119 +g120 +sg83 +g84 +sg85 Nsg86 g87 sg88 g27 sg89 S'2.8' -p395 +p417 sS'subdir' -p396 +p418 S'AdAway' -p397 +p419 sg93 -g27 -sg94 -I00 +g94 sg95 -g27 +I00 sg96 +g27 +sg97 I00 sS'preassemble' -p398 -(lp399 +p420 +(lp421 S'renameExecutables' -p400 -asg99 -g100 -sg102 -I00 +p422 +asg100 +g101 sg103 I00 sg104 -g105 +I00 +sg105 +g27 sg106 g107 sS'buildjni' -p401 -(lp402 +p423 +(lp424 g110 asg111 g112 sg113 Nsg114 -g117 -sg116 -Nsg80 -g81 -sg118 -g27 -sg119 -I00 +g82 sS'commit' -p403 +p425 S'v2.8' -p404 -sa(dp405 +p426 +sg118 +NsS'gradle' +p427 +(lp428 +g110 +asg121 +g27 +sg122 +I00 +sg123 +Nsa(dp429 g73 I00 sg74 S'48' -p406 +p430 sg76 I00 sg77 I00 sg78 -g79 -sS'gradle' -p407 -(lp408 -g110 -asg82 -g83 -sg84 -Nsg85 +(lp431 +sg80 +g81 +sg119 +g120 +sg83 +g84 +sg85 Nsg86 g87 sg88 g27 sg89 S'2.8.1' -p409 +p432 sS'subdir' -p410 +p433 S'AdAway' -p411 +p434 sg93 -g27 -sg94 -I00 +g94 sg95 -g27 +I00 sg96 +g27 +sg97 I00 sS'preassemble' -p412 -(lp413 +p435 +(lp436 S'renameExecutables' -p414 -asg99 -g100 -sg102 -I00 +p437 +asg100 +g101 sg103 I00 sg104 -g105 +I00 +sg105 +g27 sg106 g107 sS'buildjni' -p415 -(lp416 +p438 +(lp439 g110 asg111 g112 sg113 Nsg114 -g117 -sg116 -Nsg80 -g81 -sg118 -g27 -sg119 -I00 +g82 sS'commit' -p417 +p440 S'v2.8.1' -p418 -sa(dp419 +p441 +sg118 +NsS'gradle' +p442 +(lp443 +g110 +asg121 +g27 +sg122 +I00 +sg123 +Nsa(dp444 g73 I00 sg74 S'49' -p420 +p445 sg76 I00 sg77 I00 sg78 -g79 -sS'gradle' -p421 -(lp422 -g110 -asg82 -g83 -sg84 -Nsg85 +(lp446 +sg80 +g81 +sg119 +g120 +sg83 +g84 +sg85 Nsg86 g87 sg88 g27 sg89 S'2.9' -p423 +p447 sS'subdir' -p424 +p448 S'AdAway' -p425 +p449 sg93 -g27 -sg94 -I00 +g94 sg95 -g27 +I00 sg96 +g27 +sg97 I00 sS'preassemble' -p426 -(lp427 +p450 +(lp451 S'renameExecutables' -p428 -asg99 -g100 -sg102 -I00 +p452 +asg100 +g101 sg103 I00 sg104 -g105 +I00 +sg105 +g27 sg106 g107 sS'buildjni' -p429 -(lp430 +p453 +(lp454 g110 asg111 g112 sg113 Nsg114 -g117 -sg116 -Nsg80 -g81 -sg118 -g27 -sg119 -I00 +g82 sS'commit' -p431 +p455 S'v2.9' -p432 -sa(dp433 +p456 +sg118 +NsS'gradle' +p457 +(lp458 +g110 +asg121 +g27 +sg122 +I00 +sg123 +Nsa(dp459 g73 I00 sg74 S'50' -p434 +p460 sg76 I00 sg77 I00 sg78 -g79 -sS'gradle' -p435 -(lp436 -g110 -asg82 -g83 -sg84 -Nsg85 +(lp461 +sg80 +g81 +sg119 +g120 +sg83 +g84 +sg85 Nsg86 g87 sg88 g27 sg89 S'2.9.1' -p437 +p462 sS'subdir' -p438 +p463 S'AdAway' -p439 +p464 sg93 -g27 -sg94 -I00 +g94 sg95 -g27 +I00 sg96 +g27 +sg97 I00 sS'preassemble' -p440 -(lp441 +p465 +(lp466 S'renameExecutables' -p442 -asg99 -g100 -sg102 -I00 +p467 +asg100 +g101 sg103 I00 sg104 -g105 +I00 +sg105 +g27 sg106 g107 sS'buildjni' -p443 -(lp444 +p468 +(lp469 g110 asg111 g112 sg113 Nsg114 -g117 -sg116 -Nsg80 -g81 -sg118 -g27 -sg119 -I00 +g82 sS'commit' -p445 +p470 S'v2.9.1' -p446 -sa(dp447 +p471 +sg118 +NsS'gradle' +p472 +(lp473 +g110 +asg121 +g27 +sg122 +I00 +sg123 +Nsa(dp474 g73 I00 sg74 S'51' -p448 +p475 sg76 I00 sg77 I00 sg78 -g79 -sS'gradle' -p449 -(lp450 -g110 -asg82 -g83 -sg84 -Nsg85 +(lp476 +sg80 +g81 +sg119 +g120 +sg83 +g84 +sg85 Nsg86 g87 sg88 g27 sg89 S'2.9.2' -p451 +p477 sS'subdir' -p452 +p478 S'AdAway' -p453 +p479 sg93 -g27 -sg94 -I00 +g94 sg95 -g27 +I00 sg96 +g27 +sg97 I00 sS'preassemble' -p454 -(lp455 +p480 +(lp481 S'renameExecutables' -p456 -asg99 -g100 -sg102 -I00 +p482 +asg100 +g101 sg103 I00 sg104 -g105 +I00 +sg105 +g27 sg106 g107 sS'buildjni' -p457 -(lp458 +p483 +(lp484 g110 asg111 g112 sg113 Nsg114 -g117 -sg116 -Nsg80 -g81 -sg118 -g27 -sg119 -I00 +g82 sS'commit' -p459 +p485 S'v2.9.2' -p460 -sa(dp461 +p486 +sg118 +NsS'gradle' +p487 +(lp488 +g110 +asg121 +g27 +sg122 +I00 +sg123 +Nsa(dp489 g73 I00 sg74 S'52' -p462 +p490 sg76 I00 sg77 I00 sg78 -g79 -sS'gradle' -p463 -(lp464 -g110 -asg82 -g83 -sg84 -Nsg85 +(lp491 +sg80 +g81 +sg119 +g120 +sg83 +g84 +sg85 Nsg86 g87 sg88 g27 sg89 S'3.0' -p465 +p492 sS'subdir' -p466 +p493 S'AdAway' -p467 +p494 sg93 -g27 -sg94 -I00 +g94 sg95 -g27 +I00 sg96 +g27 +sg97 I00 sS'preassemble' -p468 -(lp469 +p495 +(lp496 S'renameExecutables' -p470 -asg99 -g100 -sg102 -I00 +p497 +asg100 +g101 sg103 I00 sg104 -g105 +I00 +sg105 +g27 sg106 g107 sS'buildjni' -p471 -(lp472 +p498 +(lp499 g110 asg111 g112 sg113 Nsg114 -g117 -sg116 -Nsg80 -g81 -sg118 -g27 -sg119 -I00 +g82 sS'commit' -p473 +p500 S'v3.0' -p474 -sasS'FlattrID' -p475 +p501 +sg118 +NsS'gradle' +p502 +(lp503 +g110 +asg121 +g27 +sg122 +I00 +sg123 +NsasS'FlattrID' +p504 S'369138' -p476 -sS'Disabled' -p477 -NsS'Update Check Name' -p478 -NsS'Vercode Operation' -p479 -NsS'Current Version' -p480 -S'3.0' -p481 +p505 sS'metadatapath' -p482 +p506 S'metadata/org.adaway.json' -p483 +p507 +sS'Disabled' +p508 +NsS'Update Check Name' +p509 +NsS'Vercode Operation' +p510 +NsS'Current Version' +p511 +S'3.0' +p512 s. \ No newline at end of file diff --git a/tests/metadata/org.smssecure.smssecure.pickle b/tests/metadata/org.smssecure.smssecure.pickle index 1d7f1b66..f872fade 100644 --- a/tests/metadata/org.smssecure.smssecure.pickle +++ b/tests/metadata/org.smssecure.smssecure.pickle @@ -126,13 +126,12 @@ I00 sS'oldsdkloc' p64 I00 -sS'kivy' +sS'antcommands' p65 -I00 -sS'patch' +NsS'scanignore' p66 (lp67 -sS'scanignore' +sS'patch' p68 (lp69 sS'srclibs' @@ -158,95 +157,98 @@ sS'version' p80 S'0.3.3' p81 -sS'subdir' -p82 -NsS'rm' -p83 -(lp84 -S'libs/*' -p85 -asS'type' -p86 -S'gradle' -p87 sS'build' -p88 +p82 g19 sS'ndk_path' -p89 +p83 g19 -sS'forcevercode' -p90 +sS'kivy' +p84 +I00 +sS'subdir' +p85 +NsS'forcevercode' +p86 I01 sS'preassemble' -p91 -(lp92 +p87 +(lp88 sS'update' -p93 -(lp94 +p89 +(lp90 S'auto' -p95 +p91 asS'maven' -p96 +p92 I00 sS'disable' -p97 +p93 S'builds, merge changes into upstream' +p94 +sS'rm' +p95 +(lp96 +S'libs/*' +p97 +asS'scandelete' p98 -sS'commit' -p99 -S'66367479a4f57f347b5cbe8f6f8f632adaae7727' -p100 -sS'scandelete' -p101 -(lp102 +(lp99 sS'buildjni' -p103 -(lp104 +p100 +(lp101 sS'ndk' -p105 +p102 S'r10e' -p106 +p103 sS'target' +p104 +NsS'type' +p105 +S'gradle' +p106 +sS'commit' p107 -NsS'antcommands' +S'66367479a4f57f347b5cbe8f6f8f632adaae7727' p108 -NsS'gradle' +sS'gradleprops' p109 (lp110 -S'yes' +sS'gradle' p111 -asS'prebuild' -p112 -S"touch signing.properties && pushd $$GradleWitness$$ && gradle jar && popd && cp $$GradleWitness$$/build/libs/GradleWitness.jar libs/gradle-witness.jar && sed -i -e '20,22d' build.gradle && pushd $$PreferenceFragment$$ && gradle uploadArchives && popd && sed -i -e '/5470f5872514a6226fa1fc6f4e000991f38805691c534cf0bd2778911fc773ad/d' build.gradle && mkdir smil && pushd smil && wget -c http://www.w3.org/TR/smil-boston-dom/java-binding.zip && unzip java-binding.zip && popd && cp -fR smil/java/org src/ && rm -fR smil && sed -i -e '/org.w3c.smil/d' build.gradle && cp -fR $$AospMms$$/src/org src/" +(lp112 +S'yes' p113 -sS'novcheck' +asS'prebuild' p114 +S"touch signing.properties && pushd $$GradleWitness$$ && gradle jar && popd && cp $$GradleWitness$$/build/libs/GradleWitness.jar libs/gradle-witness.jar && sed -i -e '20,22d' build.gradle && pushd $$PreferenceFragment$$ && gradle uploadArchives && popd && sed -i -e '/5470f5872514a6226fa1fc6f4e000991f38805691c534cf0bd2778911fc773ad/d' build.gradle && mkdir smil && pushd smil && wget -c http://www.w3.org/TR/smil-boston-dom/java-binding.zip && unzip java-binding.zip && popd && cp -fR smil/java/org src/ && rm -fR smil && sed -i -e '/org.w3c.smil/d' build.gradle && cp -fR $$AospMms$$/src/org src/" +p115 +sS'novcheck' +p116 I00 sS'output' -p115 -Nsa(dp116 -S'submodules' p117 +Nsa(dp118 +S'submodules' +p119 I01 sg61 S'6' -p118 +p120 sg63 I00 sg64 I00 sg65 -I00 -sg66 +Nsg66 g67 sg68 g69 sS'srclibs' -p119 -(lp120 -S'GradleWitness@10f1269c0aafdc1d478efc005ed48f3a47d44278' p121 +(lp122 +S'GradleWitness@10f1269c0aafdc1d478efc005ed48f3a47d44278' +p123 asg76 Nsg77 g78 @@ -254,75 +256,77 @@ sg79 g19 sg80 S'0.3.3' -p122 +p124 sg82 -NsS'rm' -p123 -(lp124 -S'libs/*.jar' -p125 -asg86 -g87 -sg88 g19 -sg89 +sg83 g19 -sS'forcevercode' -p126 +sg84 I00 -sg91 -g92 -sg93 -g94 -sg96 +sg85 +NsS'forcevercode' +p125 +I00 +sg87 +g88 +sg89 +g90 +sg92 I00 sS'disable' -p127 +p126 S'builds, wait for upstream' +p127 +sS'rm' p128 -sS'commit' -p129 -S'9675ce5eecb929dcaddb43b3d9486fdb88b9ae1a' +(lp129 +S'libs/*.jar' p130 -sg101 -g102 -sg103 -g104 -sg105 +asg98 +g99 +sg100 +g101 +sg102 +g103 +sg104 +Nsg105 g106 -sg107 -Nsg108 -NsS'gradle' +sS'commit' p131 -(lp132 -g111 -asS'prebuild' -p133 -S'touch signing.properties && pushd $$GradleWitness$$ && gradle jar && popd && cp $$GradleWitness$$/build/libs/GradleWitness.jar libs/gradle-witness.jar' +S'9675ce5eecb929dcaddb43b3d9486fdb88b9ae1a' +p132 +sg109 +(lp133 +sS'gradle' p134 -sg114 -I00 -sg115 -Nsa(dp135 -S'submodules' +(lp135 +g113 +asS'prebuild' p136 +S'touch signing.properties && pushd $$GradleWitness$$ && gradle jar && popd && cp $$GradleWitness$$/build/libs/GradleWitness.jar libs/gradle-witness.jar' +p137 +sg116 +I00 +sg117 +Nsa(dp138 +S'submodules' +p139 I01 sg61 S'9' -p137 +p140 sg63 I00 sg64 I00 sg65 -I00 -sg66 +Nsg66 g67 sg68 g69 sS'srclibs' -p138 -(lp139 +p141 +(lp142 sg76 Nsg77 g78 @@ -330,73 +334,75 @@ sg79 g19 sg80 S'0.4.2' -p140 -sg82 -NsS'rm' -p141 -(lp142 -S'libs/*.jar' p143 -asg86 -g87 -sg88 +sg82 g19 -sg89 +sg83 g19 -sg126 +sg84 I00 -sg91 -g92 -sg93 -g94 -sg96 +sg85 +Nsg125 +I00 +sg87 +g88 +sg89 +g90 +sg92 I00 sS'disable' p144 S'builds locally, but not on BS' p145 -sS'commit' +sS'rm' p146 -S'v0.4.2' -p147 -sg101 -g102 -sg103 -g104 -sg105 -g106 -sg107 -Nsg108 -NsS'gradle' +(lp147 +S'libs/*.jar' p148 -(lp149 -g111 -asS'prebuild' +asg98 +g99 +sg100 +g101 +sg102 +g103 +sg104 +Nsg105 +g106 +sS'commit' +p149 +S'v0.4.2' p150 +sg109 +(lp151 +sS'gradle' +p152 +(lp153 +g113 +asS'prebuild' +p154 S'touch signing.properties && ./build-witness.sh && rm -rf libs/gradle-witness/build && echo "org.gradle.jvmargs=-Xms512m -Xmx512m -XX:MaxPermSize=512m" >> gradle.properties' -p151 -sg114 +p155 +sg116 I00 -sg115 -Nsa(dp152 +sg117 +Nsa(dp156 S'submodules' -p153 +p157 I01 sg61 S'11' -p154 +p158 sg63 I00 sg64 I00 sg65 -I00 -sg66 +Nsg66 g67 sg68 g69 -sg138 -g139 +sg141 +g142 sg76 Nsg77 g78 @@ -404,72 +410,74 @@ sg79 g19 sg80 S'0.5.1' -p155 +p159 sg82 -NsS'rm' -p156 -(lp157 -S'libs/*.jar' -p158 -asg86 -g87 -sg88 g19 -sg89 +sg83 g19 -sg126 +sg84 I00 -sg91 -g92 -sg93 -g94 -sg96 +sg85 +Nsg125 +I00 +sg87 +g88 +sg89 +g90 +sg92 I00 sS'disable' -p159 -I00 -sS'commit' p160 -S'v0.5.1' -p161 -sg101 -g102 -sg103 -g104 -sg105 -g106 -sg107 -Nsg108 -NsS'gradle' -p162 -(lp163 -g111 -asS'prebuild' -p164 -S'touch signing.properties && ./build-witness.sh && rm -rf libs/gradle-witness/build && echo "org.gradle.jvmargs=-Xms512m -Xmx512m -XX:MaxPermSize=512m" >> gradle.properties' -p165 -sg114 I00 -sg115 -Nsa(dp166 -S'submodules' +sS'rm' +p161 +(lp162 +S'libs/*.jar' +p163 +asg98 +g99 +sg100 +g101 +sg102 +g103 +sg104 +Nsg105 +g106 +sS'commit' +p164 +S'v0.5.1' +p165 +sg109 +(lp166 +sS'gradle' p167 +(lp168 +g113 +asS'prebuild' +p169 +S'touch signing.properties && ./build-witness.sh && rm -rf libs/gradle-witness/build && echo "org.gradle.jvmargs=-Xms512m -Xmx512m -XX:MaxPermSize=512m" >> gradle.properties' +p170 +sg116 +I00 +sg117 +Nsa(dp171 +S'submodules' +p172 I01 sg61 S'12' -p168 +p173 sg63 I00 sg64 I00 sg65 -I00 -sg66 +Nsg66 g67 sg68 g69 -sg138 -g139 +sg141 +g142 sg76 Nsg77 g78 @@ -477,73 +485,75 @@ sg79 g19 sg80 S'0.5.2' -p169 +p174 sg82 -NsS'rm' -p170 -(lp171 -S'libs/*.jar' -p172 -asg86 -g87 -sg88 g19 -sg89 +sg83 g19 -sg126 +sg84 I00 -sg91 -g92 -sg93 -g94 -sg96 +sg85 +Nsg125 +I00 +sg87 +g88 +sg89 +g90 +sg92 I00 sS'disable' -p173 -S'broken in upstream' -p174 -sS'commit' p175 -S'v0.5.2' +S'broken in upstream' p176 -sg101 -g102 -sg103 -g104 -sg105 -g106 -sg107 -Nsg108 -NsS'gradle' +sS'rm' p177 (lp178 -g111 -asS'prebuild' +S'libs/*.jar' p179 -S'touch signing.properties && ./scripts/build-witness.sh && rm -rf libs/gradle-witness/build' +asg98 +g99 +sg100 +g101 +sg102 +g103 +sg104 +Nsg105 +g106 +sS'commit' p180 -sg114 +S'v0.5.2' +p181 +sg109 +(lp182 +sS'gradle' +p183 +(lp184 +g113 +asS'prebuild' +p185 +S'touch signing.properties && ./scripts/build-witness.sh && rm -rf libs/gradle-witness/build' +p186 +sg116 I00 -sg115 -Nsa(dp181 +sg117 +Nsa(dp187 S'submodules' -p182 +p188 I01 sg61 S'100' -p183 +p189 sg63 I00 sg64 I00 sg65 -I00 -sg66 +Nsg66 g67 sg68 g69 -sg138 -g139 +sg141 +g142 sg76 Nsg77 g78 @@ -551,71 +561,73 @@ sg79 g19 sg80 S'0.5.3' -p184 -sg82 -NsS'rm' -p185 -(lp186 -S'libs/*.jar' -p187 -asg86 -g87 -sg88 -g19 -sg89 -g19 -sg126 -I00 -sg91 -g92 -sg93 -g94 -sg96 -I00 -sg159 -I00 -sS'commit' -p188 -S'v0.5.3' -p189 -sg101 -g102 -sg103 -g104 -sg105 -g106 -sg107 -Nsg108 -NsS'gradle' p190 -(lp191 -g111 -asS'prebuild' -p192 -S'touch signing.properties && ./scripts/build-witness.sh && rm -rf libs/gradle-witness/build' -p193 -sg114 +sg82 +g19 +sg83 +g19 +sg84 I00 -sg115 -Nsa(dp194 -S'submodules' +sg85 +Nsg125 +I00 +sg87 +g88 +sg89 +g90 +sg92 +I00 +sg160 +I00 +sS'rm' +p191 +(lp192 +S'libs/*.jar' +p193 +asg98 +g99 +sg100 +g101 +sg102 +g103 +sg104 +Nsg105 +g106 +sS'commit' +p194 +S'v0.5.3' p195 +sg109 +(lp196 +sS'gradle' +p197 +(lp198 +g113 +asS'prebuild' +p199 +S'touch signing.properties && ./scripts/build-witness.sh && rm -rf libs/gradle-witness/build' +p200 +sg116 +I00 +sg117 +Nsa(dp201 +S'submodules' +p202 I01 sg61 S'101' -p196 +p203 sg63 I00 sg64 I00 sg65 -I00 -sg66 +Nsg66 g67 sg68 g69 -sg138 -g139 +sg141 +g142 sg76 Nsg77 g78 @@ -623,71 +635,73 @@ sg79 g19 sg80 S'0.5.4' -p197 +p204 sg82 -NsS'rm' -p198 -(lp199 -S'libs/*.jar' -p200 -asg86 -g87 -sg88 g19 +sg83 +g19 +sg84 +I00 +sg85 +Nsg125 +I00 +sg87 +g88 sg89 -g19 -sg126 +g90 +sg92 I00 -sg91 -g92 -sg93 -g94 -sg96 +sg160 I00 -sg159 -I00 -sS'commit' -p201 -S'v0.5.4' -p202 -sg101 -g102 -sg103 -g104 -sg105 -g106 -sg107 -Nsg108 -NsS'gradle' -p203 -(lp204 -g111 -asS'prebuild' +sS'rm' p205 -S'touch signing.properties && ./scripts/build-witness.sh && rm -rf libs/gradle-witness/build' -p206 -sg114 -I00 -sg115 -Nsa(dp207 -S'submodules' +(lp206 +S'libs/*.jar' +p207 +asg98 +g99 +sg100 +g101 +sg102 +g103 +sg104 +Nsg105 +g106 +sS'commit' p208 +S'v0.5.4' +p209 +sg109 +(lp210 +sS'gradle' +p211 +(lp212 +g113 +asS'prebuild' +p213 +S'touch signing.properties && ./scripts/build-witness.sh && rm -rf libs/gradle-witness/build' +p214 +sg116 +I00 +sg117 +Nsa(dp215 +S'submodules' +p216 I01 sg61 S'102' -p209 +p217 sg63 I00 sg64 I00 sg65 -I00 -sg66 +Nsg66 g67 sg68 g69 -sg138 -g139 +sg141 +g142 sg76 Nsg77 g78 @@ -695,66 +709,69 @@ sg79 g19 sg80 S'0.6.0' -p210 -sg82 -NsS'rm' -p211 -(lp212 -S'libs/*.jar' -p213 -asg86 -g87 -sg88 -g19 -sg89 -g19 -sg126 -I00 -sg91 -g92 -sg93 -g94 -sg96 -I00 -sg159 -I00 -sS'commit' -p214 -S'v0.6.0' -p215 -sg101 -g102 -sg103 -g104 -sg105 -g106 -sg107 -Nsg108 -NsS'gradle' -p216 -(lp217 -g111 -asS'prebuild' p218 -S'touch signing.properties && ./scripts/build-witness.sh && rm -rf libs/gradle-witness/build' -p219 -sg114 +sg82 +g19 +sg83 +g19 +sg84 I00 -sg115 -NsasS'FlattrID' -p220 -NsS'Disabled' +sg85 +Nsg125 +I00 +sg87 +g88 +sg89 +g90 +sg92 +I00 +sg160 +I00 +sS'rm' +p219 +(lp220 +S'libs/*.jar' p221 -NsS'Update Check Name' +asg98 +g99 +sg100 +g101 +sg102 +g103 +sg104 +Nsg105 +g106 +sS'commit' p222 -NsS'Vercode Operation' +S'v0.6.0' p223 -NsS'Current Version' -p224 -S'0.6.0' +sg109 +(lp224 +sS'gradle' p225 -sS'metadatapath' -p226 -S'metadata/org.smssecure.smssecure.txt' +(lp226 +g113 +asS'prebuild' p227 +S'touch signing.properties && ./scripts/build-witness.sh && rm -rf libs/gradle-witness/build' +p228 +sg116 +I00 +sg117 +NsasS'FlattrID' +p229 +NsS'metadatapath' +p230 +S'metadata/org.smssecure.smssecure.txt' +p231 +sS'Disabled' +p232 +NsS'Update Check Name' +p233 +NsS'Vercode Operation' +p234 +NsS'Current Version' +p235 +S'0.6.0' +p236 s. \ No newline at end of file diff --git a/tests/metadata/org.videolan.vlc.pickle b/tests/metadata/org.videolan.vlc.pickle index 663a51fb..ba3d5847 100644 --- a/tests/metadata/org.videolan.vlc.pickle +++ b/tests/metadata/org.videolan.vlc.pickle @@ -24,9 +24,9 @@ sS'Donate' p12 S'http://www.videolan.org/contribute.html#money' p13 -sS'Repo Type' +sS'id' p14 -S'git' +S'org.videolan.vlc' p15 sS'Description' p16 @@ -45,9 +45,9 @@ I00 sS'comments' p23 (lp24 -sS'id' +sS'Repo Type' p25 -S'org.videolan.vlc' +S'git' p26 sS'Repo' p27 @@ -137,48 +137,46 @@ I01 sS'oldsdkloc' p69 I00 -sS'kivy' +sS'gradleprops' p70 -I00 -sS'gradle' -p71 -I00 +(lp71 sS'scanignore' p72 (lp73 -sS'srclibs' +sS'patch' p74 (lp75 -sS'encoding' +sS'srclibs' p76 -NsS'extlibs' -p77 -(lp78 -sS'init' +(lp77 +sS'output' +p78 +NsS'encoding' p79 +NsS'extlibs' +p80 +(lp81 +sS'init' +p82 g20 sS'version' -p80 -S'0.0.11-ARMv7' -p81 -sS'build' -p82 -S'cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release' p83 -sS'rm' +S'0.0.11-ARMv7' p84 -(lp85 -sS'type' +sS'build' +p85 +S'cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release' p86 -S'ant' -p87 -sS'subdir' -p88 -S'vlc-android' -p89 sS'ndk_path' -p90 +p87 g20 +sS'kivy' +p88 +I00 +sS'subdir' +p89 +S'vlc-android' +p90 sS'forcevercode' p91 I01 @@ -200,10 +198,9 @@ I00 sS'disable' p100 I00 -sS'commit' +sS'rm' p101 -S'0.0.11' -p102 +(lp102 sS'scandelete' p103 (lp104 @@ -218,1524 +215,1483 @@ S'r10e' p109 sS'target' p110 -NsS'antcommands' +NsS'type' p111 -NsS'patch' +S'ant' p112 -(lp113 -sS'prebuild' +sS'antcommands' +p113 +NsS'gradle' p114 -S"sed -i '48d' ../Makefile" -p115 -sS'novcheck' -p116 I00 -sS'output' +sS'prebuild' +p115 +S"sed -i '48d' ../Makefile" +p116 +sS'novcheck' p117 -Nsa(dp118 +I00 +sS'commit' +p118 +S'0.0.11' +p119 +sa(dp120 g65 I00 sg66 S'111' -p119 +p121 sS'forceversion' -p120 +p122 I01 sg69 I00 sg70 -I00 -sg71 -I00 +(lp123 sg72 g73 sg74 g75 sg76 -Nsg77 -g78 -sg79 +g77 +sg78 +Nsg79 +Nsg80 +g81 +sg82 g20 -sg80 +sg83 S'0.0.11-ARM' -p121 -sS'build' -p122 -S'cd ../ && ANDROID_ABI=armeabi ./compile.sh release' -p123 -sg84 -g85 -sg86 -g87 -sS'subdir' p124 -S'vlc-android' +sS'build' p125 -sg90 -g20 -sS'forcevercode' +S'cd ../ && ANDROID_ABI=armeabi ./compile.sh release' p126 +sg87 +g20 +sg88 +I00 +sS'subdir' +p127 +S'vlc-android' +p128 +sS'forcevercode' +p129 I01 sg92 g93 sS'update' -p127 -(lp128 +p130 +(lp131 g96 aS'../java-libs/SlidingMenu' -p129 +p132 aS'../java-libs/ActionBarSherlock' -p130 +p133 asg99 I00 sg100 I00 -sS'commit' -p131 -S'0.0.11' -p132 +sg101 +g102 sg103 g104 sS'buildjni' -p133 -(lp134 +p134 +(lp135 S'no' -p135 +p136 asg108 g109 sg110 Nsg111 -Nsg112 -g113 -sS'prebuild' -p136 -S"sed -i '48d' ../Makefile" -p137 -sg116 +g112 +sg113 +Nsg114 I00 +sS'prebuild' +p137 +S"sed -i '48d' ../Makefile" +p138 sg117 -Nsa(dp138 +I00 +sS'commit' +p139 +S'0.0.11' +p140 +sa(dp141 g65 I00 sg66 S'112' -p139 +p142 sS'forceversion' -p140 +p143 I01 sg69 I00 sg70 -I00 -sg71 -I00 +(lp144 sg72 g73 sg74 g75 sg76 -Nsg77 -g78 -sg79 +g77 +sg78 +Nsg79 +Nsg80 +g81 +sg82 g20 -sg80 +sg83 S'0.0.11-x86' -p141 -sS'build' -p142 -S'cd ../ && ANDROID_ABI=x86 ./compile.sh release' -p143 -sg84 -g85 -sg86 -g87 -sS'subdir' -p144 -S'vlc-android' p145 -sg90 -g20 -sS'forcevercode' +sS'build' p146 +S'cd ../ && ANDROID_ABI=x86 ./compile.sh release' +p147 +sg87 +g20 +sg88 +I00 +sS'subdir' +p148 +S'vlc-android' +p149 +sS'forcevercode' +p150 I01 sg92 g93 sS'update' -p147 -(lp148 +p151 +(lp152 g96 aS'../java-libs/SlidingMenu' -p149 +p153 aS'../java-libs/ActionBarSherlock' -p150 +p154 asg99 I00 sS'disable' -p151 +p155 S'ffmpeg error 0.0.11' -p152 -sS'commit' -p153 -S'unknown - see disabled' -p154 +p156 +sg101 +g102 sg103 g104 sS'buildjni' -p155 -(lp156 -S'no' p157 +(lp158 +S'no' +p159 asg108 g109 sg110 Nsg111 -Nsg112 -g113 -sS'prebuild' -p158 -S"sed -i '48d' ../Makefile" -p159 -sg116 +g112 +sg113 +Nsg114 I00 +sS'prebuild' +p160 +S"sed -i '48d' ../Makefile" +p161 sg117 -Nsa(dp160 +I00 +sS'commit' +p162 +S'unknown - see disabled' +p163 +sa(dp164 g65 I00 sg66 S'113' -p161 +p165 sS'forceversion' -p162 +p166 I01 sg69 I00 sg70 -I00 -sg71 -I00 +(lp167 sg72 g73 sg74 g75 sg76 -Nsg77 -g78 -sg79 +g77 +sg78 +Nsg79 +Nsg80 +g81 +sg82 g20 -sg80 +sg83 S'0.0.11-mips' -p163 -sS'build' -p164 -S'cd ../ && ANDROID_ABI=mips ./compile.sh release' -p165 -sg84 -g85 -sg86 -g87 -sS'subdir' -p166 -S'vlc-android' -p167 -sg90 -g20 -sS'forcevercode' p168 +sS'build' +p169 +S'cd ../ && ANDROID_ABI=mips ./compile.sh release' +p170 +sg87 +g20 +sg88 +I00 +sS'subdir' +p171 +S'vlc-android' +p172 +sS'forcevercode' +p173 I01 sg92 g93 sS'update' -p169 -(lp170 +p174 +(lp175 g96 aS'../java-libs/SlidingMenu' -p171 +p176 aS'../java-libs/ActionBarSherlock' -p172 +p177 asg99 I00 sg100 I00 -sS'commit' -p173 -S'0.0.11' -p174 +sg101 +g102 sg103 g104 sS'buildjni' -p175 -(lp176 +p178 +(lp179 S'no' -p177 +p180 asg108 g109 sg110 Nsg111 -Nsg112 -g113 -sS'prebuild' -p178 -S"sed -i '48d' ../Makefile" -p179 -sg116 +g112 +sg113 +Nsg114 I00 +sS'prebuild' +p181 +S"sed -i '48d' ../Makefile" +p182 sg117 -Nsa(dp180 +I00 +sS'commit' +p183 +S'0.0.11' +p184 +sa(dp185 g65 I00 sg66 S'1301' -p181 +p186 sS'forceversion' -p182 +p187 I01 sg69 I00 sg70 -I00 -sg71 -I00 +(lp188 sg72 g73 -sS'srclibs' -p183 -(lp184 -S'VLC@7c52aacbe' -p185 -asg76 -Nsg77 -g78 -sg79 -g20 -sg80 -S'0.1.3-MIPS' -p186 -sS'build' -p187 -S'cd ../ && ANDROID_ABI=mips ./compile.sh release' -p188 -sg84 -g85 -sg86 -g87 -sS'subdir' +sS'patch' p189 -S'vlc-android' -p190 -sg90 -g20 -sS'forcevercode' +(lp190 +S'ndkr9.patch' p191 +asS'srclibs' +p192 +(lp193 +S'VLC@7c52aacbe' +p194 +asg78 +Nsg79 +Nsg80 +g81 +sg82 +g20 +sg83 +S'0.1.3-MIPS' +p195 +sS'build' +p196 +S'cd ../ && ANDROID_ABI=mips ./compile.sh release' +p197 +sg87 +g20 +sg88 +I00 +sS'subdir' +p198 +S'vlc-android' +p199 +sS'forcevercode' +p200 I01 sg92 g93 sS'update' -p192 -(lp193 +p201 +(lp202 S'auto' -p194 +p203 asg99 I00 sS'disable' -p195 +p204 S'build failing (at 0.1.3)' -p196 -sS'commit' -p197 -S'0.1.3' -p198 +p205 +sg101 +g102 sg103 g104 sS'buildjni' -p199 -(lp200 +p206 +(lp207 S'no' -p201 +p208 asg108 g109 sg110 Nsg111 -NsS'patch' -p202 -(lp203 -S'ndkr9.patch' -p204 -asS'prebuild' -p205 -S"sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC$$ ../vlc" -p206 -sg116 +g112 +sg113 +Nsg114 I00 +sS'prebuild' +p209 +S"sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC$$ ../vlc" +p210 sg117 -Nsa(dp207 +I00 +sS'commit' +p211 +S'0.1.3' +p212 +sa(dp213 g65 I00 sg66 S'1302' -p208 +p214 sS'forceversion' -p209 +p215 I01 sg69 I00 sg70 -I00 -sg71 -I00 +(lp216 sg72 g73 -sS'srclibs' -p210 -(lp211 -S'VLC@7c52aacbe' -p212 -asg76 -Nsg77 -g78 -sg79 -g20 -sg80 -S'0.1.3-x86' -p213 -sS'build' -p214 -S'cd ../ && ANDROID_ABI=x86 ./compile.sh release' -p215 -sg84 -g85 -sg86 -g87 -sS'subdir' -p216 -S'vlc-android' +sS'patch' p217 -sg90 +(lp218 +S'ndkr9.patch' +p219 +asS'srclibs' +p220 +(lp221 +S'VLC@7c52aacbe' +p222 +asg78 +Nsg79 +Nsg80 +g81 +sg82 g20 +sg83 +S'0.1.3-x86' +p223 +sS'build' +p224 +S'cd ../ && ANDROID_ABI=x86 ./compile.sh release' +p225 +sg87 +g20 +sg88 +I00 +sS'subdir' +p226 +S'vlc-android' +p227 sS'forcevercode' -p218 +p228 I01 sg92 g93 -sg192 -g193 +sg201 +g202 sg99 I00 sg100 I00 -sS'commit' -p219 -S'0.1.3' -p220 +sg101 +g102 sg103 g104 sS'buildjni' -p221 -(lp222 +p229 +(lp230 S'no' -p223 +p231 asg108 g109 sg110 Nsg111 -NsS'patch' -p224 -(lp225 -S'ndkr9.patch' -p226 -asS'prebuild' -p227 -S"sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC$$ ../vlc" -p228 -sg116 +g112 +sg113 +Nsg114 I00 +sS'prebuild' +p232 +S"sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC$$ ../vlc" +p233 sg117 -Nsa(dp229 +I00 +sS'commit' +p234 +S'0.1.3' +p235 +sa(dp236 g65 I00 sg66 S'1303' -p230 +p237 sS'forceversion' -p231 +p238 I01 sg69 I00 sg70 -I00 -sg71 -I00 +(lp239 sg72 g73 -sS'srclibs' -p232 -(lp233 -S'VLC@7c52aacbe' -p234 -asg76 -Nsg77 -g78 -sg79 -g20 -sg80 -S'0.1.3-ARM' -p235 -sS'build' -p236 -S'cd ../ && ANDROID_ABI=armeabi ./compile.sh release' -p237 -sg84 -g85 -sg86 -g87 -sS'subdir' -p238 -S'vlc-android' -p239 -sg90 -g20 -sS'forcevercode' +sS'patch' p240 +(lp241 +S'ndkr9.patch' +p242 +asS'srclibs' +p243 +(lp244 +S'VLC@7c52aacbe' +p245 +asg78 +Nsg79 +Nsg80 +g81 +sg82 +g20 +sg83 +S'0.1.3-ARM' +p246 +sS'build' +p247 +S'cd ../ && ANDROID_ABI=armeabi ./compile.sh release' +p248 +sg87 +g20 +sg88 +I00 +sS'subdir' +p249 +S'vlc-android' +p250 +sS'forcevercode' +p251 I01 sg92 g93 -sg192 -g193 +sg201 +g202 sg99 I00 sg100 I00 -sS'commit' -p241 -S'0.1.3' -p242 +sg101 +g102 sg103 g104 sS'buildjni' -p243 -(lp244 +p252 +(lp253 S'no' -p245 +p254 asg108 g109 sg110 Nsg111 -NsS'patch' -p246 -(lp247 -S'ndkr9.patch' -p248 -asS'prebuild' -p249 -S"sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC$$ ../vlc" -p250 -sg116 +g112 +sg113 +Nsg114 I00 +sS'prebuild' +p255 +S"sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC$$ ../vlc" +p256 sg117 -Nsa(dp251 +I00 +sS'commit' +p257 +S'0.1.3' +p258 +sa(dp259 g65 I00 sg66 S'1304' -p252 +p260 sS'forceversion' -p253 +p261 I01 sg69 I00 sg70 -I00 -sg71 -I00 +(lp262 sg72 g73 -sS'srclibs' -p254 -(lp255 +sS'patch' +p263 +(lp264 +S'ndkr9.patch' +p265 +asS'srclibs' +p266 +(lp267 S'VLC@7c52aacbe' -p256 -asg76 -Nsg77 -g78 -sg79 +p268 +asg78 +Nsg79 +Nsg80 +g81 +sg82 g20 -sg80 +sg83 S'0.1.3-ARMv7' -p257 +p269 sS'build' -p258 +p270 S'cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release' -p259 -sg84 -g85 -sg86 -g87 -sS'subdir' -p260 -S'vlc-android' -p261 -sg90 +p271 +sg87 g20 +sg88 +I00 +sS'subdir' +p272 +S'vlc-android' +p273 sS'forcevercode' -p262 +p274 I01 sg92 g93 -sg192 -g193 +sg201 +g202 sg99 I00 sg100 I00 -sS'commit' -p263 -S'0.1.3' -p264 +sg101 +g102 sg103 g104 sS'buildjni' -p265 -(lp266 +p275 +(lp276 S'no' -p267 +p277 asg108 g109 sg110 Nsg111 -NsS'patch' -p268 -(lp269 -S'ndkr9.patch' -p270 -asS'prebuild' -p271 -S"sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC$$ ../vlc" -p272 -sg116 +g112 +sg113 +Nsg114 I00 +sS'prebuild' +p278 +S"sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC$$ ../vlc" +p279 sg117 -Nsa(dp273 +I00 +sS'commit' +p280 +S'0.1.3' +p281 +sa(dp282 g65 I00 sg66 S'9002' -p274 +p283 sS'forceversion' -p275 +p284 I00 sg69 I00 sg70 -I00 -sg71 -I00 +(lp285 sg72 g73 +sg74 +g75 sS'srclibs' -p276 -(lp277 +p286 +(lp287 S'VLC@31ffb20309264994' -p278 -asg76 -Nsg77 -g78 -sg79 +p288 +asg78 +Nsg79 +Nsg80 +g81 +sg82 g20 -sg80 +sg83 S'0.9.0' -p279 +p289 sS'build' -p280 +p290 S'cd ../ && ANDROID_ABI=x86 ./compile.sh release' -p281 -sg84 -g85 -sg86 -g87 -sS'subdir' -p282 -S'vlc-android' -p283 -sg90 +p291 +sg87 g20 +sg88 +I00 +sS'subdir' +p292 +S'vlc-android' +p293 sS'forcevercode' -p284 +p294 I01 sg92 g93 -sg192 -g193 +sg201 +g202 sg99 I00 sg100 I00 -sS'commit' -p285 -S'0.9.0' -p286 +sg101 +g102 sg103 g104 sS'buildjni' -p287 -(lp288 +p295 +(lp296 S'no' -p289 +p297 asg108 g109 sg110 Nsg111 -Nsg112 -g113 -sS'prebuild' -p290 -S"sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC$$ ../vlc" -p291 -sg116 +g112 +sg113 +Nsg114 I00 +sS'prebuild' +p298 +S"sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC$$ ../vlc" +p299 sg117 -Nsa(dp292 +I00 +sS'commit' +p300 +S'0.9.0' +p301 +sa(dp302 g65 I00 sg66 S'9004' -p293 -sg275 +p303 +sg284 I00 sg69 I00 sg70 -I00 -sg71 -I00 +(lp304 sg72 g73 +sg74 +g75 sS'srclibs' -p294 -(lp295 +p305 +(lp306 S'VLC@31ffb20309264994' -p296 -asg76 -Nsg77 -g78 -sg79 +p307 +asg78 +Nsg79 +Nsg80 +g81 +sg82 g20 -sg80 +sg83 S'0.9.0' -p297 +p308 sS'build' -p298 +p309 S'cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release' -p299 -sg84 -g85 -sg86 -g87 -sS'subdir' -p300 -S'vlc-android' -p301 -sg90 +p310 +sg87 g20 +sg88 +I00 +sS'subdir' +p311 +S'vlc-android' +p312 sS'forcevercode' -p302 +p313 I01 sg92 g93 -sg192 -g193 +sg201 +g202 sg99 I00 sg100 I00 -sS'commit' -p303 -S'0.9.0' -p304 +sg101 +g102 sg103 g104 sS'buildjni' -p305 -(lp306 +p314 +(lp315 S'no' -p307 +p316 asg108 g109 sg110 Nsg111 -Nsg112 -g113 -sS'prebuild' -p308 -S"sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC$$ ../vlc" -p309 -sg116 +g112 +sg113 +Nsg114 I00 +sS'prebuild' +p317 +S"sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC$$ ../vlc" +p318 sg117 -Nsa(dp310 +I00 +sS'commit' +p319 +S'0.9.0' +p320 +sa(dp321 g65 I00 sg66 S'9102' -p311 -sg275 +p322 +sg284 I00 sg69 I00 sg70 -I00 -sg71 -I00 +(lp323 sg72 g73 +sg74 +g75 sS'srclibs' -p312 -(lp313 +p324 +(lp325 S'VLC@37e886d113b8b567c15208579fb2f' -p314 -asg76 -Nsg77 -g78 -sg79 +p326 +asg78 +Nsg79 +Nsg80 +g81 +sg82 g20 -sg80 +sg83 S'0.9.1' -p315 +p327 sS'build' -p316 +p328 S'cd ../ && ANDROID_ABI=x86 ./compile.sh release' -p317 -sg84 -g85 -sg86 -g87 -sS'subdir' -p318 -S'vlc-android' -p319 -sg90 +p329 +sg87 g20 +sg88 +I00 +sS'subdir' +p330 +S'vlc-android' +p331 sS'forcevercode' -p320 +p332 I01 sg92 g93 -sg192 -g193 +sg201 +g202 sg99 I00 sg100 I00 -sS'commit' -p321 -S'0.9.1' -p322 +sg101 +g102 sg103 g104 sS'buildjni' -p323 -(lp324 +p333 +(lp334 S'no' -p325 +p335 asg108 g109 sg110 Nsg111 -Nsg112 -g113 -sS'prebuild' -p326 -S"sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC$$ ../vlc" -p327 -sg116 +g112 +sg113 +Nsg114 I00 +sS'prebuild' +p336 +S"sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC$$ ../vlc" +p337 sg117 -Nsa(dp328 +I00 +sS'commit' +p338 +S'0.9.1' +p339 +sa(dp340 g65 I00 sg66 S'9104' -p329 -sg275 +p341 +sg284 I00 sg69 I00 sg70 -I00 -sg71 -I00 +(lp342 sg72 g73 +sg74 +g75 sS'srclibs' -p330 -(lp331 +p343 +(lp344 S'VLC@37e886d113b8b567c15208579fb2f' -p332 -asg76 -Nsg77 -g78 -sg79 +p345 +asg78 +Nsg79 +Nsg80 +g81 +sg82 g20 -sg80 +sg83 S'0.9.1' -p333 +p346 sS'build' -p334 +p347 S'cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release' -p335 -sg84 -g85 -sg86 -g87 -sS'subdir' -p336 -S'vlc-android' -p337 -sg90 +p348 +sg87 g20 +sg88 +I00 +sS'subdir' +p349 +S'vlc-android' +p350 sS'forcevercode' -p338 +p351 I01 sg92 g93 -sg192 -g193 +sg201 +g202 sg99 I00 sg100 I00 -sS'commit' -p339 -S'0.9.1' -p340 +sg101 +g102 sg103 g104 sS'buildjni' -p341 -(lp342 +p352 +(lp353 S'no' -p343 +p354 asg108 g109 sg110 Nsg111 -Nsg112 -g113 -sS'prebuild' -p344 -S"sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC$$ ../vlc" -p345 -sg116 +g112 +sg113 +Nsg114 I00 +sS'prebuild' +p355 +S"sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC$$ ../vlc" +p356 sg117 -Nsa(dp346 +I00 +sS'commit' +p357 +S'0.9.1' +p358 +sa(dp359 g65 I00 sg66 S'9502' -p347 -sg275 +p360 +sg284 I00 sg69 I00 sg70 -I00 -sg71 -I00 +(lp361 sg72 g73 +sg74 +g75 sS'srclibs' -p348 -(lp349 +p362 +(lp363 S'VLC@052600173f376ff58ff04d53746961a2' -p350 -asg76 -Nsg77 -g78 -sg79 +p364 +asg78 +Nsg79 +Nsg80 +g81 +sg82 g20 -sg80 +sg83 S'0.9.5' -p351 +p365 sS'build' -p352 +p366 S'cd ../ && ANDROID_ABI=x86 ./compile.sh release' -p353 -sg84 -g85 -sg86 -g87 -sS'subdir' -p354 -S'vlc-android' -p355 -sg90 +p367 +sg87 g20 +sg88 +I00 +sS'subdir' +p368 +S'vlc-android' +p369 sS'forcevercode' -p356 +p370 I01 sg92 g93 -sg192 -g193 +sg201 +g202 sg99 I00 sS'disable' -p357 +p371 S"can't download gmp" -p358 -sS'commit' -p359 -S'0.9.5' -p360 +p372 +sg101 +g102 sg103 g104 sS'buildjni' -p361 -(lp362 +p373 +(lp374 S'no' -p363 +p375 asg108 g109 sg110 Nsg111 -Nsg112 -g113 -sS'prebuild' -p364 -S"sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC$$ ../vlc" -p365 -sg116 +g112 +sg113 +Nsg114 I00 +sS'prebuild' +p376 +S"sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC$$ ../vlc" +p377 sg117 -Nsa(dp366 +I00 +sS'commit' +p378 +S'0.9.5' +p379 +sa(dp380 g65 I00 sg66 S'9504' -p367 -sg275 +p381 +sg284 I00 sg69 I00 sg70 -I00 -sg71 -I00 +(lp382 sg72 g73 +sg74 +g75 sS'srclibs' -p368 -(lp369 +p383 +(lp384 S'VLC@052600173f376ff58ff04d53746961a2' -p370 -asg76 -Nsg77 -g78 -sg79 +p385 +asg78 +Nsg79 +Nsg80 +g81 +sg82 g20 -sg80 +sg83 S'0.9.5' -p371 +p386 sS'build' -p372 +p387 S'cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release' -p373 -sg84 -g85 -sg86 -g87 -sS'subdir' -p374 -S'vlc-android' -p375 -sg90 +p388 +sg87 g20 +sg88 +I00 +sS'subdir' +p389 +S'vlc-android' +p390 sS'forcevercode' -p376 +p391 I01 sg92 g93 -sg192 -g193 +sg201 +g202 sg99 I00 sS'disable' -p377 +p392 S"can't download gmp" -p378 -sS'commit' -p379 -S'0.9.5' -p380 +p393 +sg101 +g102 sg103 g104 sS'buildjni' -p381 -(lp382 +p394 +(lp395 S'no' -p383 +p396 asg108 g109 sg110 Nsg111 -Nsg112 -g113 -sS'prebuild' -p384 -S"sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC$$ ../vlc" -p385 -sg116 +g112 +sg113 +Nsg114 I00 +sS'prebuild' +p397 +S"sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC$$ ../vlc" +p398 sg117 -Nsa(dp386 +I00 +sS'commit' +p399 +S'0.9.5' +p400 +sa(dp401 g65 I00 sg66 S'9602' -p387 -sg275 +p402 +sg284 I00 sg69 I00 sg70 -I00 -sg71 -I00 +(lp403 sg72 g73 +sg74 +g75 sS'srclibs' -p388 -(lp389 +p404 +(lp405 S'VLC-2.2@27f4799' -p390 -asg76 -Nsg77 -g78 -sg79 +p406 +asg78 +Nsg79 +Nsg80 +g81 +sg82 g20 -sg80 +sg83 S'0.9.6' -p391 +p407 sS'build' -p392 +p408 S'cd ../ && ANDROID_ABI=x86 ./compile.sh release' -p393 -sg84 -g85 -sg86 -g87 -sS'subdir' -p394 -S'vlc-android' -p395 -sg90 +p409 +sg87 g20 +sg88 +I00 +sS'subdir' +p410 +S'vlc-android' +p411 sS'forcevercode' -p396 +p412 I01 sg92 g93 -sg192 -g193 +sg201 +g202 sg99 I00 sg100 I00 -sS'commit' -p397 -S'0.9.6' -p398 +sg101 +g102 sg103 g104 sS'buildjni' -p399 -(lp400 +p413 +(lp414 S'no' -p401 +p415 asg108 g109 sg110 Nsg111 -Nsg112 -g113 -sS'prebuild' -p402 -S"sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc" -p403 -sg116 +g112 +sg113 +Nsg114 I00 +sS'prebuild' +p416 +S"sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc" +p417 sg117 -Nsa(dp404 +I00 +sS'commit' +p418 +S'0.9.6' +p419 +sa(dp420 g65 I00 sg66 S'9604' -p405 -sg275 +p421 +sg284 I00 sg69 I00 sg70 -I00 -sg71 -I00 +(lp422 sg72 g73 +sg74 +g75 sS'srclibs' -p406 -(lp407 +p423 +(lp424 S'VLC-2.2@27f4799' -p408 -asg76 -Nsg77 -g78 -sg79 +p425 +asg78 +Nsg79 +Nsg80 +g81 +sg82 g20 -sg80 +sg83 S'0.9.6' -p409 +p426 sS'build' -p410 +p427 S'cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release' -p411 -sg84 -g85 -sg86 -g87 -sS'subdir' -p412 -S'vlc-android' -p413 -sg90 +p428 +sg87 g20 +sg88 +I00 +sS'subdir' +p429 +S'vlc-android' +p430 sS'forcevercode' -p414 +p431 I01 sg92 g93 -sg192 -g193 +sg201 +g202 sg99 I00 sg100 I00 -sS'commit' -p415 -S'0.9.6' -p416 +sg101 +g102 sg103 g104 sS'buildjni' -p417 -(lp418 +p432 +(lp433 S'no' -p419 +p434 asg108 g109 sg110 Nsg111 -Nsg112 -g113 -sS'prebuild' -p420 -S"sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc" -p421 -sg116 +g112 +sg113 +Nsg114 I00 +sS'prebuild' +p435 +S"sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc" +p436 sg117 -Nsa(dp422 +I00 +sS'commit' +p437 +S'0.9.6' +p438 +sa(dp439 g65 I00 sg66 S'9702' -p423 -sg275 +p440 +sg284 I00 sg69 I00 sg70 -I00 -sg71 -I00 -sg72 -g73 -sS'srclibs' -p424 -(lp425 -S'VLC-2.2@9e1c6ff' -p426 -asg76 -Nsg77 -g78 -sg79 -g20 -sg80 -S'0.9.7' -p427 -sS'build' -p428 -S'cd ../ && ANDROID_ABI=x86 ./compile.sh release' -p429 -sg84 -g85 -sg86 -g87 -sS'subdir' -p430 -S'vlc-android' -p431 -sg90 -g20 -sS'forcevercode' -p432 -I01 -sg92 -g93 -sg192 -g193 -sg99 -I00 -sg100 -I00 -sS'commit' -p433 -S'0.9.7' -p434 -sg103 -g104 -sS'buildjni' -p435 -(lp436 -S'no' -p437 -asg108 -g109 -sg110 -Nsg111 -Nsg112 -g113 -sS'prebuild' -p438 -S"sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc" -p439 -sg116 -I00 -sg117 -Nsa(dp440 -g65 -I00 -sg66 -S'9704' -p441 -sg275 -I00 -sg69 -I00 -sg70 -I00 -sg71 -I00 +(lp441 sg72 g73 +sg74 +g75 sS'srclibs' p442 (lp443 S'VLC-2.2@9e1c6ff' p444 -asg76 -Nsg77 -g78 -sg79 +asg78 +Nsg79 +Nsg80 +g81 +sg82 g20 -sg80 +sg83 S'0.9.7' p445 sS'build' p446 -S'cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release' +S'cd ../ && ANDROID_ABI=x86 ./compile.sh release' p447 -sg84 -g85 -sg86 -g87 +sg87 +g20 +sg88 +I00 sS'subdir' p448 S'vlc-android' p449 -sg90 -g20 sS'forcevercode' p450 I01 sg92 g93 -sg192 -g193 +sg201 +g202 sg99 I00 sg100 I00 -sS'commit' -p451 -S'0.9.7' -p452 +sg101 +g102 sg103 g104 sS'buildjni' -p453 -(lp454 +p451 +(lp452 S'no' -p455 +p453 asg108 g109 sg110 Nsg111 -Nsg112 -g113 -sS'prebuild' -p456 -S"sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc" -p457 -sg116 +g112 +sg113 +Nsg114 I00 +sS'prebuild' +p454 +S"sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc" +p455 sg117 -Nsa(dp458 +I00 +sS'commit' +p456 +S'0.9.7' +p457 +sa(dp458 +g65 +I00 +sg66 +S'9704' +p459 +sg284 +I00 +sg69 +I00 +sg70 +(lp460 +sg72 +g73 +sg74 +g75 +sS'srclibs' +p461 +(lp462 +S'VLC-2.2@9e1c6ff' +p463 +asg78 +Nsg79 +Nsg80 +g81 +sg82 +g20 +sg83 +S'0.9.7' +p464 +sS'build' +p465 +S'cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release' +p466 +sg87 +g20 +sg88 +I00 +sS'subdir' +p467 +S'vlc-android' +p468 +sS'forcevercode' +p469 +I01 +sg92 +g93 +sg201 +g202 +sg99 +I00 +sg100 +I00 +sg101 +g102 +sg103 +g104 +sS'buildjni' +p470 +(lp471 +S'no' +p472 +asg108 +g109 +sg110 +Nsg111 +g112 +sg113 +Nsg114 +I00 +sS'prebuild' +p473 +S"sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc" +p474 +sg117 +I00 +sS'commit' +p475 +S'0.9.7' +p476 +sa(dp477 g65 I00 sg66 S'9711' -p459 -sg275 +p478 +sg284 I00 sg69 I00 sg70 -I00 -sg71 -I00 -sg72 -g73 -sS'srclibs' -p460 -(lp461 -S'VLC-2.2@57cd36b' -p462 -asg76 -Nsg77 -g78 -sg79 -g20 -sg80 -S'0.9.7.1' -p463 -sS'build' -p464 -S'cd ../ && ANDROID_ABI=mips ./compile.sh release' -p465 -sg84 -g85 -sg86 -g87 -sS'subdir' -p466 -S'vlc-android' -p467 -sg90 -g20 -sS'forcevercode' -p468 -I01 -sg92 -g93 -sg192 -g193 -sg99 -I00 -sS'disable' -p469 -S'build fails' -p470 -sS'commit' -p471 -S'0.9.7.1' -p472 -sg103 -g104 -sS'buildjni' -p473 -(lp474 -S'no' -p475 -asg108 -g109 -sg110 -Nsg111 -Nsg112 -g113 -sS'prebuild' -p476 -S"sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc" -p477 -sg116 -I00 -sg117 -Nsa(dp478 -g65 -I00 -sg66 -S'9712' -p479 -sg275 -I00 -sg69 -I00 -sg70 -I00 -sg71 -I00 +(lp479 sg72 g73 +sg74 +g75 sS'srclibs' p480 (lp481 S'VLC-2.2@57cd36b' p482 -asg76 -Nsg77 -g78 -sg79 +asg78 +Nsg79 +Nsg80 +g81 +sg82 g20 -sg80 +sg83 S'0.9.7.1' p483 sS'build' p484 -S'cd ../ && ANDROID_ABI=x86 ./compile.sh release' +S'cd ../ && ANDROID_ABI=mips ./compile.sh release' p485 -sg84 -g85 -sg86 -g87 +sg87 +g20 +sg88 +I00 sS'subdir' p486 S'vlc-android' p487 -sg90 -g20 sS'forcevercode' p488 I01 sg92 g93 -sg192 -g193 +sg201 +g202 sg99 I00 -sg100 -I00 -sS'commit' +sS'disable' p489 -S'0.9.7.1' +S'build fails' p490 +sg101 +g102 sg103 g104 sS'buildjni' @@ -1747,1901 +1703,1864 @@ asg108 g109 sg110 Nsg111 -Nsg112 -g113 +g112 +sg113 +Nsg114 +I00 sS'prebuild' p494 S"sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc" p495 -sg116 -I00 sg117 -Nsa(dp496 +I00 +sS'commit' +p496 +S'0.9.7.1' +p497 +sa(dp498 +g65 +I00 +sg66 +S'9712' +p499 +sg284 +I00 +sg69 +I00 +sg70 +(lp500 +sg72 +g73 +sg74 +g75 +sS'srclibs' +p501 +(lp502 +S'VLC-2.2@57cd36b' +p503 +asg78 +Nsg79 +Nsg80 +g81 +sg82 +g20 +sg83 +S'0.9.7.1' +p504 +sS'build' +p505 +S'cd ../ && ANDROID_ABI=x86 ./compile.sh release' +p506 +sg87 +g20 +sg88 +I00 +sS'subdir' +p507 +S'vlc-android' +p508 +sS'forcevercode' +p509 +I01 +sg92 +g93 +sg201 +g202 +sg99 +I00 +sg100 +I00 +sg101 +g102 +sg103 +g104 +sS'buildjni' +p510 +(lp511 +S'no' +p512 +asg108 +g109 +sg110 +Nsg111 +g112 +sg113 +Nsg114 +I00 +sS'prebuild' +p513 +S"sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc" +p514 +sg117 +I00 +sS'commit' +p515 +S'0.9.7.1' +p516 +sa(dp517 g65 I00 sg66 S'9714' -p497 -sg275 +p518 +sg284 I00 sg69 I00 sg70 -I00 -sg71 -I00 +(lp519 sg72 g73 +sg74 +g75 sS'srclibs' -p498 -(lp499 +p520 +(lp521 S'VLC-2.2@57cd36b' -p500 -asg76 -Nsg77 -g78 -sg79 +p522 +asg78 +Nsg79 +Nsg80 +g81 +sg82 g20 -sg80 +sg83 S'0.9.7.1' -p501 +p523 sS'build' -p502 +p524 S'cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release' -p503 -sg84 -g85 -sg86 -g87 -sS'subdir' -p504 -S'vlc-android' -p505 -sg90 +p525 +sg87 g20 +sg88 +I00 +sS'subdir' +p526 +S'vlc-android' +p527 sS'forcevercode' -p506 +p528 I01 sg92 g93 -sg192 -g193 +sg201 +g202 sg99 I00 sg100 I00 -sS'commit' -p507 -S'0.9.7.1' -p508 +sg101 +g102 sg103 g104 sS'buildjni' -p509 -(lp510 +p529 +(lp530 S'no' -p511 +p531 asg108 g109 sg110 Nsg111 -Nsg112 -g113 -sS'prebuild' -p512 -S"sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc" -p513 -sg116 +g112 +sg113 +Nsg114 I00 +sS'prebuild' +p532 +S"sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc" +p533 sg117 -Nsa(dp514 +I00 +sS'commit' +p534 +S'0.9.7.1' +p535 +sa(dp536 g65 I00 sg66 S'9802' -p515 -sg275 +p537 +sg284 I00 sg69 I00 sg70 -I00 -sg71 -I00 +(lp538 sg72 g73 +sg74 +g75 sS'srclibs' -p516 -(lp517 +p539 +(lp540 S'VLC-2.2@f2db364' -p518 -asg76 -Nsg77 -g78 -sg79 +p541 +asg78 +Nsg79 +Nsg80 +g81 +sg82 g20 -sg80 +sg83 S'0.9.8' -p519 +p542 sS'build' -p520 +p543 S'cd ../ && ANDROID_ABI=x86 ./compile.sh release' -p521 -sg84 -g85 -sg86 -g87 -sS'subdir' -p522 -S'vlc-android' -p523 -sg90 +p544 +sg87 g20 +sg88 +I00 +sS'subdir' +p545 +S'vlc-android' +p546 sS'forcevercode' -p524 +p547 I01 sg92 g93 -sg192 -g193 +sg201 +g202 sg99 I00 sg100 I00 -sS'commit' -p525 -S'0.9.8' -p526 +sg101 +g102 sg103 g104 sS'buildjni' -p527 -(lp528 +p548 +(lp549 S'no' -p529 +p550 asg108 g109 sg110 Nsg111 -Nsg112 -g113 -sS'prebuild' -p530 -S"sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc" -p531 -sg116 +g112 +sg113 +Nsg114 I00 +sS'prebuild' +p551 +S"sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc" +p552 sg117 -Nsa(dp532 +I00 +sS'commit' +p553 +S'0.9.8' +p554 +sa(dp555 g65 I00 sg66 S'9803' -p533 -sg275 +p556 +sg284 I00 sg69 I00 sg70 -I00 -sg71 -I00 +(lp557 sg72 g73 +sg74 +g75 sS'srclibs' -p534 -(lp535 +p558 +(lp559 S'VLC-2.2@f2db364' -p536 -asg76 -Nsg77 -g78 -sg79 +p560 +asg78 +Nsg79 +Nsg80 +g81 +sg82 g20 -sg80 +sg83 S'0.9.8' -p537 +p561 sS'build' -p538 +p562 S'cd ../ && ANDROID_ABI=armeabi ./compile.sh release' -p539 -sg84 -g85 -sg86 -g87 -sS'subdir' -p540 -S'vlc-android' -p541 -sg90 +p563 +sg87 g20 +sg88 +I00 +sS'subdir' +p564 +S'vlc-android' +p565 sS'forcevercode' -p542 +p566 I01 sg92 g93 -sg192 -g193 +sg201 +g202 sg99 I00 sg100 I00 -sS'commit' -p543 -S'0.9.8' -p544 +sg101 +g102 sg103 g104 sS'buildjni' -p545 -(lp546 +p567 +(lp568 S'no' -p547 +p569 asg108 g109 sg110 Nsg111 -Nsg112 -g113 -sS'prebuild' -p548 -S"sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc" -p549 -sg116 +g112 +sg113 +Nsg114 I00 +sS'prebuild' +p570 +S"sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc" +p571 sg117 -Nsa(dp550 +I00 +sS'commit' +p572 +S'0.9.8' +p573 +sa(dp574 g65 I00 sg66 S'9804' -p551 -sg275 +p575 +sg284 I00 sg69 I00 sg70 -I00 -sg71 -I00 +(lp576 sg72 g73 +sg74 +g75 sS'srclibs' -p552 -(lp553 +p577 +(lp578 S'VLC-2.2@f2db364' -p554 -asg76 -Nsg77 -g78 -sg79 +p579 +asg78 +Nsg79 +Nsg80 +g81 +sg82 g20 -sg80 +sg83 S'0.9.8' -p555 +p580 sS'build' -p556 +p581 S'cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release' -p557 -sg84 -g85 -sg86 -g87 -sS'subdir' -p558 -S'vlc-android' -p559 -sg90 +p582 +sg87 g20 +sg88 +I00 +sS'subdir' +p583 +S'vlc-android' +p584 sS'forcevercode' -p560 +p585 I01 sg92 g93 -sg192 -g193 +sg201 +g202 sg99 I00 sg100 I00 -sS'commit' -p561 -S'0.9.8' -p562 +sg101 +g102 sg103 g104 sS'buildjni' -p563 -(lp564 +p586 +(lp587 S'no' -p565 +p588 asg108 g109 sg110 Nsg111 -Nsg112 -g113 -sS'prebuild' -p566 -S"sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc" -p567 -sg116 +g112 +sg113 +Nsg114 I00 +sS'prebuild' +p589 +S"sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc" +p590 sg117 -Nsa(dp568 +I00 +sS'commit' +p591 +S'0.9.8' +p592 +sa(dp593 g65 I00 sg66 S'9902' -p569 -sg275 +p594 +sg284 I00 sg69 I00 sg70 -I00 -sg71 -I00 +(lp595 sg72 g73 +sg74 +g75 sS'srclibs' -p570 -(lp571 +p596 +(lp597 S'VLC-2.2@e731dc23a4f8ef6782c7cc2236bbbf41c034dad1' -p572 -asg76 -Nsg77 -g78 -sg79 +p598 +asg78 +Nsg79 +Nsg80 +g81 +sg82 g20 -sg80 +sg83 S'0.9.9' -p573 +p599 sS'build' -p574 +p600 S'cd ../ && ANDROID_ABI=x86 ./compile.sh release' -p575 -sg84 -g85 -sg86 -g87 -sS'subdir' -p576 -S'vlc-android' -p577 -sg90 +p601 +sg87 g20 +sg88 +I00 +sS'subdir' +p602 +S'vlc-android' +p603 sS'forcevercode' -p578 +p604 I01 sg92 g93 -sg192 -g193 +sg201 +g202 sg99 I00 sg100 I00 -sS'commit' -p579 -S'0.9.9' -p580 +sg101 +g102 sg103 g104 sS'buildjni' -p581 -(lp582 +p605 +(lp606 S'no' -p583 +p607 asg108 g109 sg110 Nsg111 -Nsg112 -g113 -sS'prebuild' -p584 -S"sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc" -p585 -sg116 +g112 +sg113 +Nsg114 I00 +sS'prebuild' +p608 +S"sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc" +p609 sg117 -Nsa(dp586 +I00 +sS'commit' +p610 +S'0.9.9' +p611 +sa(dp612 g65 I00 sg66 S'9903' -p587 -sg275 +p613 +sg284 I00 sg69 I00 sg70 -I00 -sg71 -I00 +(lp614 sg72 g73 +sg74 +g75 sS'srclibs' -p588 -(lp589 +p615 +(lp616 S'VLC-2.2@e731dc23a4f8ef6782c7cc2236bbbf41c034dad1' -p590 -asg76 -Nsg77 -g78 -sg79 +p617 +asg78 +Nsg79 +Nsg80 +g81 +sg82 g20 -sg80 +sg83 S'0.9.9' -p591 +p618 sS'build' -p592 +p619 S'cd ../ && ANDROID_ABI=armeabi ./compile.sh release' -p593 -sg84 -g85 -sg86 -g87 -sS'subdir' -p594 -S'vlc-android' -p595 -sg90 +p620 +sg87 g20 +sg88 +I00 +sS'subdir' +p621 +S'vlc-android' +p622 sS'forcevercode' -p596 +p623 I01 sg92 g93 -sg192 -g193 +sg201 +g202 sg99 I00 sg100 I00 -sS'commit' -p597 -S'0.9.9' -p598 +sg101 +g102 sg103 g104 sS'buildjni' -p599 -(lp600 +p624 +(lp625 S'no' -p601 +p626 asg108 g109 sg110 Nsg111 -Nsg112 -g113 -sS'prebuild' -p602 -S"sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc" -p603 -sg116 +g112 +sg113 +Nsg114 I00 +sS'prebuild' +p627 +S"sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc" +p628 sg117 -Nsa(dp604 +I00 +sS'commit' +p629 +S'0.9.9' +p630 +sa(dp631 g65 I00 sg66 S'9904' -p605 -sg275 +p632 +sg284 I00 sg69 I00 sg70 -I00 -sg71 -I00 +(lp633 sg72 g73 +sg74 +g75 sS'srclibs' -p606 -(lp607 +p634 +(lp635 S'VLC-2.2@e731dc23a4f8ef6782c7cc2236bbbf41c034dad1' -p608 -asg76 -Nsg77 -g78 -sg79 +p636 +asg78 +Nsg79 +Nsg80 +g81 +sg82 g20 -sg80 +sg83 S'0.9.9' -p609 +p637 sS'build' -p610 +p638 S'cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release' -p611 -sg84 -g85 -sg86 -g87 -sS'subdir' -p612 -S'vlc-android' -p613 -sg90 +p639 +sg87 g20 +sg88 +I00 +sS'subdir' +p640 +S'vlc-android' +p641 sS'forcevercode' -p614 +p642 I01 sg92 g93 -sg192 -g193 +sg201 +g202 sg99 I00 sg100 I00 -sS'commit' -p615 -S'0.9.9' -p616 +sg101 +g102 sg103 g104 sS'buildjni' -p617 -(lp618 +p643 +(lp644 S'no' -p619 +p645 asg108 g109 sg110 Nsg111 -Nsg112 -g113 -sS'prebuild' -p620 -S"sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc" -p621 -sg116 +g112 +sg113 +Nsg114 I00 +sS'prebuild' +p646 +S"sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc" +p647 sg117 -Nsa(dp622 +I00 +sS'commit' +p648 +S'0.9.9' +p649 +sa(dp650 g65 I00 sg66 S'10002' -p623 -sg275 +p651 +sg284 I00 sg69 I00 sg70 -I00 -sg71 -I00 +(lp652 sg72 g73 +sg74 +g75 sS'srclibs' -p624 -(lp625 +p653 +(lp654 S'VLC-2.2@e33e5de' -p626 -asg76 -Nsg77 -g78 -sg79 +p655 +asg78 +Nsg79 +Nsg80 +g81 +sg82 g20 -sg80 +sg83 S'0.9.10' -p627 +p656 sS'build' -p628 +p657 S'cd ../ && ANDROID_ABI=x86 ./compile.sh release' -p629 -sg84 -g85 -sg86 -g87 -sS'subdir' -p630 -S'vlc-android' -p631 -sg90 +p658 +sg87 g20 +sg88 +I00 +sS'subdir' +p659 +S'vlc-android' +p660 sS'forcevercode' -p632 +p661 I01 sg92 g93 -sg192 -g193 +sg201 +g202 sg99 I00 sg100 I00 -sS'commit' -p633 -S'0.9.10' -p634 +sg101 +g102 sg103 g104 sS'buildjni' -p635 -(lp636 +p662 +(lp663 S'no' -p637 +p664 asg108 g109 sg110 Nsg111 -Nsg112 -g113 -sS'prebuild' -p638 -S"sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc" -p639 -sg116 +g112 +sg113 +Nsg114 I00 +sS'prebuild' +p665 +S"sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc" +p666 sg117 -Nsa(dp640 +I00 +sS'commit' +p667 +S'0.9.10' +p668 +sa(dp669 g65 I00 sg66 S'10003' -p641 -sg275 +p670 +sg284 I00 sg69 I00 sg70 -I00 -sg71 -I00 +(lp671 sg72 g73 +sg74 +g75 sS'srclibs' -p642 -(lp643 +p672 +(lp673 S'VLC-2.2@e33e5de' -p644 -asg76 -Nsg77 -g78 -sg79 +p674 +asg78 +Nsg79 +Nsg80 +g81 +sg82 g20 -sg80 +sg83 S'0.9.10' -p645 +p675 sS'build' -p646 +p676 S'cd ../ && ANDROID_ABI=armeabi ./compile.sh release' -p647 -sg84 -g85 -sg86 -g87 -sS'subdir' -p648 -S'vlc-android' -p649 -sg90 +p677 +sg87 g20 +sg88 +I00 +sS'subdir' +p678 +S'vlc-android' +p679 sS'forcevercode' -p650 +p680 I01 sg92 g93 -sg192 -g193 +sg201 +g202 sg99 I00 sg100 I00 -sS'commit' -p651 -S'0.9.10' -p652 +sg101 +g102 sg103 g104 sS'buildjni' -p653 -(lp654 +p681 +(lp682 S'no' -p655 +p683 asg108 g109 sg110 Nsg111 -Nsg112 -g113 -sS'prebuild' -p656 -S"sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc" -p657 -sg116 +g112 +sg113 +Nsg114 I00 +sS'prebuild' +p684 +S"sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc" +p685 sg117 -Nsa(dp658 +I00 +sS'commit' +p686 +S'0.9.10' +p687 +sa(dp688 g65 I00 sg66 S'10004' -p659 -sg275 +p689 +sg284 I00 sg69 I00 sg70 -I00 -sg71 -I00 +(lp690 sg72 g73 +sg74 +g75 sS'srclibs' -p660 -(lp661 +p691 +(lp692 S'VLC-2.2@e33e5de' -p662 -asg76 -Nsg77 -g78 -sg79 +p693 +asg78 +Nsg79 +Nsg80 +g81 +sg82 g20 -sg80 +sg83 S'0.9.10' -p663 +p694 sS'build' -p664 +p695 S'cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release' -p665 -sg84 -g85 -sg86 -g87 -sS'subdir' -p666 -S'vlc-android' -p667 -sg90 +p696 +sg87 g20 +sg88 +I00 +sS'subdir' +p697 +S'vlc-android' +p698 sS'forcevercode' -p668 +p699 I01 sg92 g93 -sg192 -g193 +sg201 +g202 sg99 I00 sg100 I00 -sS'commit' -p669 -S'0.9.10' -p670 +sg101 +g102 sg103 g104 sS'buildjni' -p671 -(lp672 +p700 +(lp701 S'no' -p673 +p702 asg108 g109 sg110 Nsg111 -Nsg112 -g113 -sS'prebuild' -p674 -S"sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc" -p675 -sg116 +g112 +sg113 +Nsg114 I00 +sS'prebuild' +p703 +S"sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc" +p704 sg117 -Nsa(dp676 +I00 +sS'commit' +p705 +S'0.9.10' +p706 +sa(dp707 g65 I00 sg66 S'10006' -p677 -sg275 +p708 +sg284 I00 sg69 I00 sg70 -I00 -sg71 -I00 +(lp709 sg72 g73 +sg74 +g75 sS'srclibs' -p678 -(lp679 +p710 +(lp711 S'VLC-2.2@036010e' -p680 -asg76 -Nsg77 -g78 -sg79 +p712 +asg78 +Nsg79 +Nsg80 +g81 +sg82 g20 -sg80 +sg83 S'1.0.0' -p681 +p713 sS'build' -p682 +p714 S'cd ../ && ANDROID_ABI=x86 ./compile.sh release' -p683 -sg84 -g85 -sg86 -g87 -sS'subdir' -p684 -S'vlc-android' -p685 -sg90 +p715 +sg87 g20 +sg88 +I00 +sS'subdir' +p716 +S'vlc-android' +p717 sS'forcevercode' -p686 +p718 I01 sg92 g93 -sg192 -g193 +sg201 +g202 sg99 I00 sS'disable' -p687 +p719 S"doesn't build" -p688 -sS'commit' -p689 -S'1.0.0' -p690 +p720 +sg101 +g102 sg103 g104 sS'buildjni' -p691 -(lp692 +p721 +(lp722 S'no' -p693 +p723 asg108 g109 sg110 Nsg111 -Nsg112 -g113 -sS'prebuild' -p694 -S"sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc" -p695 -sg116 +g112 +sg113 +Nsg114 I00 +sS'prebuild' +p724 +S"sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc" +p725 sg117 -Nsa(dp696 +I00 +sS'commit' +p726 +S'1.0.0' +p727 +sa(dp728 g65 I00 sg66 S'10007' -p697 -sg275 +p729 +sg284 I00 sg69 I00 sg70 -I00 -sg71 -I00 +(lp730 sg72 g73 +sg74 +g75 sS'srclibs' -p698 -(lp699 +p731 +(lp732 S'VLC-2.2@036010e' -p700 -asg76 -Nsg77 -g78 -sg79 +p733 +asg78 +Nsg79 +Nsg80 +g81 +sg82 g20 -sg80 +sg83 S'1.0.0' -p701 +p734 sS'build' -p702 +p735 S'cd ../ && ANDROID_ABI=armeabi ./compile.sh release' -p703 -sg84 -g85 -sg86 -g87 -sS'subdir' -p704 -S'vlc-android' -p705 -sg90 +p736 +sg87 g20 +sg88 +I00 +sS'subdir' +p737 +S'vlc-android' +p738 sS'forcevercode' -p706 +p739 I01 sg92 g93 -sg192 -g193 +sg201 +g202 sg99 I00 sS'disable' -p707 +p740 S"doesn't build" -p708 -sS'commit' -p709 -S'1.0.0' -p710 +p741 +sg101 +g102 sg103 g104 sS'buildjni' -p711 -(lp712 +p742 +(lp743 S'no' -p713 +p744 asg108 g109 sg110 Nsg111 -Nsg112 -g113 -sS'prebuild' -p714 -S"sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc" -p715 -sg116 +g112 +sg113 +Nsg114 I00 +sS'prebuild' +p745 +S"sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc" +p746 sg117 -Nsa(dp716 +I00 +sS'commit' +p747 +S'1.0.0' +p748 +sa(dp749 g65 I00 sg66 S'10008' -p717 -sg275 +p750 +sg284 I00 sg69 I00 sg70 -I00 -sg71 -I00 +(lp751 sg72 g73 +sg74 +g75 sS'srclibs' -p718 -(lp719 +p752 +(lp753 S'VLC-2.2@036010e' -p720 -asg76 -Nsg77 -g78 -sg79 +p754 +asg78 +Nsg79 +Nsg80 +g81 +sg82 g20 -sg80 +sg83 S'1.0.0' -p721 +p755 sS'build' -p722 +p756 S'cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release' -p723 -sg84 -g85 -sg86 -g87 -sS'subdir' -p724 -S'vlc-android' -p725 -sg90 +p757 +sg87 g20 +sg88 +I00 +sS'subdir' +p758 +S'vlc-android' +p759 sS'forcevercode' -p726 +p760 I01 sg92 g93 -sg192 -g193 +sg201 +g202 sg99 I00 sS'disable' -p727 +p761 S"doesn't build" -p728 -sS'commit' -p729 -S'1.0.0' -p730 +p762 +sg101 +g102 sg103 g104 sS'buildjni' -p731 -(lp732 +p763 +(lp764 S'no' -p733 +p765 asg108 g109 sg110 Nsg111 -Nsg112 -g113 -sS'prebuild' -p734 -S"sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc" -p735 -sg116 +g112 +sg113 +Nsg114 I00 +sS'prebuild' +p766 +S"sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc" +p767 sg117 -Nsa(dp736 +I00 +sS'commit' +p768 +S'1.0.0' +p769 +sa(dp770 g65 I00 sg66 S'10102' -p737 -sg275 +p771 +sg284 I00 sg69 I00 sg70 -I00 -sg71 -I00 +(lp772 sg72 g73 +sg74 +g75 sS'srclibs' -p738 -(lp739 +p773 +(lp774 S'VLC-2.2@59409d5' -p740 -asg76 -Nsg77 -g78 -sg79 +p775 +asg78 +Nsg79 +Nsg80 +g81 +sg82 g20 -sg80 +sg83 S'1.0.1' -p741 +p776 sS'build' -p742 +p777 S'cd ../ && ANDROID_ABI=x86 ./compile.sh release' -p743 -sg84 -g85 -sg86 -g87 -sS'subdir' -p744 -S'vlc-android' -p745 -sg90 +p778 +sg87 g20 +sg88 +I00 +sS'subdir' +p779 +S'vlc-android' +p780 sS'forcevercode' -p746 +p781 I01 sg92 g93 -sg192 -g193 +sg201 +g202 sg99 I00 sg100 I00 -sS'commit' -p747 -S'1.0.1' -p748 +sg101 +g102 sg103 g104 sS'buildjni' -p749 -(lp750 +p782 +(lp783 S'no' -p751 +p784 asg108 g109 sg110 Nsg111 -Nsg112 -g113 -sS'prebuild' -p752 -S"sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc" -p753 -sg116 +g112 +sg113 +Nsg114 I00 +sS'prebuild' +p785 +S"sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc" +p786 sg117 -Nsa(dp754 +I00 +sS'commit' +p787 +S'1.0.1' +p788 +sa(dp789 g65 I00 sg66 S'10103' -p755 -sg275 +p790 +sg284 I00 sg69 I00 sg70 -I00 -sg71 -I00 -sg72 -g73 -sS'srclibs' -p756 -(lp757 -S'VLC-2.2@59409d5' -p758 -asg76 -Nsg77 -g78 -sg79 -g20 -sg80 -S'1.0.1' -p759 -sS'build' -p760 -S'cd ../ && ANDROID_ABI=armeabi ./compile.sh release' -p761 -sg84 -g85 -sg86 -g87 -sS'subdir' -p762 -S'vlc-android' -p763 -sg90 -g20 -sS'forcevercode' -p764 -I01 -sg92 -g93 -sg192 -g193 -sg99 -I00 -sg100 -I00 -sS'commit' -p765 -S'1.0.1' -p766 -sg103 -g104 -sS'buildjni' -p767 -(lp768 -S'no' -p769 -asg108 -g109 -sg110 -Nsg111 -Nsg112 -g113 -sS'prebuild' -p770 -S"sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc" -p771 -sg116 -I00 -sg117 -Nsa(dp772 -g65 -I00 -sg66 -S'10104' -p773 -sg275 -I00 -sg69 -I00 -sg70 -I00 -sg71 -I00 -sg72 -g73 -sS'srclibs' -p774 -(lp775 -S'VLC-2.2@59409d5' -p776 -asg76 -Nsg77 -g78 -sg79 -g20 -sg80 -S'1.0.1' -p777 -sS'build' -p778 -S'cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release' -p779 -sg84 -g85 -sg86 -g87 -sS'subdir' -p780 -S'vlc-android' -p781 -sg90 -g20 -sS'forcevercode' -p782 -I01 -sg92 -g93 -sg192 -g193 -sg99 -I00 -sg100 -I00 -sS'commit' -p783 -S'1.0.1' -p784 -sg103 -g104 -sS'buildjni' -p785 -(lp786 -S'no' -p787 -asg108 -g109 -sg110 -Nsg111 -Nsg112 -g113 -sS'prebuild' -p788 -S"sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc" -p789 -sg116 -I00 -sg117 -Nsa(dp790 -g65 -I00 -sg66 -S'1010303' -p791 -sg275 -I00 -sg69 -I00 -sg70 -I00 -sg112 -g113 +(lp791 sg72 g73 +sg74 +g75 sS'srclibs' p792 (lp793 -S'VLC@a9b19e4' +S'VLC-2.2@59409d5' p794 -asg76 -Nsg77 -g78 -sg79 +asg78 +Nsg79 +Nsg80 +g81 +sg82 g20 -sg80 -S'1.1.3' +sg83 +S'1.0.1' p795 sS'build' p796 -S'cd ../ && ./compile.sh -a "armeabi" --release' +S'cd ../ && ANDROID_ABI=armeabi ./compile.sh release' p797 -sg84 -g85 -sg86 -g71 +sg87 +g20 +sg88 +I00 sS'subdir' p798 S'vlc-android' p799 -sg90 -g20 sS'forcevercode' p800 -I00 +I01 sg92 g93 -sg192 -g193 +sg201 +g202 sg99 I00 sg100 I00 -sS'commit' -p801 -S'1.1.3' -p802 +sg101 +g102 sg103 g104 sS'buildjni' -p803 -(lp804 +p801 +(lp802 S'no' -p805 -asS'ndk' -p806 -S'r10d' -p807 +p803 +asg108 +g109 sg110 Nsg111 -NsS'gradle' -p808 -(lp809 -S'VanillaARMv6fpu' -p810 -asS'prebuild' -p811 -S'sed -i -e \'/^TARGET/aexit 0\' -e \'s@\\-d \\"gradle\\/wrapper\\"@1@g\' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc' -p812 -sg116 +g112 +sg113 +Nsg114 I00 +sS'prebuild' +p804 +S"sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc" +p805 sg117 -Nsa(dp813 +I00 +sS'commit' +p806 +S'1.0.1' +p807 +sa(dp808 +g65 +I00 +sg66 +S'10104' +p809 +sg284 +I00 +sg69 +I00 +sg70 +(lp810 +sg72 +g73 +sg74 +g75 +sS'srclibs' +p811 +(lp812 +S'VLC-2.2@59409d5' +p813 +asg78 +Nsg79 +Nsg80 +g81 +sg82 +g20 +sg83 +S'1.0.1' +p814 +sS'build' +p815 +S'cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release' +p816 +sg87 +g20 +sg88 +I00 +sS'subdir' +p817 +S'vlc-android' +p818 +sS'forcevercode' +p819 +I01 +sg92 +g93 +sg201 +g202 +sg99 +I00 +sg100 +I00 +sg101 +g102 +sg103 +g104 +sS'buildjni' +p820 +(lp821 +S'no' +p822 +asg108 +g109 +sg110 +Nsg111 +g112 +sg113 +Nsg114 +I00 +sS'prebuild' +p823 +S"sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc" +p824 +sg117 +I00 +sS'commit' +p825 +S'1.0.1' +p826 +sa(dp827 +g65 +I00 +sg66 +S'1010303' +p828 +sg284 +I00 +sg69 +I00 +sg70 +(lp829 +sg72 +g73 +sS'gradle' +p830 +(lp831 +S'VanillaARMv6fpu' +p832 +asS'srclibs' +p833 +(lp834 +S'VLC@a9b19e4' +p835 +asg78 +Nsg79 +Nsg80 +g81 +sg82 +g20 +sg83 +S'1.1.3' +p836 +sS'build' +p837 +S'cd ../ && ./compile.sh -a "armeabi" --release' +p838 +sg87 +g20 +sg88 +I00 +sS'subdir' +p839 +S'vlc-android' +p840 +sS'forcevercode' +p841 +I00 +sg92 +g93 +sg201 +g202 +sg99 +I00 +sg100 +I00 +sg101 +g102 +sg103 +g104 +sS'buildjni' +p842 +(lp843 +S'no' +p844 +asS'ndk' +p845 +S'r10d' +p846 +sg110 +Nsg111 +g114 +sg113 +Nsg74 +g75 +sS'prebuild' +p847 +S'sed -i -e \'/^TARGET/aexit 0\' -e \'s@\\-d \\"gradle\\/wrapper\\"@1@g\' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc' +p848 +sg117 +I00 +sS'commit' +p849 +S'1.1.3' +p850 +sa(dp851 g65 I00 sg66 S'1010304' -p814 -sg275 +p852 +sg284 I00 sg69 I00 sg70 -I00 -sg112 -g113 +(lp853 sg72 g73 -sS'srclibs' -p815 -(lp816 +sS'gradle' +p854 +(lp855 +S'VanillaARMv7' +p856 +asS'srclibs' +p857 +(lp858 S'VLC@a9b19e4' -p817 -asg76 -Nsg77 -g78 -sg79 +p859 +asg78 +Nsg79 +Nsg80 +g81 +sg82 g20 -sg80 +sg83 S'1.1.3' -p818 +p860 sS'build' -p819 +p861 S'cd ../ && ./compile.sh -a "armeabi-v7a" --release' -p820 -sg84 -g85 -sg86 -g71 -sS'subdir' -p821 -S'vlc-android' -p822 -sg90 +p862 +sg87 g20 -sg800 +sg88 +I00 +sS'subdir' +p863 +S'vlc-android' +p864 +sg841 I00 sg92 g93 -sg192 -g193 +sg201 +g202 sg99 I00 sg100 I00 -sS'commit' -p823 -S'1.1.3' -p824 +sg101 +g102 sg103 g104 sS'buildjni' -p825 -(lp826 +p865 +(lp866 S'no' -p827 +p867 asS'ndk' -p828 +p868 S'r10d' -p829 +p869 sg110 Nsg111 -NsS'gradle' -p830 -(lp831 -S'VanillaARMv7' -p832 -asS'prebuild' -p833 +g114 +sg113 +Nsg74 +g75 +sS'prebuild' +p870 S'sed -i -e \'/^TARGET/aexit 0\' -e \'s@\\-d \\"gradle\\/wrapper\\"@1@g\' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc' -p834 -sg116 -I00 +p871 sg117 -Nsa(dp835 +I00 +sS'commit' +p872 +S'1.1.3' +p873 +sa(dp874 g65 I00 sg66 S'1010305' -p836 -sg275 +p875 +sg284 I00 sg69 I00 sg70 -I00 -sg112 -g113 +(lp876 sg72 g73 -sS'srclibs' -p837 -(lp838 +sS'gradle' +p877 +(lp878 +S'VanillaX86' +p879 +asS'srclibs' +p880 +(lp881 S'VLC@a9b19e4' -p839 -asg76 -Nsg77 -g78 -sg79 +p882 +asg78 +Nsg79 +Nsg80 +g81 +sg82 g20 -sg80 +sg83 S'1.1.3' -p840 +p883 sS'build' -p841 +p884 S'cd ../ && ./compile.sh -a "x86" --release' -p842 -sg84 -g85 -sg86 -g71 -sS'subdir' -p843 -S'vlc-android' -p844 -sg90 +p885 +sg87 g20 -sg800 +sg88 +I00 +sS'subdir' +p886 +S'vlc-android' +p887 +sg841 I00 sg92 g93 -sg192 -g193 +sg201 +g202 sg99 I00 sg100 I00 -sS'commit' -p845 -S'1.1.3' -p846 +sg101 +g102 sg103 g104 sS'buildjni' -p847 -(lp848 +p888 +(lp889 S'no' -p849 +p890 asS'ndk' -p850 +p891 S'r10d' -p851 +p892 sg110 Nsg111 -NsS'gradle' -p852 -(lp853 -S'VanillaX86' -p854 -asS'prebuild' -p855 +g114 +sg113 +Nsg74 +g75 +sS'prebuild' +p893 S'sed -i -e \'/^TARGET/aexit 0\' -e \'s@\\-d \\"gradle\\/wrapper\\"@1@g\' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc' -p856 -sg116 -I00 +p894 sg117 -Nsa(dp857 +I00 +sS'commit' +p895 +S'1.1.3' +p896 +sa(dp897 g65 I00 sg66 S'1010503' -p858 -sg275 -I00 -sg69 -I00 -sg70 -I00 -sg112 -g113 -sg72 -g73 -sS'srclibs' -p859 -(lp860 -S'VLC@e6b4585' -p861 -asg76 -Nsg77 -g78 -sg79 -g20 -sg80 -S'1.1.5' -p862 -sS'build' -p863 -S'cd ../ && ./compile.sh -a "armeabi" --release' -p864 -sg84 -g85 -sg86 -g71 -sS'subdir' -p865 -S'vlc-android' -p866 -sg90 -g20 -sg800 -I00 -sg92 -g93 -sg192 -g193 -sg99 -I00 -sg100 -I00 -sS'commit' -p867 -S'1.1.5' -p868 -sg103 -g104 -sS'buildjni' -p869 -(lp870 -S'no' -p871 -asS'ndk' -p872 -S'r10d' -p873 -sg110 -Nsg111 -NsS'gradle' -p874 -(lp875 -S'VanillaARMv6fpu' -p876 -asS'prebuild' -p877 -S'sed -i -e \'/^TARGET/aexit 0\' -e \'s@\\-d \\"gradle\\/wrapper\\"@1@g\' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc' -p878 -sg116 -I00 -sg117 -Nsa(dp879 -g65 -I00 -sg66 -S'1010504' -p880 -sg275 -I00 -sg69 -I00 -sg70 -I00 -sg112 -g113 -sg72 -g73 -sS'srclibs' -p881 -(lp882 -S'VLC@e6b4585' -p883 -asg76 -Nsg77 -g78 -sg79 -g20 -sg80 -S'1.1.5' -p884 -sS'build' -p885 -S'cd ../ && ./compile.sh -a "armeabi-v7a" --release' -p886 -sg84 -g85 -sg86 -g71 -sS'subdir' -p887 -S'vlc-android' -p888 -sg90 -g20 -sg800 -I00 -sg92 -g93 -sg192 -g193 -sg99 -I00 -sg100 -I00 -sS'commit' -p889 -S'1.1.5' -p890 -sg103 -g104 -sS'buildjni' -p891 -(lp892 -S'no' -p893 -asS'ndk' -p894 -S'r10d' -p895 -sg110 -Nsg111 -NsS'gradle' -p896 -(lp897 -S'VanillaARMv7' p898 -asS'prebuild' -p899 -S'sed -i -e \'/^TARGET/aexit 0\' -e \'s@\\-d \\"gradle\\/wrapper\\"@1@g\' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc' -p900 -sg116 -I00 -sg117 -Nsa(dp901 -g65 -I00 -sg66 -S'1010505' -p902 -sg275 +sg284 I00 sg69 I00 sg70 -I00 -sg112 -g113 +(lp899 sg72 g73 -sS'srclibs' +sS'gradle' +p900 +(lp901 +S'VanillaARMv6fpu' +p902 +asS'srclibs' p903 (lp904 S'VLC@e6b4585' p905 -asg76 -Nsg77 -g78 -sg79 +asg78 +Nsg79 +Nsg80 +g81 +sg82 g20 -sg80 +sg83 S'1.1.5' p906 sS'build' p907 -S'cd ../ && ./compile.sh -a "x86" --release' +S'cd ../ && ./compile.sh -a "armeabi" --release' p908 -sg84 -g85 -sg86 -g71 +sg87 +g20 +sg88 +I00 sS'subdir' p909 S'vlc-android' p910 -sg90 -g20 -sg800 +sg841 I00 sg92 g93 -sg192 -g193 +sg201 +g202 sg99 I00 sg100 I00 -sS'commit' +sg101 +g102 +sg103 +g104 +sS'buildjni' p911 -S'1.1.5' -p912 -sg103 -g104 -sS'buildjni' +(lp912 +S'no' p913 -(lp914 -S'no' -p915 asS'ndk' -p916 +p914 S'r10d' -p917 +p915 sg110 Nsg111 -NsS'gradle' -p918 -(lp919 -S'VanillaX86' -p920 -asS'prebuild' -p921 +g114 +sg113 +Nsg74 +g75 +sS'prebuild' +p916 S'sed -i -e \'/^TARGET/aexit 0\' -e \'s@\\-d \\"gradle\\/wrapper\\"@1@g\' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc' -p922 -sg116 -I00 +p917 sg117 -Nsa(dp923 +I00 +sS'commit' +p918 +S'1.1.5' +p919 +sa(dp920 g65 I00 sg66 -S'1010603' -p924 -sg275 +S'1010504' +p921 +sg284 I00 sg69 I00 sg70 -I00 -sg112 -g113 +(lp922 sg72 g73 -sS'srclibs' +sS'gradle' +p923 +(lp924 +S'VanillaARMv7' p925 -(lp926 -S'VLC@551b670' -p927 -asg76 -Nsg77 -g78 -sg79 -g20 -sg80 -S'1.1.6' +asS'srclibs' +p926 +(lp927 +S'VLC@e6b4585' p928 -sS'build' -p929 -S'cd ../ && ./compile.sh -a "armeabi" --release' -p930 -sg84 -g85 -sg86 -g71 -sS'subdir' -p931 -S'vlc-android' -p932 -sg90 +asg78 +Nsg79 +Nsg80 +g81 +sg82 g20 -sg800 +sg83 +S'1.1.5' +p929 +sS'build' +p930 +S'cd ../ && ./compile.sh -a "armeabi-v7a" --release' +p931 +sg87 +g20 +sg88 +I00 +sS'subdir' +p932 +S'vlc-android' +p933 +sg841 I00 sg92 g93 -sg192 -g193 +sg201 +g202 sg99 I00 sg100 I00 -sS'commit' -p933 -S'1.1.6' -p934 +sg101 +g102 sg103 g104 sS'buildjni' -p935 -(lp936 +p934 +(lp935 S'no' -p937 +p936 asS'ndk' -p938 +p937 S'r10d' -p939 +p938 sg110 Nsg111 -NsS'gradle' -p940 -(lp941 -S'VanillaARMv6fpu' -p942 -asS'prebuild' -p943 +g114 +sg113 +Nsg74 +g75 +sS'prebuild' +p939 S'sed -i -e \'/^TARGET/aexit 0\' -e \'s@\\-d \\"gradle\\/wrapper\\"@1@g\' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc' -p944 -sg116 -I00 +p940 sg117 -Nsa(dp945 +I00 +sS'commit' +p941 +S'1.1.5' +p942 +sa(dp943 g65 I00 sg66 -S'1010604' -p946 -sg275 +S'1010505' +p944 +sg284 I00 sg69 I00 sg70 -I00 -sg112 -g113 +(lp945 sg72 g73 -sS'srclibs' -p947 -(lp948 -S'VLC@551b670' +sS'gradle' +p946 +(lp947 +S'VanillaX86' +p948 +asS'srclibs' p949 -asg76 -Nsg77 -g78 -sg79 -g20 -sg80 -S'1.1.6' -p950 -sS'build' +(lp950 +S'VLC@e6b4585' p951 -S'cd ../ && ./compile.sh -a "armeabi-v7a" --release' -p952 -sg84 -g85 -sg86 -g71 -sS'subdir' -p953 -S'vlc-android' -p954 -sg90 +asg78 +Nsg79 +Nsg80 +g81 +sg82 g20 -sg800 +sg83 +S'1.1.5' +p952 +sS'build' +p953 +S'cd ../ && ./compile.sh -a "x86" --release' +p954 +sg87 +g20 +sg88 +I00 +sS'subdir' +p955 +S'vlc-android' +p956 +sg841 I00 sg92 g93 -sg192 -g193 +sg201 +g202 sg99 I00 sg100 I00 -sS'commit' -p955 -S'1.1.6' -p956 +sg101 +g102 sg103 g104 sS'buildjni' @@ -3655,1838 +3574,2052 @@ S'r10d' p961 sg110 Nsg111 -NsS'gradle' +g114 +sg113 +Nsg74 +g75 +sS'prebuild' p962 -(lp963 -S'VanillaARMv7' -p964 -asS'prebuild' -p965 S'sed -i -e \'/^TARGET/aexit 0\' -e \'s@\\-d \\"gradle\\/wrapper\\"@1@g\' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc' -p966 -sg116 -I00 +p963 sg117 -Nsa(dp967 +I00 +sS'commit' +p964 +S'1.1.5' +p965 +sa(dp966 +g65 +I00 +sg66 +S'1010603' +p967 +sg284 +I00 +sg69 +I00 +sg70 +(lp968 +sg72 +g73 +sS'gradle' +p969 +(lp970 +S'VanillaARMv6fpu' +p971 +asS'srclibs' +p972 +(lp973 +S'VLC@551b670' +p974 +asg78 +Nsg79 +Nsg80 +g81 +sg82 +g20 +sg83 +S'1.1.6' +p975 +sS'build' +p976 +S'cd ../ && ./compile.sh -a "armeabi" --release' +p977 +sg87 +g20 +sg88 +I00 +sS'subdir' +p978 +S'vlc-android' +p979 +sg841 +I00 +sg92 +g93 +sg201 +g202 +sg99 +I00 +sg100 +I00 +sg101 +g102 +sg103 +g104 +sS'buildjni' +p980 +(lp981 +S'no' +p982 +asS'ndk' +p983 +S'r10d' +p984 +sg110 +Nsg111 +g114 +sg113 +Nsg74 +g75 +sS'prebuild' +p985 +S'sed -i -e \'/^TARGET/aexit 0\' -e \'s@\\-d \\"gradle\\/wrapper\\"@1@g\' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc' +p986 +sg117 +I00 +sS'commit' +p987 +S'1.1.6' +p988 +sa(dp989 +g65 +I00 +sg66 +S'1010604' +p990 +sg284 +I00 +sg69 +I00 +sg70 +(lp991 +sg72 +g73 +sS'gradle' +p992 +(lp993 +S'VanillaARMv7' +p994 +asS'srclibs' +p995 +(lp996 +S'VLC@551b670' +p997 +asg78 +Nsg79 +Nsg80 +g81 +sg82 +g20 +sg83 +S'1.1.6' +p998 +sS'build' +p999 +S'cd ../ && ./compile.sh -a "armeabi-v7a" --release' +p1000 +sg87 +g20 +sg88 +I00 +sS'subdir' +p1001 +S'vlc-android' +p1002 +sg841 +I00 +sg92 +g93 +sg201 +g202 +sg99 +I00 +sg100 +I00 +sg101 +g102 +sg103 +g104 +sS'buildjni' +p1003 +(lp1004 +S'no' +p1005 +asS'ndk' +p1006 +S'r10d' +p1007 +sg110 +Nsg111 +g114 +sg113 +Nsg74 +g75 +sS'prebuild' +p1008 +S'sed -i -e \'/^TARGET/aexit 0\' -e \'s@\\-d \\"gradle\\/wrapper\\"@1@g\' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc' +p1009 +sg117 +I00 +sS'commit' +p1010 +S'1.1.6' +p1011 +sa(dp1012 g65 I00 sg66 S'1010605' -p968 -sg275 +p1013 +sg284 I00 sg69 I00 sg70 -I00 -sg112 -g113 +(lp1014 sg72 g73 -sS'srclibs' -p969 -(lp970 +sS'gradle' +p1015 +(lp1016 +S'VanillaX86' +p1017 +asS'srclibs' +p1018 +(lp1019 S'VLC@551b670' -p971 -asg76 -Nsg77 -g78 -sg79 +p1020 +asg78 +Nsg79 +Nsg80 +g81 +sg82 g20 -sg80 +sg83 S'1.1.6' -p972 +p1021 sS'build' -p973 +p1022 S'cd ../ && ./compile.sh -a "x86" --release' -p974 -sg84 -g85 -sg86 -g71 -sS'subdir' -p975 -S'vlc-android' -p976 -sg90 +p1023 +sg87 g20 -sg800 +sg88 +I00 +sS'subdir' +p1024 +S'vlc-android' +p1025 +sg841 I00 sg92 g93 -sg192 -g193 +sg201 +g202 sg99 I00 sg100 I00 -sS'commit' -p977 -S'1.1.6' -p978 +sg101 +g102 sg103 g104 sS'buildjni' -p979 -(lp980 +p1026 +(lp1027 S'no' -p981 +p1028 asS'ndk' -p982 +p1029 S'r10d' -p983 +p1030 sg110 Nsg111 -NsS'gradle' -p984 -(lp985 -S'VanillaX86' -p986 -asS'prebuild' -p987 +g114 +sg113 +Nsg74 +g75 +sS'prebuild' +p1031 S'sed -i -e \'/^TARGET/aexit 0\' -e \'s@\\-d \\"gradle\\/wrapper\\"@1@g\' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc' -p988 -sg116 -I00 +p1032 sg117 -Nsa(dp989 +I00 +sS'commit' +p1033 +S'1.1.6' +p1034 +sa(dp1035 g65 I00 sg66 S'1020003' -p990 -sg275 +p1036 +sg284 I00 sg69 I00 sg70 -I00 -sg112 -g113 +(lp1037 sg72 g73 -sS'srclibs' -p991 -(lp992 +sS'gradle' +p1038 +(lp1039 +S'VanillaARMv6fpu' +p1040 +asS'srclibs' +p1041 +(lp1042 S'VLC@23c8d86' -p993 -asg76 -Nsg77 -g78 -sg79 +p1043 +asg78 +Nsg79 +Nsg80 +g81 +sg82 g20 -sg80 +sg83 S'1.2.0' -p994 +p1044 sS'build' -p995 +p1045 S'cd ../ && ./compile.sh -a "armeabi" --release' -p996 -sg84 -g85 -sg86 -g71 -sS'subdir' -p997 -S'vlc-android' -p998 -sg90 +p1046 +sg87 g20 -sg800 +sg88 +I00 +sS'subdir' +p1047 +S'vlc-android' +p1048 +sg841 I00 sg92 g93 -sg192 -g193 +sg201 +g202 sg99 I00 sg100 I00 -sS'commit' -p999 -S'1.2.0' -p1000 +sg101 +g102 sg103 g104 sS'buildjni' -p1001 -(lp1002 +p1049 +(lp1050 S'no' -p1003 +p1051 asS'ndk' -p1004 +p1052 S'r10d' -p1005 +p1053 sg110 Nsg111 -NsS'gradle' -p1006 -(lp1007 -S'VanillaARMv6fpu' -p1008 -asS'prebuild' -p1009 +g114 +sg113 +Nsg74 +g75 +sS'prebuild' +p1054 S'sed -i -e \'/^TARGET/aexit 0\' -e \'s@\\-d \\"gradle\\/wrapper\\"@1@g\' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc' -p1010 -sg116 -I00 +p1055 sg117 -Nsa(dp1011 +I00 +sS'commit' +p1056 +S'1.2.0' +p1057 +sa(dp1058 g65 I00 sg66 S'1020004' -p1012 -sg275 +p1059 +sg284 I00 sg69 I00 sg70 -I00 -sg112 -g113 +(lp1060 sg72 g73 -sS'srclibs' -p1013 -(lp1014 +sS'gradle' +p1061 +(lp1062 +S'VanillaARMv7' +p1063 +asS'srclibs' +p1064 +(lp1065 S'VLC@23c8d86' -p1015 -asg76 -Nsg77 -g78 -sg79 +p1066 +asg78 +Nsg79 +Nsg80 +g81 +sg82 g20 -sg80 +sg83 S'1.2.0' -p1016 +p1067 sS'build' -p1017 +p1068 S'cd ../ && ./compile.sh -a "armeabi-v7a" --release' -p1018 -sg84 -g85 -sg86 -g71 -sS'subdir' -p1019 -S'vlc-android' -p1020 -sg90 +p1069 +sg87 g20 -sg800 +sg88 +I00 +sS'subdir' +p1070 +S'vlc-android' +p1071 +sg841 I00 sg92 g93 -sg192 -g193 +sg201 +g202 sg99 I00 sg100 I00 -sS'commit' -p1021 -S'1.2.0' -p1022 +sg101 +g102 sg103 g104 sS'buildjni' -p1023 -(lp1024 +p1072 +(lp1073 S'no' -p1025 +p1074 asS'ndk' -p1026 +p1075 S'r10d' -p1027 +p1076 sg110 Nsg111 -NsS'gradle' -p1028 -(lp1029 -S'VanillaARMv7' -p1030 -asS'prebuild' -p1031 +g114 +sg113 +Nsg74 +g75 +sS'prebuild' +p1077 S'sed -i -e \'/^TARGET/aexit 0\' -e \'s@\\-d \\"gradle\\/wrapper\\"@1@g\' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc' -p1032 -sg116 -I00 +p1078 sg117 -Nsa(dp1033 +I00 +sS'commit' +p1079 +S'1.2.0' +p1080 +sa(dp1081 g65 I00 sg66 S'1020005' -p1034 -sg275 +p1082 +sg284 I00 sg69 I00 sg70 -I00 -sg112 -g113 +(lp1083 sg72 g73 -sS'srclibs' -p1035 -(lp1036 +sS'gradle' +p1084 +(lp1085 +S'VanillaX86' +p1086 +asS'srclibs' +p1087 +(lp1088 S'VLC@23c8d86' -p1037 -asg76 -Nsg77 -g78 -sg79 +p1089 +asg78 +Nsg79 +Nsg80 +g81 +sg82 g20 -sg80 +sg83 S'1.2.0' -p1038 +p1090 sS'build' -p1039 +p1091 S'cd ../ && ./compile.sh -a "x86" --release' -p1040 -sg84 -g85 -sg86 -g71 -sS'subdir' -p1041 -S'vlc-android' -p1042 -sg90 +p1092 +sg87 g20 -sg800 +sg88 +I00 +sS'subdir' +p1093 +S'vlc-android' +p1094 +sg841 I00 sg92 g93 -sg192 -g193 +sg201 +g202 sg99 I00 sg100 I00 -sS'commit' -p1043 -S'1.2.0' -p1044 +sg101 +g102 sg103 g104 sS'buildjni' -p1045 -(lp1046 +p1095 +(lp1096 S'no' -p1047 +p1097 asS'ndk' -p1048 +p1098 S'r10d' -p1049 +p1099 sg110 Nsg111 -NsS'gradle' -p1050 -(lp1051 -S'VanillaX86' -p1052 -asS'prebuild' -p1053 +g114 +sg113 +Nsg74 +g75 +sS'prebuild' +p1100 S'sed -i -e \'/^TARGET/aexit 0\' -e \'s@\\-d \\"gradle\\/wrapper\\"@1@g\' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc' -p1054 -sg116 -I00 +p1101 sg117 -Nsa(dp1055 +I00 +sS'commit' +p1102 +S'1.2.0' +p1103 +sa(dp1104 g65 I00 sg66 S'1020103' -p1056 -sg275 +p1105 +sg284 I00 sg69 I00 sg70 -I00 -sg112 -g113 +(lp1106 sg72 g73 -sS'srclibs' -p1057 -(lp1058 +sS'gradle' +p1107 +(lp1108 +S'VanillaARMv6fpu' +p1109 +asS'srclibs' +p1110 +(lp1111 S'VLC@23c8d86' -p1059 -asg76 -Nsg77 -g78 -sg79 +p1112 +asg78 +Nsg79 +Nsg80 +g81 +sg82 g20 -sg80 +sg83 S'1.2.1' -p1060 +p1113 sS'build' -p1061 +p1114 S'cd ../ && ./compile.sh -a "armeabi" --release' -p1062 -sg84 -g85 -sg86 -g71 -sS'subdir' -p1063 -S'vlc-android' -p1064 -sg90 +p1115 +sg87 g20 -sg800 +sg88 +I00 +sS'subdir' +p1116 +S'vlc-android' +p1117 +sg841 I00 sg92 g93 -sg192 -g193 +sg201 +g202 sg99 I00 sg100 I00 -sS'commit' -p1065 -S'1.2.1' -p1066 +sg101 +g102 sg103 g104 sS'buildjni' -p1067 -(lp1068 +p1118 +(lp1119 S'no' -p1069 +p1120 asS'ndk' -p1070 +p1121 S'r10d' -p1071 +p1122 sg110 Nsg111 -NsS'gradle' -p1072 -(lp1073 -S'VanillaARMv6fpu' -p1074 -asS'prebuild' -p1075 +g114 +sg113 +Nsg74 +g75 +sS'prebuild' +p1123 S'sed -i -e \'/^TARGET/aexit 0\' -e \'s@\\-d \\"gradle\\/wrapper\\"@1@g\' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc' -p1076 -sg116 -I00 +p1124 sg117 -Nsa(dp1077 +I00 +sS'commit' +p1125 +S'1.2.1' +p1126 +sa(dp1127 g65 I00 sg66 S'1020104' -p1078 -sg275 +p1128 +sg284 I00 sg69 I00 sg70 -I00 -sg112 -g113 +(lp1129 sg72 g73 -sS'srclibs' -p1079 -(lp1080 +sS'gradle' +p1130 +(lp1131 +S'VanillaARMv7' +p1132 +asS'srclibs' +p1133 +(lp1134 S'VLC@23c8d86' -p1081 -asg76 -Nsg77 -g78 -sg79 +p1135 +asg78 +Nsg79 +Nsg80 +g81 +sg82 g20 -sg80 +sg83 S'1.2.1' -p1082 +p1136 sS'build' -p1083 +p1137 S'cd ../ && ./compile.sh -a "armeabi-v7a" --release' -p1084 -sg84 -g85 -sg86 -g71 -sS'subdir' -p1085 -S'vlc-android' -p1086 -sg90 +p1138 +sg87 g20 -sg800 +sg88 +I00 +sS'subdir' +p1139 +S'vlc-android' +p1140 +sg841 I00 sg92 g93 -sg192 -g193 +sg201 +g202 sg99 I00 sg100 I00 -sS'commit' -p1087 -S'1.2.1' -p1088 +sg101 +g102 sg103 g104 sS'buildjni' -p1089 -(lp1090 +p1141 +(lp1142 S'no' -p1091 +p1143 asS'ndk' -p1092 +p1144 S'r10d' -p1093 +p1145 sg110 Nsg111 -NsS'gradle' -p1094 -(lp1095 -S'VanillaARMv7' -p1096 -asS'prebuild' -p1097 +g114 +sg113 +Nsg74 +g75 +sS'prebuild' +p1146 S'sed -i -e \'/^TARGET/aexit 0\' -e \'s@\\-d \\"gradle\\/wrapper\\"@1@g\' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc' -p1098 -sg116 -I00 +p1147 sg117 -Nsa(dp1099 +I00 +sS'commit' +p1148 +S'1.2.1' +p1149 +sa(dp1150 g65 I00 sg66 S'1020105' -p1100 -sg275 +p1151 +sg284 I00 sg69 I00 sg70 -I00 -sg112 -g113 +(lp1152 sg72 g73 -sS'srclibs' -p1101 -(lp1102 +sS'gradle' +p1153 +(lp1154 +S'VanillaX86' +p1155 +asS'srclibs' +p1156 +(lp1157 S'VLC@23c8d86' -p1103 -asg76 -Nsg77 -g78 -sg79 +p1158 +asg78 +Nsg79 +Nsg80 +g81 +sg82 g20 -sg80 +sg83 S'1.2.1' -p1104 +p1159 sS'build' -p1105 +p1160 S'cd ../ && ./compile.sh -a "x86" --release' -p1106 -sg84 -g85 -sg86 -g71 -sS'subdir' -p1107 -S'vlc-android' -p1108 -sg90 +p1161 +sg87 g20 -sg800 +sg88 +I00 +sS'subdir' +p1162 +S'vlc-android' +p1163 +sg841 I00 sg92 g93 -sg192 -g193 +sg201 +g202 sg99 I00 sg100 I00 -sS'commit' -p1109 -S'1.2.1' -p1110 +sg101 +g102 sg103 g104 sS'buildjni' -p1111 -(lp1112 +p1164 +(lp1165 S'no' -p1113 +p1166 asS'ndk' -p1114 +p1167 S'r10d' -p1115 +p1168 sg110 Nsg111 -NsS'gradle' -p1116 -(lp1117 -S'VanillaX86' -p1118 -asS'prebuild' -p1119 +g114 +sg113 +Nsg74 +g75 +sS'prebuild' +p1169 S'sed -i -e \'/^TARGET/aexit 0\' -e \'s@\\-d \\"gradle\\/wrapper\\"@1@g\' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc' -p1120 -sg116 -I00 +p1170 sg117 -Nsa(dp1121 +I00 +sS'commit' +p1171 +S'1.2.1' +p1172 +sa(dp1173 g65 I00 sg66 S'1020203' -p1122 -sg275 +p1174 +sg284 I00 sg69 I00 sg70 -I00 -sg112 -g113 +(lp1175 sg72 g73 -sS'srclibs' -p1123 -(lp1124 +sS'gradle' +p1176 +(lp1177 +S'VanillaARMv6fpu' +p1178 +asS'srclibs' +p1179 +(lp1180 S'VLC@7491a5f' -p1125 -asg76 -Nsg77 -g78 -sg79 +p1181 +asg78 +Nsg79 +Nsg80 +g81 +sg82 g20 -sg80 +sg83 S'1.2.2' -p1126 +p1182 sS'build' -p1127 +p1183 S'cd ../ && ./compile.sh -a "armeabi" --release' -p1128 -sg84 -g85 -sg86 -g71 -sS'subdir' -p1129 -S'vlc-android' -p1130 -sg90 +p1184 +sg87 g20 -sg800 +sg88 +I00 +sS'subdir' +p1185 +S'vlc-android' +p1186 +sg841 I00 sg92 g93 -sg192 -g193 +sg201 +g202 sg99 I00 sg100 I00 -sS'commit' -p1131 -S'1.2.2' -p1132 +sg101 +g102 sg103 g104 sS'buildjni' -p1133 -(lp1134 +p1187 +(lp1188 S'no' -p1135 +p1189 asS'ndk' -p1136 +p1190 S'r10d' -p1137 +p1191 sg110 Nsg111 -NsS'gradle' -p1138 -(lp1139 -S'VanillaARMv6fpu' -p1140 -asS'prebuild' -p1141 +g114 +sg113 +Nsg74 +g75 +sS'prebuild' +p1192 S'sed -i -e \'/^TARGET/aexit 0\' -e \'s@\\-d \\"gradle\\/wrapper\\"@1@g\' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc' -p1142 -sg116 -I00 +p1193 sg117 -Nsa(dp1143 +I00 +sS'commit' +p1194 +S'1.2.2' +p1195 +sa(dp1196 g65 I00 sg66 S'1020204' -p1144 -sg275 +p1197 +sg284 I00 sg69 I00 sg70 -I00 -sg112 -g113 +(lp1198 sg72 g73 -sS'srclibs' -p1145 -(lp1146 +sS'gradle' +p1199 +(lp1200 +S'VanillaARMv7' +p1201 +asS'srclibs' +p1202 +(lp1203 S'VLC@7491a5f' -p1147 -asg76 -Nsg77 -g78 -sg79 +p1204 +asg78 +Nsg79 +Nsg80 +g81 +sg82 g20 -sg80 +sg83 S'1.2.2' -p1148 +p1205 sS'build' -p1149 +p1206 S'cd ../ && ./compile.sh -a "armeabi-v7a" --release' -p1150 -sg84 -g85 -sg86 -g71 -sS'subdir' -p1151 -S'vlc-android' -p1152 -sg90 +p1207 +sg87 g20 -sg800 +sg88 +I00 +sS'subdir' +p1208 +S'vlc-android' +p1209 +sg841 I00 sg92 g93 -sg192 -g193 +sg201 +g202 sg99 I00 sg100 I00 -sS'commit' -p1153 -S'1.2.2' -p1154 +sg101 +g102 sg103 g104 sS'buildjni' -p1155 -(lp1156 +p1210 +(lp1211 S'no' -p1157 +p1212 asS'ndk' -p1158 +p1213 S'r10d' -p1159 +p1214 sg110 Nsg111 -NsS'gradle' -p1160 -(lp1161 -S'VanillaARMv7' -p1162 -asS'prebuild' -p1163 +g114 +sg113 +Nsg74 +g75 +sS'prebuild' +p1215 S'sed -i -e \'/^TARGET/aexit 0\' -e \'s@\\-d \\"gradle\\/wrapper\\"@1@g\' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc' -p1164 -sg116 -I00 +p1216 sg117 -Nsa(dp1165 +I00 +sS'commit' +p1217 +S'1.2.2' +p1218 +sa(dp1219 g65 I00 sg66 S'1020205' -p1166 -sg275 +p1220 +sg284 I00 sg69 I00 sg70 -I00 -sg112 -g113 +(lp1221 sg72 g73 -sS'srclibs' -p1167 -(lp1168 +sS'gradle' +p1222 +(lp1223 +S'VanillaX86' +p1224 +asS'srclibs' +p1225 +(lp1226 S'VLC@7491a5f' -p1169 -asg76 -Nsg77 -g78 -sg79 +p1227 +asg78 +Nsg79 +Nsg80 +g81 +sg82 g20 -sg80 +sg83 S'1.2.2' -p1170 +p1228 sS'build' -p1171 +p1229 S'cd ../ && ./compile.sh -a "x86" --release' -p1172 -sg84 -g85 -sg86 -g71 -sS'subdir' -p1173 -S'vlc-android' -p1174 -sg90 +p1230 +sg87 g20 -sg800 +sg88 +I00 +sS'subdir' +p1231 +S'vlc-android' +p1232 +sg841 I00 sg92 g93 -sg192 -g193 +sg201 +g202 sg99 I00 sg100 I00 -sS'commit' -p1175 -S'1.2.2' -p1176 +sg101 +g102 sg103 g104 sS'buildjni' -p1177 -(lp1178 +p1233 +(lp1234 S'no' -p1179 +p1235 asS'ndk' -p1180 +p1236 S'r10d' -p1181 +p1237 sg110 Nsg111 -NsS'gradle' -p1182 -(lp1183 -S'VanillaX86' -p1184 -asS'prebuild' -p1185 +g114 +sg113 +Nsg74 +g75 +sS'prebuild' +p1238 S'sed -i -e \'/^TARGET/aexit 0\' -e \'s@\\-d \\"gradle\\/wrapper\\"@1@g\' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc' -p1186 -sg116 -I00 +p1239 sg117 -Nsa(dp1187 +I00 +sS'commit' +p1240 +S'1.2.2' +p1241 +sa(dp1242 g65 I00 sg66 S'1020303' -p1188 -sg275 +p1243 +sg284 I00 sg69 I00 sg70 -I00 -sg112 -g113 +(lp1244 sg72 g73 -sS'srclibs' -p1189 -(lp1190 +sS'gradle' +p1245 +(lp1246 +S'VanillaARMv6fpu' +p1247 +asS'srclibs' +p1248 +(lp1249 S'VLC@7491a5f' -p1191 -asg76 -Nsg77 -g78 -sg79 +p1250 +asg78 +Nsg79 +Nsg80 +g81 +sg82 g20 -sg80 +sg83 S'1.2.3' -p1192 +p1251 sS'build' -p1193 +p1252 S'cd ../ && ./compile.sh -a "armeabi" --release' -p1194 -sg84 -g85 -sg86 -g71 -sS'subdir' -p1195 -S'vlc-android' -p1196 -sg90 +p1253 +sg87 g20 -sg800 +sg88 +I00 +sS'subdir' +p1254 +S'vlc-android' +p1255 +sg841 I00 sg92 g93 -sg192 -g193 +sg201 +g202 sg99 I00 sg100 I00 -sS'commit' -p1197 -S'1.2.3' -p1198 +sg101 +g102 sg103 g104 sS'buildjni' -p1199 -(lp1200 +p1256 +(lp1257 S'no' -p1201 +p1258 asS'ndk' -p1202 +p1259 S'r10d' -p1203 +p1260 sg110 Nsg111 -NsS'gradle' -p1204 -(lp1205 -S'VanillaARMv6fpu' -p1206 -asS'prebuild' -p1207 +g114 +sg113 +Nsg74 +g75 +sS'prebuild' +p1261 S'sed -i -e \'/^TARGET/aexit 0\' -e \'s@\\-d \\"gradle\\/wrapper\\"@1@g\' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc' -p1208 -sg116 -I00 +p1262 sg117 -Nsa(dp1209 +I00 +sS'commit' +p1263 +S'1.2.3' +p1264 +sa(dp1265 g65 I00 sg66 S'1020304' -p1210 -sg275 +p1266 +sg284 I00 sg69 I00 sg70 -I00 -sg112 -g113 +(lp1267 sg72 g73 -sS'srclibs' -p1211 -(lp1212 +sS'gradle' +p1268 +(lp1269 +S'VanillaARMv7' +p1270 +asS'srclibs' +p1271 +(lp1272 S'VLC@7491a5f' -p1213 -asg76 -Nsg77 -g78 -sg79 +p1273 +asg78 +Nsg79 +Nsg80 +g81 +sg82 g20 -sg80 +sg83 S'1.2.3' -p1214 +p1274 sS'build' -p1215 +p1275 S'cd ../ && ./compile.sh -a "armeabi-v7a" --release' -p1216 -sg84 -g85 -sg86 -g71 -sS'subdir' -p1217 -S'vlc-android' -p1218 -sg90 +p1276 +sg87 g20 -sg800 +sg88 +I00 +sS'subdir' +p1277 +S'vlc-android' +p1278 +sg841 I00 sg92 g93 -sg192 -g193 +sg201 +g202 sg99 I00 sg100 I00 -sS'commit' -p1219 -S'1.2.3' -p1220 +sg101 +g102 sg103 g104 sS'buildjni' -p1221 -(lp1222 +p1279 +(lp1280 S'no' -p1223 +p1281 asS'ndk' -p1224 +p1282 S'r10d' -p1225 +p1283 sg110 Nsg111 -NsS'gradle' -p1226 -(lp1227 -S'VanillaARMv7' -p1228 -asS'prebuild' -p1229 +g114 +sg113 +Nsg74 +g75 +sS'prebuild' +p1284 S'sed -i -e \'/^TARGET/aexit 0\' -e \'s@\\-d \\"gradle\\/wrapper\\"@1@g\' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc' -p1230 -sg116 -I00 +p1285 sg117 -Nsa(dp1231 +I00 +sS'commit' +p1286 +S'1.2.3' +p1287 +sa(dp1288 g65 I00 sg66 S'1020305' -p1232 -sg275 +p1289 +sg284 I00 sg69 I00 sg70 -I00 -sg112 -g113 +(lp1290 sg72 g73 -sS'srclibs' -p1233 -(lp1234 +sS'gradle' +p1291 +(lp1292 +S'VanillaX86' +p1293 +asS'srclibs' +p1294 +(lp1295 S'VLC@7491a5f' -p1235 -asg76 -Nsg77 -g78 -sg79 +p1296 +asg78 +Nsg79 +Nsg80 +g81 +sg82 g20 -sg80 +sg83 S'1.2.3' -p1236 +p1297 sS'build' -p1237 +p1298 S'cd ../ && ./compile.sh -a "x86" --release' -p1238 -sg84 -g85 -sg86 -g71 -sS'subdir' -p1239 -S'vlc-android' -p1240 -sg90 +p1299 +sg87 g20 -sg800 +sg88 +I00 +sS'subdir' +p1300 +S'vlc-android' +p1301 +sg841 I00 sg92 g93 -sg192 -g193 +sg201 +g202 sg99 I00 sg100 I00 -sS'commit' -p1241 -S'1.2.3' -p1242 +sg101 +g102 sg103 g104 sS'buildjni' -p1243 -(lp1244 +p1302 +(lp1303 S'no' -p1245 +p1304 asS'ndk' -p1246 +p1305 S'r10d' -p1247 +p1306 sg110 Nsg111 -NsS'gradle' -p1248 -(lp1249 -S'VanillaX86' -p1250 -asS'prebuild' -p1251 +g114 +sg113 +Nsg74 +g75 +sS'prebuild' +p1307 S'sed -i -e \'/^TARGET/aexit 0\' -e \'s@\\-d \\"gradle\\/wrapper\\"@1@g\' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc' -p1252 -sg116 -I00 +p1308 sg117 -Nsa(dp1253 +I00 +sS'commit' +p1309 +S'1.2.3' +p1310 +sa(dp1311 g65 I00 sg66 S'1020403' -p1254 -sg275 +p1312 +sg284 I00 sg69 I00 sg70 -I00 -sg112 -g113 +(lp1313 sg72 g73 -sS'srclibs' -p1255 -(lp1256 +sS'gradle' +p1314 +(lp1315 +S'VanillaARMv6fpu' +p1316 +asS'srclibs' +p1317 +(lp1318 S'VLC@7491a5f' -p1257 -asg76 -Nsg77 -g78 -sg79 +p1319 +asg78 +Nsg79 +Nsg80 +g81 +sg82 g20 -sg80 +sg83 S'1.2.4' -p1258 +p1320 sS'build' -p1259 +p1321 S'cd ../ && ./compile.sh -a "armeabi" --release' -p1260 -sg84 -g85 -sg86 -g71 -sS'subdir' -p1261 -S'vlc-android' -p1262 -sg90 +p1322 +sg87 g20 -sg800 +sg88 +I00 +sS'subdir' +p1323 +S'vlc-android' +p1324 +sg841 I00 sg92 g93 -sg192 -g193 +sg201 +g202 sg99 I00 sg100 I00 -sS'commit' -p1263 -S'1.2.4' -p1264 +sg101 +g102 sg103 g104 sS'buildjni' -p1265 -(lp1266 +p1325 +(lp1326 S'no' -p1267 +p1327 asS'ndk' -p1268 +p1328 S'r10d' -p1269 +p1329 sg110 Nsg111 -NsS'gradle' -p1270 -(lp1271 -S'VanillaARMv6fpu' -p1272 -asS'prebuild' -p1273 +g114 +sg113 +Nsg74 +g75 +sS'prebuild' +p1330 S'sed -i -e \'/^TARGET/aexit 0\' -e \'s@\\-d \\"gradle\\/wrapper\\"@1@g\' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc' -p1274 -sg116 -I00 +p1331 sg117 -Nsa(dp1275 +I00 +sS'commit' +p1332 +S'1.2.4' +p1333 +sa(dp1334 g65 I00 sg66 S'1020404' -p1276 -sg275 +p1335 +sg284 I00 sg69 I00 sg70 -I00 -sg112 -g113 +(lp1336 sg72 g73 -sS'srclibs' -p1277 -(lp1278 +sS'gradle' +p1337 +(lp1338 +S'VanillaARMv7' +p1339 +asS'srclibs' +p1340 +(lp1341 S'VLC@7491a5f' -p1279 -asg76 -Nsg77 -g78 -sg79 +p1342 +asg78 +Nsg79 +Nsg80 +g81 +sg82 g20 -sg80 +sg83 S'1.2.4' -p1280 +p1343 sS'build' -p1281 +p1344 S'cd ../ && ./compile.sh -a "armeabi-v7a" --release' -p1282 -sg84 -g85 -sg86 -g71 -sS'subdir' -p1283 -S'vlc-android' -p1284 -sg90 +p1345 +sg87 g20 -sg800 +sg88 +I00 +sS'subdir' +p1346 +S'vlc-android' +p1347 +sg841 I00 sg92 g93 -sg192 -g193 +sg201 +g202 sg99 I00 sg100 I00 -sS'commit' -p1285 -S'1.2.4' -p1286 +sg101 +g102 sg103 g104 sS'buildjni' -p1287 -(lp1288 +p1348 +(lp1349 S'no' -p1289 +p1350 asS'ndk' -p1290 +p1351 S'r10d' -p1291 +p1352 sg110 Nsg111 -NsS'gradle' -p1292 -(lp1293 -S'VanillaARMv7' -p1294 -asS'prebuild' -p1295 +g114 +sg113 +Nsg74 +g75 +sS'prebuild' +p1353 S'sed -i -e \'/^TARGET/aexit 0\' -e \'s@\\-d \\"gradle\\/wrapper\\"@1@g\' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc' -p1296 -sg116 -I00 +p1354 sg117 -Nsa(dp1297 +I00 +sS'commit' +p1355 +S'1.2.4' +p1356 +sa(dp1357 g65 I00 sg66 S'1020405' -p1298 -sg275 +p1358 +sg284 I00 sg69 I00 sg70 -I00 -sg112 -g113 +(lp1359 sg72 g73 -sS'srclibs' -p1299 -(lp1300 +sS'gradle' +p1360 +(lp1361 +S'VanillaX86' +p1362 +asS'srclibs' +p1363 +(lp1364 S'VLC@7491a5f' -p1301 -asg76 -Nsg77 -g78 -sg79 +p1365 +asg78 +Nsg79 +Nsg80 +g81 +sg82 g20 -sg80 +sg83 S'1.2.4' -p1302 +p1366 sS'build' -p1303 +p1367 S'cd ../ && ./compile.sh -a "x86" --release' -p1304 -sg84 -g85 -sg86 -g71 -sS'subdir' -p1305 -S'vlc-android' -p1306 -sg90 +p1368 +sg87 g20 -sg800 +sg88 +I00 +sS'subdir' +p1369 +S'vlc-android' +p1370 +sg841 I00 sg92 g93 -sg192 -g193 +sg201 +g202 sg99 I00 sg100 I00 -sS'commit' -p1307 -S'1.2.4' -p1308 +sg101 +g102 sg103 g104 sS'buildjni' -p1309 -(lp1310 +p1371 +(lp1372 S'no' -p1311 +p1373 asS'ndk' -p1312 +p1374 S'r10d' -p1313 +p1375 sg110 Nsg111 -NsS'gradle' -p1314 -(lp1315 -S'VanillaX86' -p1316 -asS'prebuild' -p1317 +g114 +sg113 +Nsg74 +g75 +sS'prebuild' +p1376 S'sed -i -e \'/^TARGET/aexit 0\' -e \'s@\\-d \\"gradle\\/wrapper\\"@1@g\' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc' -p1318 -sg116 -I00 +p1377 sg117 -Nsa(dp1319 +I00 +sS'commit' +p1378 +S'1.2.4' +p1379 +sa(dp1380 g65 I00 sg66 S'1020503' -p1320 -sg275 +p1381 +sg284 I00 sg69 I00 sg70 -I00 -sg112 -g113 +(lp1382 sg72 g73 -sS'srclibs' -p1321 -(lp1322 +sS'gradle' +p1383 +(lp1384 +S'VanillaARMv6fpu' +p1385 +asS'srclibs' +p1386 +(lp1387 S'VLC@50accb8' -p1323 -asg76 -Nsg77 -g78 -sg79 +p1388 +asg78 +Nsg79 +Nsg80 +g81 +sg82 g20 -sg80 +sg83 S'1.2.5' -p1324 +p1389 sS'build' -p1325 +p1390 S'cd ../ && ./compile.sh -a "armeabi" --release' -p1326 -sg84 -g85 -sg86 -g71 -sS'subdir' -p1327 -S'vlc-android' -p1328 -sg90 +p1391 +sg87 g20 -sg800 +sg88 +I00 +sS'subdir' +p1392 +S'vlc-android' +p1393 +sg841 I00 sg92 g93 -sg192 -g193 +sg201 +g202 sg99 I00 sg100 I00 -sS'commit' -p1329 -S'1.2.5' -p1330 +sg101 +g102 sg103 g104 sS'buildjni' -p1331 -(lp1332 +p1394 +(lp1395 S'no' -p1333 +p1396 asS'ndk' -p1334 +p1397 S'r10d' -p1335 +p1398 sg110 Nsg111 -NsS'gradle' -p1336 -(lp1337 -S'VanillaARMv6fpu' -p1338 -asS'prebuild' -p1339 +g114 +sg113 +Nsg74 +g75 +sS'prebuild' +p1399 S'sed -i -e \'/^TARGET/aexit 0\' -e \'s@\\-d \\"gradle\\/wrapper\\"@1@g\' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc' -p1340 -sg116 -I00 +p1400 sg117 -Nsa(dp1341 +I00 +sS'commit' +p1401 +S'1.2.5' +p1402 +sa(dp1403 g65 I00 sg66 S'1020504' -p1342 -sg275 -I00 -sg69 -I00 -sg70 -I00 -sg112 -g113 -sg72 -g73 -sS'srclibs' -p1343 -(lp1344 -S'VLC@50accb8' -p1345 -asg76 -Nsg77 -g78 -sg79 -g20 -sg80 -S'1.2.5' -p1346 -sS'build' -p1347 -S'cd ../ && ./compile.sh -a "armeabi-v7a" --release' -p1348 -sg84 -g85 -sg86 -g71 -sS'subdir' -p1349 -S'vlc-android' -p1350 -sg90 -g20 -sg800 -I00 -sg92 -g93 -sg192 -g193 -sg99 -I00 -sg100 -I00 -sS'commit' -p1351 -S'1.2.5' -p1352 -sg103 -g104 -sS'buildjni' -p1353 -(lp1354 -S'no' -p1355 -asS'ndk' -p1356 -S'r10d' -p1357 -sg110 -Nsg111 -NsS'gradle' -p1358 -(lp1359 -S'VanillaARMv7' -p1360 -asS'prebuild' -p1361 -S'sed -i -e \'/^TARGET/aexit 0\' -e \'s@\\-d \\"gradle\\/wrapper\\"@1@g\' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc' -p1362 -sg116 -I00 -sg117 -Nsa(dp1363 -g65 -I00 -sg66 -S'1020505' -p1364 -sg275 -I00 -sg69 -I00 -sg70 -I00 -sg112 -g113 -sg72 -g73 -sS'srclibs' -p1365 -(lp1366 -S'VLC@50accb8' -p1367 -asg76 -Nsg77 -g78 -sg79 -g20 -sg80 -S'1.2.5' -p1368 -sS'build' -p1369 -S'cd ../ && ./compile.sh -a "x86" --release' -p1370 -sg84 -g85 -sg86 -g71 -sS'subdir' -p1371 -S'vlc-android' -p1372 -sg90 -g20 -sg800 -I00 -sg92 -g93 -sg192 -g193 -sg99 -I00 -sg100 -I00 -sS'commit' -p1373 -S'1.2.5' -p1374 -sg103 -g104 -sS'buildjni' -p1375 -(lp1376 -S'no' -p1377 -asS'ndk' -p1378 -S'r10d' -p1379 -sg110 -Nsg111 -NsS'gradle' -p1380 -(lp1381 -S'VanillaX86' -p1382 -asS'prebuild' -p1383 -S'sed -i -e \'/^TARGET/aexit 0\' -e \'s@\\-d \\"gradle\\/wrapper\\"@1@g\' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc' -p1384 -sg116 -I00 -sg117 -Nsa(dp1385 -g65 -I00 -sg66 -S'1030003' -p1386 -sg275 -I00 -sg69 -I00 -sg70 -I00 -sg112 -g113 -sg72 -g73 -sS'srclibs' -p1387 -(lp1388 -S'VLC@d59b81a' -p1389 -asg76 -Nsg77 -g78 -sg79 -g20 -sg80 -S'1.2.6' -p1390 -sS'build' -p1391 -S'cd ../ && ./compile.sh -a "armeabi" --release' -p1392 -sg84 -g85 -sg86 -g71 -sS'subdir' -p1393 -S'vlc-android' -p1394 -sg90 -g20 -sg800 -I00 -sg92 -g93 -sg192 -g193 -sg99 -I00 -sg100 -I00 -sS'commit' -p1395 -S'1.2.6' -p1396 -sg103 -g104 -sS'buildjni' -p1397 -(lp1398 -S'no' -p1399 -asS'ndk' -p1400 -S'r10d' -p1401 -sg110 -Nsg111 -NsS'gradle' -p1402 -(lp1403 -S'VanillaARMv6fpu' p1404 -asS'prebuild' -p1405 -S'sed -i -e \'/^TARGET/aexit 0\' -e \'s@\\-d \\"gradle\\/wrapper\\"@1@g\' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc' -p1406 -sg116 -I00 -sg117 -Nsa(dp1407 -g65 -I00 -sg66 -S'1030004' -p1408 -sg275 +sg284 I00 sg69 I00 sg70 -I00 -sg112 -g113 +(lp1405 sg72 g73 -sS'srclibs' +sS'gradle' +p1406 +(lp1407 +S'VanillaARMv7' +p1408 +asS'srclibs' p1409 (lp1410 -S'VLC@d59b81a' +S'VLC@50accb8' p1411 -asg76 -Nsg77 -g78 -sg79 +asg78 +Nsg79 +Nsg80 +g81 +sg82 g20 -sg80 -S'1.2.6' +sg83 +S'1.2.5' p1412 sS'build' p1413 S'cd ../ && ./compile.sh -a "armeabi-v7a" --release' p1414 -sg84 -g85 -sg86 -g71 +sg87 +g20 +sg88 +I00 sS'subdir' p1415 S'vlc-android' p1416 -sg90 -g20 -sg800 +sg841 I00 sg92 g93 -sg192 -g193 +sg201 +g202 sg99 I00 sg100 I00 -sS'commit' -p1417 -S'1.2.6' -p1418 +sg101 +g102 sg103 g104 sS'buildjni' -p1419 -(lp1420 +p1417 +(lp1418 S'no' -p1421 +p1419 asS'ndk' -p1422 +p1420 S'r10d' -p1423 +p1421 sg110 Nsg111 -NsS'gradle' -p1424 -(lp1425 -S'VanillaARMv7' -p1426 -asS'prebuild' -p1427 +g114 +sg113 +Nsg74 +g75 +sS'prebuild' +p1422 S'sed -i -e \'/^TARGET/aexit 0\' -e \'s@\\-d \\"gradle\\/wrapper\\"@1@g\' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc' -p1428 -sg116 -I00 +p1423 sg117 -Nsa(dp1429 +I00 +sS'commit' +p1424 +S'1.2.5' +p1425 +sa(dp1426 g65 I00 sg66 -S'1030005' -p1430 -sg275 +S'1020505' +p1427 +sg284 I00 sg69 I00 sg70 -I00 -sg112 -g113 +(lp1428 sg72 g73 -sS'srclibs' +sS'gradle' +p1429 +(lp1430 +S'VanillaX86' p1431 -(lp1432 -S'VLC@d59b81a' -p1433 -asg76 -Nsg77 -g78 -sg79 -g20 -sg80 -S'1.2.6' +asS'srclibs' +p1432 +(lp1433 +S'VLC@50accb8' p1434 -sS'build' -p1435 -S'cd ../ && ./compile.sh -a "x86" --release' -p1436 -sg84 -g85 -sg86 -g71 -sS'subdir' -p1437 -S'vlc-android' -p1438 -sg90 +asg78 +Nsg79 +Nsg80 +g81 +sg82 g20 -sg800 +sg83 +S'1.2.5' +p1435 +sS'build' +p1436 +S'cd ../ && ./compile.sh -a "x86" --release' +p1437 +sg87 +g20 +sg88 +I00 +sS'subdir' +p1438 +S'vlc-android' +p1439 +sg841 I00 sg92 g93 -sg192 -g193 +sg201 +g202 sg99 I00 sg100 I00 -sS'commit' -p1439 -S'1.2.6' -p1440 +sg101 +g102 sg103 g104 sS'buildjni' -p1441 -(lp1442 +p1440 +(lp1441 S'no' -p1443 +p1442 asS'ndk' -p1444 +p1443 S'r10d' -p1445 +p1444 sg110 Nsg111 -NsS'gradle' -p1446 -(lp1447 -S'VanillaX86' -p1448 -asS'prebuild' -p1449 +g114 +sg113 +Nsg74 +g75 +sS'prebuild' +p1445 S'sed -i -e \'/^TARGET/aexit 0\' -e \'s@\\-d \\"gradle\\/wrapper\\"@1@g\' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc' -p1450 -sg116 -I00 +p1446 sg117 -NsasS'FlattrID' -p1451 -NsS'Disabled' +I00 +sS'commit' +p1447 +S'1.2.5' +p1448 +sa(dp1449 +g65 +I00 +sg66 +S'1030003' +p1450 +sg284 +I00 +sg69 +I00 +sg70 +(lp1451 +sg72 +g73 +sS'gradle' p1452 -NsS'Update Check Name' -p1453 -NsS'Vercode Operation' +(lp1453 +S'VanillaARMv6fpu' p1454 -S'%c + 5' +asS'srclibs' p1455 -sS'Current Version' -p1456 -S'1.2.6' +(lp1456 +S'VLC@d59b81a' p1457 -sS'metadatapath' +asg78 +Nsg79 +Nsg80 +g81 +sg82 +g20 +sg83 +S'1.2.6' p1458 -S'metadata/org.videolan.vlc.yaml' +sS'build' p1459 +S'cd ../ && ./compile.sh -a "armeabi" --release' +p1460 +sg87 +g20 +sg88 +I00 +sS'subdir' +p1461 +S'vlc-android' +p1462 +sg841 +I00 +sg92 +g93 +sg201 +g202 +sg99 +I00 +sg100 +I00 +sg101 +g102 +sg103 +g104 +sS'buildjni' +p1463 +(lp1464 +S'no' +p1465 +asS'ndk' +p1466 +S'r10d' +p1467 +sg110 +Nsg111 +g114 +sg113 +Nsg74 +g75 +sS'prebuild' +p1468 +S'sed -i -e \'/^TARGET/aexit 0\' -e \'s@\\-d \\"gradle\\/wrapper\\"@1@g\' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc' +p1469 +sg117 +I00 +sS'commit' +p1470 +S'1.2.6' +p1471 +sa(dp1472 +g65 +I00 +sg66 +S'1030004' +p1473 +sg284 +I00 +sg69 +I00 +sg70 +(lp1474 +sg72 +g73 +sS'gradle' +p1475 +(lp1476 +S'VanillaARMv7' +p1477 +asS'srclibs' +p1478 +(lp1479 +S'VLC@d59b81a' +p1480 +asg78 +Nsg79 +Nsg80 +g81 +sg82 +g20 +sg83 +S'1.2.6' +p1481 +sS'build' +p1482 +S'cd ../ && ./compile.sh -a "armeabi-v7a" --release' +p1483 +sg87 +g20 +sg88 +I00 +sS'subdir' +p1484 +S'vlc-android' +p1485 +sg841 +I00 +sg92 +g93 +sg201 +g202 +sg99 +I00 +sg100 +I00 +sg101 +g102 +sg103 +g104 +sS'buildjni' +p1486 +(lp1487 +S'no' +p1488 +asS'ndk' +p1489 +S'r10d' +p1490 +sg110 +Nsg111 +g114 +sg113 +Nsg74 +g75 +sS'prebuild' +p1491 +S'sed -i -e \'/^TARGET/aexit 0\' -e \'s@\\-d \\"gradle\\/wrapper\\"@1@g\' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc' +p1492 +sg117 +I00 +sS'commit' +p1493 +S'1.2.6' +p1494 +sa(dp1495 +g65 +I00 +sg66 +S'1030005' +p1496 +sg284 +I00 +sg69 +I00 +sg70 +(lp1497 +sg72 +g73 +sS'gradle' +p1498 +(lp1499 +S'VanillaX86' +p1500 +asS'srclibs' +p1501 +(lp1502 +S'VLC@d59b81a' +p1503 +asg78 +Nsg79 +Nsg80 +g81 +sg82 +g20 +sg83 +S'1.2.6' +p1504 +sS'build' +p1505 +S'cd ../ && ./compile.sh -a "x86" --release' +p1506 +sg87 +g20 +sg88 +I00 +sS'subdir' +p1507 +S'vlc-android' +p1508 +sg841 +I00 +sg92 +g93 +sg201 +g202 +sg99 +I00 +sg100 +I00 +sg101 +g102 +sg103 +g104 +sS'buildjni' +p1509 +(lp1510 +S'no' +p1511 +asS'ndk' +p1512 +S'r10d' +p1513 +sg110 +Nsg111 +g114 +sg113 +Nsg74 +g75 +sS'prebuild' +p1514 +S'sed -i -e \'/^TARGET/aexit 0\' -e \'s@\\-d \\"gradle\\/wrapper\\"@1@g\' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc' +p1515 +sg117 +I00 +sS'commit' +p1516 +S'1.2.6' +p1517 +sasS'FlattrID' +p1518 +NsS'metadatapath' +p1519 +S'metadata/org.videolan.vlc.yaml' +p1520 +sS'Disabled' +p1521 +NsS'Update Check Name' +p1522 +NsS'Vercode Operation' +p1523 +S'%c + 5' +p1524 +sS'Current Version' +p1525 +S'1.2.6' +p1526 s. \ No newline at end of file diff --git a/tests/metadata/update-pickle.py b/tests/metadata/update-pickle.py new file mode 100755 index 00000000..28111339 --- /dev/null +++ b/tests/metadata/update-pickle.py @@ -0,0 +1,15 @@ +#!/usr/bin/env python2 +# +# This script is for updating the .pickle test files when there are changes to +# the default metadata, e.g. adding a new key/tag. + +import glob +import pickle + +for picklefile in glob.glob('*.pickle'): + p = pickle.load(open(picklefile)) + + for build in p['builds']: + build['gradleprops'] = [] + + pickle.dump(p, open(picklefile, 'w')) From 6c44bff78b8e9e745ca8b1ba4faefdee200aca2a Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Wed, 5 Aug 2015 13:49:57 +0200 Subject: [PATCH 20/22] make note of JSON, XML, and YAML in the manual --- docs/fdroid.texi | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/docs/fdroid.texi b/docs/fdroid.texi index 3ac3927c..ac79fde5 100644 --- a/docs/fdroid.texi +++ b/docs/fdroid.texi @@ -445,8 +445,10 @@ the APK files in the repo directory, and the metadata files in the metadata directory. @end enumerate -The metadata files are simple, easy to edit text files, always named as the -application's package ID with '.txt' appended. +The original metadata files are simple, easy to edit text files, +always named as the application's package ID with '.txt' appended. +Additionally, you can use JSON, XML, or YAML for app metadata, using +the same fields as the original '.txt' format. Note that although the metadata files are designed to be easily read and writable by humans, they are also processed and written by various scripts. From 19ac44c18980d5a027f60ee669181fa897142c4a Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Wed, 5 Aug 2015 14:03:24 +0200 Subject: [PATCH 21/22] rewritemeta only applies to the original .txt metadata format --- docs/fdroid.texi | 23 +++++++++++++++-------- fdroidserver/rewritemeta.py | 11 +++++++++-- 2 files changed, 24 insertions(+), 10 deletions(-) diff --git a/docs/fdroid.texi b/docs/fdroid.texi index ac79fde5..0c9f95f8 100644 --- a/docs/fdroid.texi +++ b/docs/fdroid.texi @@ -450,19 +450,26 @@ always named as the application's package ID with '.txt' appended. Additionally, you can use JSON, XML, or YAML for app metadata, using the same fields as the original '.txt' format. -Note that although the metadata files are designed to be easily read and -writable by humans, they are also processed and written by various scripts. -They are capable of rewriting the entire file when necessary. Even so, -the structure and comments will be preserved correctly, although the order -of fields will be standardised. (In the event that the original file was -in a different order, comments are considered as being attached to the field -following them). In fact, you can standardise all the metadata in a single -command, without changing the functional content, by running: +Note that although the metadata files are designed to be easily read +and writable by humans, they are also processed and written by various +scripts. The original '.txt' format can be automatically cleaned up +when necessary. The structure and comments will be preserved +correctly, although the order of fields will be standardised. (In the +event that the original file was in a different order, comments are +considered as being attached to the field following them). In fact, +you can standardise all the '.txt' metadata in a single command, +without changing the functional content, by running: @example fdroid rewritemeta @end example +Or just run it on a specific app: + +@example +fdroid rewritemeta org.adaway +@end example + The following sections describe the fields recognised within the file. @menu diff --git a/fdroidserver/rewritemeta.py b/fdroidserver/rewritemeta.py index b097e53c..5f6f190e 100644 --- a/fdroidserver/rewritemeta.py +++ b/fdroidserver/rewritemeta.py @@ -2,6 +2,7 @@ # -*- coding: utf-8 -*- # # rewritemeta.py - part of the FDroid server tools +# This cleans up the original .txt metadata file format. # Copyright (C) 2010-12, Ciaran Gultnieks, ciaran@ciarang.com # # This program is free software: you can redistribute it and/or modify @@ -46,8 +47,14 @@ def main(): apps = common.read_app_args(args, allapps, False) for appid, app in apps.iteritems(): - logging.info("Writing " + appid) - metadata.write_metadata(os.path.join('metadata', appid) + '.txt', app) + metadatapath = app['metadatapath'] + ext = os.path.splitext(metadatapath)[1][1:] + if ext == 'txt': + logging.info("Rewriting " + metadatapath) + metadata.write_metadata(metadatapath, app) + else: + logging.info("Ignoring %s file at '%s'" + % (ext.upper(), metadatapath)) logging.info("Finished.") From 325db909187e75966ea70388c0621409e4ae93e6 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Thu, 27 Aug 2015 11:43:17 +0200 Subject: [PATCH 22/22] set "accepted formats" for metadata in config.py For a bit repo like f-droid.org, it makes sense to standardize on a single format for metadata files. This adds support for enforcing a single data format, or a reduced set of data formats. So f-droid.org would run like this if it changed to YAML: accepted_formats = ['txt', 'yaml'] Then once everything was converted to YAML, it could look like this: accepted_formats = ['yaml'] --- examples/config.py | 5 +++++ fdroidserver/common.py | 1 + fdroidserver/metadata.py | 45 +++++++++++++++++++++++++--------------- tests/metadata.TestCase | 5 +++-- 4 files changed, 37 insertions(+), 19 deletions(-) diff --git a/examples/config.py b/examples/config.py index 6026e5b4..427342be 100644 --- a/examples/config.py +++ b/examples/config.py @@ -213,6 +213,11 @@ carbon_port = 2003 # --server option on dedicated secure build server hosts. build_server_always = False +# By default, fdroid will use YAML and the custom .txt metadata formats. It +# is also possible to have metadata in JSON and XML. You can enable your +# preferred formats by setting them in a list: +# accepted_formats = ['json', 'txt', 'xml', 'yaml'] + # Limit in number of characters that fields can take up # Only the fields listed here are supported, defaults shown char_limits = { diff --git a/fdroidserver/common.py b/fdroidserver/common.py index d3c7f176..0bc1eb5c 100644 --- a/fdroidserver/common.py +++ b/fdroidserver/common.py @@ -59,6 +59,7 @@ default_config = { 'ant': "ant", 'mvn3': "mvn", 'gradle': 'gradle', + 'accepted_formats': ['txt', 'yaml'], 'sync_from_local_copy_dir': False, 'per_app_repos': False, 'make_current_version_link': True, diff --git a/fdroidserver/metadata.py b/fdroidserver/metadata.py index a333a512..0ef93ef7 100644 --- a/fdroidserver/metadata.py +++ b/fdroidserver/metadata.py @@ -499,23 +499,11 @@ def read_metadata(xref=True): # exception. So the original .txt format is parsed first, at least until # newer formats stabilize. - for metadatapath in sorted(glob.glob(os.path.join('metadata', '*.txt'))): - appid, appinfo = parse_txt_metadata(apps, metadatapath) - check_metadata(appinfo) - apps[appid] = appinfo - - for metadatapath in sorted(glob.glob(os.path.join('metadata', '*.json'))): - appid, appinfo = parse_json_metadata(apps, metadatapath) - check_metadata(appinfo) - apps[appid] = appinfo - - for metadatapath in sorted(glob.glob(os.path.join('metadata', '*.xml'))): - appid, appinfo = parse_xml_metadata(apps, metadatapath) - check_metadata(appinfo) - apps[appid] = appinfo - - for metadatapath in sorted(glob.glob(os.path.join('metadata', '*.yaml'))): - appid, appinfo = parse_yaml_metadata(apps, metadatapath) + for metadatapath in sorted(glob.glob(os.path.join('metadata', '*.txt')) + + glob.glob(os.path.join('metadata', '*.json')) + + glob.glob(os.path.join('metadata', '*.xml')) + + glob.glob(os.path.join('metadata', '*.yaml'))): + appid, appinfo = parse_metadata(apps, metadatapath) check_metadata(appinfo) apps[appid] = appinfo @@ -731,6 +719,29 @@ def _decode_dict(data): return rv +def parse_metadata(apps, metadatapath): + root, ext = os.path.splitext(metadatapath) + metadataformat = ext[1:] + accepted = common.config['accepted_formats'] + if metadataformat not in accepted: + logging.critical('"' + metadatapath + + '" is not in an accepted format, ' + + 'convert to: ' + ', '.join(accepted)) + sys.exit(1) + + if metadataformat == 'txt': + return parse_txt_metadata(apps, metadatapath) + elif metadataformat == 'json': + return parse_json_metadata(apps, metadatapath) + elif metadataformat == 'xml': + return parse_xml_metadata(apps, metadatapath) + elif metadataformat == 'yaml': + return parse_yaml_metadata(apps, metadatapath) + else: + logging.critical('Unknown metadata format: ' + metadatapath) + sys.exit(1) + + def parse_json_metadata(apps, metadatapath): appid, thisinfo = get_default_app_info_list(apps, metadatapath) diff --git a/tests/metadata.TestCase b/tests/metadata.TestCase index 8d20ffef..69f4c6ed 100755 --- a/tests/metadata.TestCase +++ b/tests/metadata.TestCase @@ -29,11 +29,12 @@ class MetadataTest(unittest.TestCase): self.maxDiff = None - # these only need to be set to prevent code running on None. The - # values are not used in metadata.py + # these need to be set to prevent code running on None, only + # 'accepted_formats' is actually used in metadata.py config = dict() config['sdk_path'] = '/opt/android-sdk' config['ndk_paths'] = dict() + config['accepted_formats'] = ['json', 'txt', 'xml', 'yaml'] fdroidserver.common.config = config apps = fdroidserver.metadata.read_metadata(xref=True)