From 56ef716a4eba81fe5b7365443e8e26adf8c2420e Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Thu, 23 Feb 2017 21:23:45 +0100 Subject: [PATCH 01/11] test for original "v0" index XML compatibility The original index.xml format needs to stay around for backwards compatibility, but we shouldn't touch it anymore once the new format is in place. This is a test to make sure `fdroid update` can still generate the correct XML. install_list and uninstall_list should be tuples or lists in order to ensure that the order is preserved. These tests also check that the added and lastupdated dates are working correct, based on the dates in tests/stats/known_apks.txt. I could see no useful way to test the timestamp, it is just hardcoded using a regexp search-and-replace. Running these tests manually might require deleting tmp/apkcache. --- .gitignore | 10 ++- examples/config.py | 14 ++-- tests/config.py | 35 ++++++++ tests/keystore.jks | Bin 0 -> 3760 bytes tests/repo/categories.txt | 7 ++ tests/repo/index.xml | 162 +++++++++++++++++++++++++++++++++++++ tests/run-tests | 15 +++- tests/stats/known_apks.txt | 6 ++ 8 files changed, 236 insertions(+), 13 deletions(-) create mode 100644 tests/config.py create mode 100644 tests/keystore.jks create mode 100644 tests/repo/categories.txt create mode 100644 tests/repo/index.xml create mode 100644 tests/stats/known_apks.txt diff --git a/.gitignore b/.gitignore index 40e2cd2b..4652e8a2 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ *.pyc *.class *.box +TAGS # files generated by build build/ @@ -17,6 +18,7 @@ docs/html/ # files generated by tests tmp/ /tests/repo/icons* +/tests/repo/latestapps.dat # files used in manual testing /config.py @@ -26,10 +28,14 @@ tmp/ makebuildserver.config.py /tests/.fdroid.keypass.txt /tests/.fdroid.keystorepass.txt -/tests/config.py /tests/fdroid-icon.png -/tests/keystore.jks +/tests/OBBMainOldVersion.apk /tests/OBBMainPatchCurrent.apk /tests/OBBMainTwoVersions.apk +/tests/archive/categories.txt +/tests/archive/icons* +/tests/archive/index.jar +/tests/archive/index.xml +/tests/repo/index.jar /tests/urzip-πÇÇπÇÇ现代汉语通用字-български-عربي1234.apk /unsigned/ diff --git a/examples/config.py b/examples/config.py index a047a71d..026cd3e6 100644 --- a/examples/config.py +++ b/examples/config.py @@ -175,10 +175,10 @@ The repository of older versions of applications from the main demo repository. # and the archive, if it is enabled. So these URLs should end in the # 'fdroid' base of the F-Droid part of the web server like serverwebroot. # -# mirrors = { +# mirrors = ( # 'https://foo.bar/fdroid', # 'http://foobarfoobarfoobar.onion/fdroid', -# } +# ) # optionally specific which identity file to use when using rsync over SSH # @@ -253,7 +253,7 @@ The repository of older versions of applications from the main demo repository. # By default, fdroid will use YAML .yml and the custom .txt metadata formats. It # is also possible to have metadata in JSON by adding 'json'. -# accepted_formats = ['txt', 'yml'] +# accepted_formats = ('txt', 'yml') # Limit in number of characters that fields can take up # Only the fields listed here are supported, defaults shown @@ -269,13 +269,13 @@ The repository of older versions of applications from the main demo repository. # the packageNames listed. This is protected by the same signing key # as the app index metadata. # -# install_list = { +# install_list = ( # 'at.bitfire.davdroid', # 'com.fsck.k9', # 'us.replicant', -# } +# ) # -# uninstall_list = { +# uninstall_list = ( # 'com.facebook.orca', # 'com.android.vending', -# } +# ) diff --git a/tests/config.py b/tests/config.py new file mode 100644 index 00000000..16917a64 --- /dev/null +++ b/tests/config.py @@ -0,0 +1,35 @@ + +repo_url = "https://MyFirstFDroidRepo.org/fdroid/repo" +repo_name = "My First F-Droid Repo Demo" +repo_icon = "fdroid-icon.png" +repo_description = """ +This is a repository of apps to be used with F-Droid. Applications in this +repository are either official binaries built by the original application +developers, or are binaries built from source by the admin of f-droid.org +using the tools on https://gitlab.com/u/fdroid. +""" + +archive_older = 3 +archive_url = "https://f-droid.org/archive" +archive_name = "My First F-Droid Archive Demo" +archive_icon = "fdroid-icon.png" +archive_description = """ +The repository of older versions of applications from the main demo repository. +""" + +repo_keyalias = "sova" +keystore = "keystore.jks" +keystorepass = "r9aquRHYoI8+dYz6jKrLntQ5/NJNASFBacJh7Jv2BlI=" +keypass = "r9aquRHYoI8+dYz6jKrLntQ5/NJNASFBacJh7Jv2BlI=" +keydname = "CN=sova, OU=F-Droid" + +mirrors = ( + 'https://foo.bar/fdroid', + 'http://foobarfoobarfoobar.onion/fdroid', +) + +update_stats = True +accepted_formats = ('json', 'txt', 'yml') + +install_list = 'org.adaway' +uninstall_list = ('com.android.vending', 'com.facebook.orca', ) diff --git a/tests/keystore.jks b/tests/keystore.jks new file mode 100644 index 0000000000000000000000000000000000000000..1eb91fe78cd6b773f05764a10a25b2809392c3d7 GIT binary patch literal 3760 zcma);S2P@q)`q9*!!Vc-Ef|E5QKH5mdI>@F2vLG4qYpkw5H%*cFcDou??j7E)Tkkt z=w0+)^XLE8xj2{SVqd)bV()$NthJx(t?MlS008=1z<&$kf%Sg&HyEMBNb>;z@=$aT zc@UbKghGG>2m$hgXn{Z|01`y*vUHD>kd&=s-=e|*Wi#Juzc73uEreVz;iaw?4@_b$ z?LabK-az>??984TFis&9@M;dk8S1clMqRDL#u6)iyRO)_E>EuB(ro+vzG}pYm!L=e zn!?4^u#9`?ZR0rsds9)CCL{!RR`4)hS3@(R1+m%n>aG?IgBs1jIcidmE&906ch9?~ zZ;`sroKq%2L@PWFnS~EMz-L@qjFDMX-oq#tk9}(0nh@Q{GoMi@6!)?K6LxPqHH zzJqGL0&&H~7cdmDMIaJ=ahr!G&}Fxw+lRDQ&Im51ocqU@uQK@QAMYyl52Hlj**uVy z*W{3nlEHzsgcqi|)rqEs;ejsI2Jh0+Y8jl<;{6pT-a;JC-dCRMm<8A^6;Os6lhi#h zU9!JEoII|jP<;cNY$`}0b!A4zV?GAPbdIH-CCAGO$c9_&oeGk**LO2nFqKy6 zEX28N3S9!ENyRg|Zx=DEb&h_-S)aRoj(byBFx;Ia)M+ziw?f5H@-9JUxKTt6>cL++ z#w}E{EW0HV+au;=6-D^*&qc<7Br7N;>1U4iz)3Kc_B^6kF>%WVstEW9Ah>E3uPa97b(TaW2My_X}1 zvT6e z?Y_^t?tJZb^-5@tBqK*6S|m=a?AFHjq~qS%yQs9}CT!02tz92GDfbcBqce<60Ih|T zEMT$GNW#D1OGkF9LL`OL*V4Aukk07upZS!=$EVQk$u4YHaQVKVSS`9Vjk0Zix(}e2 zO#{c8*Td=zu2gPto;Fzf(f7_>0WtwubF0JEeTb&6`67kJp?Y!Jfo_}>sE8+-s!%^~SHfB&xvPx;ag*My#iuc~HfiOmLj^wTxUxOWPIMLYKnCQ*J(nS<% zBpwS{R<5OUEisA|@$CanLv1Dhz zjgLp#1VfbbigQDlRu%j*cj+^K))lQ&6MS@}ix zmQy?#Cq7@=y+L+~NB_**O8)f_4pF4BAtvus!lL-lHNR4YU3Q#z9zjtH>5Eo{H|M5} zGuzP};AN?x@uUM&_Lp-%PqRHm!f`%htj-<+*7)s#*308pLvCrR&m}H)d9LX1I0h&% zO$9;1Em5QBI>kF zrtrd}JTeRa|?_Z=$!R@+Ele!@I zPH^EWNOjzwvcv2-_p|OwvmCuQp5w`Dia)Wdi36sGq-f0lLNn8 zrqsU3=teE}m0<*t6@!hv5b&JoG`F_gxRAvlfdqVpyj?d-(nk8s?mQDIvLvOnG4O*+ z!gS0HT@Z$9$$B*E4F*7dA5$FMEr^DzaKd(#>qOLnOslC3o0IS_-*gDjDJek%8R%|Rm^xM zcYoPoz$u#TkEBnzNRC^AH34`xtAVpJ3{U$*y#e6Yd$9Q$pB^Z^0w(z}lxbafQ}w6c zp+J|~3+!1PU7+4NQaCOJU!4`Nj=dmUa5%@JW4;7GO^U%X(}ex&W>90HduS;D0J4k@ zg3P0XKs^~?5D)}{h?#gRqG2TD{Gn>0Comw85(+@y5{CcPHn0JN5<#jWsN{}yun~r# zDgVC%M*M4eXf`BFSR5@SEGmK)mO@LJB4J`;Xkk(Gf8zf#A_&C!-;4jcAvg#`1NeIz z1tCnnLU1c_?RwRANItF*7QDOI>&8@q zz1Bo8hP863Ka)rDj{g3q(DbU-l$oB0ig+ln6yp_r2n~<5Sa*bzIxUL5V3G#mCeq$4 z()_gb=UCLU{6%J(EmY*M8RCPzzSuK(Qo7I>7p$mAHC?YZ*yPGaR}#A7t?Db{0n_=` zLUGDba{5T}Q`Ib)*0Cy#7S_>`mia}!mQu_$l_^EGnz4e*>WTT%BeqcXmpnHmB~OnT z3w++NK6|GyV(d-~q)OoktInTS=}m0%1Tzw+`*6bAT!mp{YQBhCKsoJw67U9R!i`9` z(WPXsS@M4j&lu=vFYQIne5szi8TJg^(-`$-xMI}NnLr$S@G~588`0NljoW_xN@i%e zAzJ*>HIdjszndlnw$zY6@8_b=WN3kyRa2)PL|quo*RJ-%EyO5zwyR#$)8yLS*56*; zI}_}ak1}K;Zy5V}n3I5iXw+dh!ki`9u9+h<_ed&o-I|F#t16kVkxhGhgu4pXl-j=R z8bRTf@0oR|_iFkkDg2R}mo9XxkAHvP;e4<*HXugYh@VhpW4H#>0NR@dREYA1L-)JA z?V>!`wL6YDyh?T)1wfdK+HC7rN2DF?{=7?k3_`7eulsW4i!E8o(%pA27Dha?6hL4g z0GNFX&5maMOCBpVgb_mD7I`51BR|taa=CmsckAc3VTCQq|Ay!SC$az`GDJiY7kJJlzSk?1A9s^846xdNU% z7s5Ve640&-uN^3BU<PypXHEN>{7$DnNt84yJ$#UG3k6)mRO-7Gl9!6rK&2t41QK*lxDtSypP$ww{7hv9_sC;!3sUt~VQ zhHyba{CZ+XhfI{}Iy1(B_u!GKxztm~&06ILovtyMjVeigmRq`esw{pa*$+EL?0=rS zugefei2aJ7-$kl*tBXGyQ&dJ+hLXZGxPRP!9B_lkL~~@{Rq!C1;_22OW-%N(p2c%7 z4yPZbZsVshfzr`p`!+U3*S|i0K56MCw(_Ei!m!F?a$@m^^%b~x1S(K0{>1e5Y02Z= z6wB#e%xC)vZ~rD1#QhBXDyp?rf<~h-%FKlit4E|<8%h>1tr~LL-zm3pw*0cCOBDUl J@&YD%n literal 0 HcmV?d00001 diff --git a/tests/repo/categories.txt b/tests/repo/categories.txt new file mode 100644 index 00000000..a0aab2be --- /dev/null +++ b/tests/repo/categories.txt @@ -0,0 +1,7 @@ +Development +GuardianProject +Multimedia +None +Phone & SMS +Security +System diff --git a/tests/repo/index.xml b/tests/repo/index.xml new file mode 100644 index 00000000..14ee0205 --- /dev/null +++ b/tests/repo/index.xml @@ -0,0 +1,162 @@ + + + + This is a repository of apps to be used with F-Droid. Applications in this repository are either official binaries built by the original application developers, or are binaries built from source by the admin of f-droid.org using the tools on https://gitlab.com/u/fdroid. + http://foobarfoobarfoobar.onion/fdroid/repo + https://foo.bar/fdroid/repo + + + + + + obb.main.oldversion + 2013-12-31 + 2013-12-31 + OBB Main Old Version + + obb.main.oldversion.1444412523.png + <p>No description available</p> + GPLv3 + Development + Development + + https://github.com/eighthave/urzip + + 1Fi5xUHiAPRKxHvyUGVFGt9extBe8Srdbk + + 99999999 + + 0.1 + 1444412523 + obb.main.oldversion_1444412523.apk + 7562a36c9e2b38013b96663cf41f0f290dc7a248a81befa8d89e14f390c94c7f + 11470 + 4 + 18 + main.1434483388.obb.main.oldversion.obb + d3eb539a556352f3f47881d71fb0e5777b2f3e9a4251d283c18c67ce996774b7 + 2013-12-31 + b4964fd759edaa54e65bb476d0276880 + + + + obb.main.twoversions + 2015-10-12 + 2016-06-20 + OBB Main Two Versions + + obb.main.twoversions.1101617.png + <p>No description available</p> + GPLv3 + Development + Development + + https://github.com/eighthave/urzip + + 1Fi5xUHiAPRKxHvyUGVFGt9extBe8Srdbk + + 99999999 + + 0.1 + 1101617 + obb.main.twoversions_1101617.apk + obb.main.twoversions_1101617_src.tar.gz + 9bc74566f089ef030ac33e7fbd99d92f1a38f363fb499fed138d9e7b774e821c + 11481 + 4 + 18 + main.1101615.obb.main.twoversions.obb + d3eb539a556352f3f47881d71fb0e5777b2f3e9a4251d283c18c67ce996774b7 + 2016-06-20 + b4964fd759edaa54e65bb476d0276880 + + + 0.1 + 1101615 + obb.main.twoversions_1101615.apk + 7b0b7b9ba248e15751a16e3a0e01e1e24cbb673686c38422030cb75d5c33f0bb + 11480 + 4 + 18 + main.1101615.obb.main.twoversions.obb + d3eb539a556352f3f47881d71fb0e5777b2f3e9a4251d283c18c67ce996774b7 + 2016-01-01 + b4964fd759edaa54e65bb476d0276880 + + + 0.1 + 1101613 + obb.main.twoversions_1101613.apk + cce97a52ff18d843185be7f22ecb1a557c36b7a9f8ba07a8be94e328e00b35dc + 11477 + 4 + 18 + main.1101613.obb.main.twoversions.obb + d3eb539a556352f3f47881d71fb0e5777b2f3e9a4251d283c18c67ce996774b7 + 2015-10-12 + b4964fd759edaa54e65bb476d0276880 + + + + obb.mainpatch.current + 2016-04-23 + 2016-04-23 + OBB Main/Patch Current + + obb.mainpatch.current.1619.png + <p>No description available</p> + GPLv3 + Development + Development + + https://github.com/eighthave/urzip + + 1Fi5xUHiAPRKxHvyUGVFGt9extBe8Srdbk + + 99999999 + + 0.1 + 1619 + obb.mainpatch.current_1619.apk + eda5fc3ecfdac3252717e36bdbc9820865baeef162264af9ba5db7364f0e7a0c + 11479 + 4 + 18 + main.1619.obb.mainpatch.current.obb + d3eb539a556352f3f47881d71fb0e5777b2f3e9a4251d283c18c67ce996774b7 + patch.1619.obb.mainpatch.current.obb + d3eb539a556352f3f47881d71fb0e5777b2f3e9a4251d283c18c67ce996774b7 + 2016-04-23 + b4964fd759edaa54e65bb476d0276880 + + + + info.guardianproject.urzip + 2016-06-23 + 2016-06-23 + urzip-πÇÇπÇÇ现代汉语通用字-български-عربي1234 + 一个实用工具，获取已安装在您的设备上的应用的有关信息 + info.guardianproject.urzip.100.png + <p>It’s Urzip 是一个获得已安装 APK 相关信息的实用工具。它从您的设备上已安装的所有应用开始，一键触摸即可显示 APK 的指纹，并且提供到达 virustotal.com 和 androidobservatory.org 的快捷链接，让您方便地了解特定 APK 的档案。它还可以让您导出签名证书和生成 ApkSignaturePin Pin 文件供 TrustedIntents 库使用。</p><p>★ Urzip 支持下列语言： Deutsch, English, español, suomi, 日本語, 한국어, Norsk, português (Portugal), Русский, Slovenščina, Türkçe 没看到您的语言？帮忙翻译本应用吧： https://www.transifex.com/projects/p/urzip</p><p>★ 致用户：我们还缺少你喜欢的功能？发现了一个 bug？请告诉我们！我们乐于听取您的意见。请发送电子邮件至: support@guardianproject.info 或者加入我们的聊天室 https://guardianproject.info/contact</p> + GPLv3 + Development,GuardianProject + Development + https://dev.guardianproject.info/projects/urzip + https://github.com/guardianproject/urzip + https://dev.guardianproject.info/projects/urzip/issues + 1Fi5xUHiAPRKxHvyUGVFGt9extBe8Srdbk + + 9999999 + + 0.1 + 100 + urzip-πÇÇπÇÇ现代汉语通用字-български-عربي1234.apk + 15c0ec72c74a3791f42cdb43c57df0fb11a4dbb656851bbb8cf05b26a8372789 + 11471 + 4 + 18 + 2016-06-23 + b4964fd759edaa54e65bb476d0276880 + + + diff --git a/tests/run-tests b/tests/run-tests index fd58024a..09f401c1 100755 --- a/tests/run-tests +++ b/tests/run-tests @@ -158,17 +158,21 @@ echo_header "copy tests/repo, generate java/gpg keys, update, and gpgsign" REPOROOT=`create_test_dir` GNUPGHOME=$REPOROOT/gnupghome +KEYSTORE=$WORKSPACE/tests/keystore.jks cd $REPOROOT -$fdroid init -cp -a $WORKSPACE/tests/metadata $WORKSPACE/tests/repo $REPOROOT/ +$fdroid init --keystore $KEYSTORE --repo-keyalias=sova +echo 'keystorepass = "r9aquRHYoI8+dYz6jKrLntQ5/NJNASFBacJh7Jv2BlI="' >> config.py +echo 'keypass = "r9aquRHYoI8+dYz6jKrLntQ5/NJNASFBacJh7Jv2BlI="' >> config.py +cp -a $WORKSPACE/tests/metadata $WORKSPACE/tests/repo $WORKSPACE/tests/stats $REPOROOT/ cp -a $WORKSPACE/tests/gnupghome $GNUPGHOME chmod 0700 $GNUPGHOME echo "accepted_formats = ['json', 'txt', 'yml']" >> config.py echo "install_list = 'org.adaway'" >> config.py -echo "uninstall_list = {'com.android.vending', 'com.facebook.orca',}" >> config.py +echo "uninstall_list = ('com.android.vending', 'com.facebook.orca',)" >> config.py echo "gpghome = '$GNUPGHOME'" >> config.py echo "gpgkey = 'CE71F7FB'" >> config.py -$fdroid update --verbose +echo "mirrors = ('http://foobarfoobarfoobar.onion/fdroid','https://foo.bar/fdroid',)" >> config.py +$fdroid update --verbose --pretty test -e repo/index.xml test -e repo/index.jar grep -F ' Date: Tue, 29 Nov 2016 15:55:07 +0100 Subject: [PATCH 02/11] sort repo index data to make index.xml generation reproducible This makes it easy to test that the code is still generating the exact same index.xml. It also might help the ZIP compression work better in index.jar --- fdroidserver/update.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/fdroidserver/update.py b/fdroidserver/update.py index 60904f55..b47398c4 100644 --- a/fdroidserver/update.py +++ b/fdroidserver/update.py @@ -1028,7 +1028,7 @@ def make_index(apps, sortedids, apks, repodir, archive): mirrorcheckfailed = False mirrors = [] - for mirror in config.get('mirrors', []): + for mirror in sorted(config.get('mirrors', [])): base = os.path.basename(urllib.parse.urlparse(mirror).path.rstrip('/')) if config.get('nonstandardwebroot') is not True and base != 'fdroid': logging.error("mirror '" + mirror + "' does not end with 'fdroid'!") @@ -1237,28 +1237,29 @@ def make_index(apps, sortedids, apks, repodir, archive): addElement('sig', apk['sig'], doc, apkel) old_permissions = set() - for perm in apk['uses-permission']: + sorted_permissions = sorted(apk['uses-permission']) + for perm in sorted_permissions: perm_name = perm.name if perm_name.startswith("android.permission."): perm_name = perm_name[19:] old_permissions.add(perm_name) addElementNonEmpty('permissions', ','.join(old_permissions), doc, apkel) - for permission in apk['uses-permission']: + for permission in sorted_permissions: permel = doc.createElement('uses-permission') permel.setAttribute('name', permission.name) if permission.maxSdkVersion is not None: permel.setAttribute('maxSdkVersion', permission.maxSdkVersion) apkel.appendChild(permel) - for permission_sdk_23 in apk['uses-permission-sdk-23']: + for permission_sdk_23 in sorted(apk['uses-permission-sdk-23']): permel = doc.createElement('uses-permission-sdk-23') permel.setAttribute('name', permission_sdk_23.name) if permission_sdk_23.maxSdkVersion is not None: permel.setAttribute('maxSdkVersion', permission_sdk_23.maxSdkVersion) apkel.appendChild(permel) if 'nativecode' in apk: - addElement('nativecode', ','.join(apk['nativecode']), doc, apkel) - addElementNonEmpty('features', ','.join(apk['features']), doc, apkel) + addElement('nativecode', ','.join(sorted(apk['nativecode'])), doc, apkel) + addElementNonEmpty('features', ','.join(sorted(apk['features'])), doc, apkel) if current_version_file is not None \ and config['make_current_version_link'] \ @@ -1331,7 +1332,7 @@ def make_index(apps, sortedids, apks, repodir, archive): def make_categories_txt(repodir, categories): '''Write a category list in the repo to allow quick access''' catdata = '' - for cat in categories: + for cat in sorted(categories): catdata += cat + '\n' with open(os.path.join(repodir, 'categories.txt'), 'w', encoding='utf8') as f: f.write(catdata) From 4625651192e6b1f619df89e93b2062bb7270409a Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Fri, 18 Nov 2016 09:56:37 +0100 Subject: [PATCH 03/11] make Build class act more like a dict This makes it a lot easier to work with Build instances with parsing and dumping libraries, since they expect only core Python types (dict, list, tuple, str, etc) --- fdroidserver/metadata.py | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/fdroidserver/metadata.py b/fdroidserver/metadata.py index 9af8a107..6fb69a48 100644 --- a/fdroidserver/metadata.py +++ b/fdroidserver/metadata.py @@ -25,6 +25,7 @@ import cgi import logging import textwrap import io +import pprint import yaml # use libyaml if it is available @@ -309,7 +310,7 @@ build_flags = set(build_flags_order + ['version', 'vercode']) class Build(): - def __init__(self): + def __init__(self, copydict=None): self.disable = False self.commit = None self.subdir = None @@ -342,6 +343,16 @@ class Build(): self._modified = set() + if copydict: + for k, v in copydict.items(): + self.set_flag(k, v) + + def __str__(self): + return pprint.pformat(self.__dict__) + + def __repr__(self): + return self.__str__() + def get_flag(self, f): if f not in build_flags: warn_or_exception('Unrecognised build flag: ' + f) @@ -893,7 +904,12 @@ def post_metadata_parse(app): if type(v) in (float, int): app.__dict__[k] = str(v) + builds = [] for build in app.builds: + if not isinstance(build, Build): + build = Build(build) + builds.append(build) + for k in build._modified: v = build.__dict__[k] if type(v) in (float, int): @@ -919,7 +935,7 @@ def post_metadata_parse(app): if not app.Description: app.Description = 'No description available' - app.builds = sorted_builds(app.builds) + app.builds = sorted_builds(builds) # Parse metadata for a single application. From b7fc7f2228986d0210e221c9ec8ddcc2ad9b93bc Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Wed, 23 Nov 2016 17:25:59 +0100 Subject: [PATCH 04/11] convert App to subclass of dict to support parsing/dumping libs Python is heavily based on its core data types, and dict is one of the more important ones. Even classes are basically a wrapper around a dict. This converts metadata.App to be a subclass of dict so it can behave like a dict when being dumped and loaded. This makes its drastically easier to use different data formats for build metadata and for sending data to the client. This approach will ultimately mean we no longer have to maintain custom parsing and dumping code. This also means then that the YAML/JSON field names will not have spaces in them, and they will match exactly what it used as the dict keys once the data is parsed, as well as matching exactly the instance attribute names: * CurrentVersion: 1.2.6 * app['CurrentVersion'] == '1.2.6' * app.CurrentVersion == '1.2.6' Inspired by: https://goodcode.io/articles/python-dict-object/ --- fdroidserver/lint.py | 14 +- fdroidserver/metadata.py | 208 ++++++------------ fdroidserver/update.py | 9 +- tests/import.TestCase | 2 +- tests/metadata.TestCase | 3 +- tests/metadata/dump/org.adaway.yaml | 38 ++-- .../dump/org.smssecure.smssecure.yaml | 38 ++-- tests/metadata/dump/org.videolan.vlc.yaml | 38 ++-- tests/metadata/org.adaway.json | 20 +- tests/metadata/org.videolan.vlc.yml | 24 +- 10 files changed, 165 insertions(+), 229 deletions(-) diff --git a/fdroidserver/lint.py b/fdroidserver/lint.py index fb35d9cb..f70097c4 100644 --- a/fdroidserver/lint.py +++ b/fdroidserver/lint.py @@ -63,10 +63,10 @@ http_checks = https_enforcings + http_url_shorteners + [ ] regex_checks = { - 'Web Site': http_checks, - 'Source Code': http_checks, + 'WebSite': http_checks, + 'SourceCode': http_checks, 'Repo': https_enforcings, - 'Issue Tracker': http_checks + [ + 'IssueTracker': http_checks + [ (re.compile(r'.*github\.com/[^/]+/[^/]+/*$'), "/issues is missing"), (re.compile(r'.*gitlab\.com/[^/]+/[^/]+/*$'), @@ -121,7 +121,7 @@ regex_checks = { def check_regexes(app): for f, checks in regex_checks.items(): for m, r in checks: - v = app.get_field(f) + v = app.get(f) t = metadata.fieldtype(f) if t == metadata.TYPE_MULTILINE: for l in v.splitlines(): @@ -183,8 +183,8 @@ def check_old_links(app): 'code.google.com', ] if any(s in app.Repo for s in usual_sites): - for f in ['Web Site', 'Source Code', 'Issue Tracker', 'Changelog']: - v = app.get_field(f) + for f in ['WebSite', 'SourceCode', 'IssueTracker', 'Changelog']: + v = app.get(f) if any(s in v for s in old_sites): yield "App is in '%s' but has a link to '%s'" % (app.Repo, v) @@ -241,7 +241,7 @@ def check_duplicates(app): links_seen = set() for f in ['Source Code', 'Web Site', 'Issue Tracker', 'Changelog']: - v = app.get_field(f) + v = app.get(f) if not v: continue v = v.lower() diff --git a/fdroidserver/metadata.py b/fdroidserver/metadata.py index 6fb69a48..2b091e2c 100644 --- a/fdroidserver/metadata.py +++ b/fdroidserver/metadata.py @@ -98,15 +98,21 @@ app_fields = set([ 'Current Version', 'Current Version Code', 'No Source Since', + 'Build', 'comments', # For formats that don't do inline comments 'builds', # For formats that do builds as a list ]) -class App(): +class App(dict): + + def __init__(self, copydict=None): + if copydict: + super().__init__(copydict) + return + super().__init__() - def __init__(self): self.Disabled = None self.AntiFeatures = [] self.Provides = None @@ -148,94 +154,21 @@ class App(): self.comments = {} self.added = None self.lastupdated = None - self._modified = set() - @classmethod - def field_to_attr(cls, f): - """ - Translates human-readable field names to attribute names, e.g. - 'Auto Name' to 'AutoName' - """ - return f.replace(' ', '') - - @classmethod - def attr_to_field(cls, k): - """ - Translates attribute names to human-readable field names, e.g. - 'AutoName' to 'Auto Name' - """ - if k in app_fields: - return k - f = re.sub(r'([a-z])([A-Z])', r'\1 \2', k) - return f - - def field_dict(self): - """ - Constructs an old-fashioned dict with the human-readable field - names. Should only be used for tests. - """ - d = {} - for k, v in self.__dict__.items(): - if k == 'builds': - d['builds'] = [] - for build in v: - b = {k: v for k, v in build.__dict__.items() if not k.startswith('_')} - d['builds'].append(b) - elif not k.startswith('_'): - f = App.attr_to_field(k) - d[f] = v - return d - - def get_field(self, f): - """Gets the value associated to a field name, e.g. 'Auto Name'""" - if f not in app_fields: - warn_or_exception('Unrecognised app field: ' + f) - k = App.field_to_attr(f) - return getattr(self, k) - - def set_field(self, f, v): - """Sets the value associated to a field name, e.g. 'Auto Name'""" - if f not in app_fields: - warn_or_exception('Unrecognised app field: ' + f) - k = App.field_to_attr(f) - self.__dict__[k] = v - self._modified.add(k) - - def append_field(self, f, v): - """Appends to the value associated to a field name, e.g. 'Auto Name'""" - if f not in app_fields: - warn_or_exception('Unrecognised app field: ' + f) - k = App.field_to_attr(f) - if k not in self.__dict__: - self.__dict__[k] = [v] + def __getattr__(self, name): + if name in self: + return self[name] else: - self.__dict__[k].append(v) + raise AttributeError("No such attribute: " + name) - def update_fields(self, d): - '''Like dict.update(), but using human-readable field names''' - for f, v in d.items(): - if f == 'builds': - for b in v: - build = Build() - build.update_flags(b) - self.builds.append(build) - else: - self.set_field(f, v) + def __setattr__(self, name, value): + self[name] = value - def update(self, d): - '''Like dict.update()''' - for k, v in d.__dict__.items(): - if k == '_modified': - continue - elif k == 'builds': - for b in v: - build = Build() - del(b.__dict__['_modified']) - build.update_flags(b.__dict__) - self.builds.append(build) - elif v: - self.__dict__[k] = v - self._modified.add(k) + def __delattr__(self, name): + if name in self: + del self[name] + else: + raise AttributeError("No such attribute: " + name) def get_last_build(self): if len(self.builds) > 0: @@ -256,16 +189,17 @@ TYPE_BUILD_V2 = 8 fieldtypes = { 'Description': TYPE_MULTILINE, - 'Maintainer Notes': TYPE_MULTILINE, + 'MaintainerNotes': TYPE_MULTILINE, 'Categories': TYPE_LIST, 'AntiFeatures': TYPE_LIST, - 'Build Version': TYPE_BUILD, + 'BuildVersion': TYPE_BUILD, 'Build': TYPE_BUILD_V2, - 'Use Built': TYPE_OBSOLETE, + 'UseBuilt': TYPE_OBSOLETE, } def fieldtype(name): + name = name.replace(' ', '') if name in fieldtypes: return fieldtypes[name] return TYPE_STRING @@ -518,9 +452,7 @@ valuetypes = { def check_metadata(app): for v in valuetypes: for k in v.fields: - if k not in app._modified: - continue - v.check(app.__dict__[k], app.id) + v.check(app[k], app.id) # Formatter for descriptions. Create an instance, and call parseline() with @@ -896,44 +828,21 @@ def sorted_builds(builds): esc_newlines = re.compile(r'\\( |\n)') -# This function uses __dict__ to be faster def post_metadata_parse(app): - - for k in app._modified: - v = app.__dict__[k] + # TODO keep native types, convert only for .txt metadata + for k, v in app.items(): if type(v) in (float, int): - app.__dict__[k] = str(v) + app[k] = str(v) builds = [] - for build in app.builds: - if not isinstance(build, Build): - build = Build(build) - builds.append(build) + if 'builds' in app: + for build in app['builds']: + if not isinstance(build, Build): + build = Build(build) + builds.append(build) - for k in build._modified: - v = build.__dict__[k] - if type(v) in (float, int): - build.__dict__[k] = str(v) - continue - ftype = flagtype(k) - - if ftype == TYPE_SCRIPT: - build.__dict__[k] = re.sub(esc_newlines, '', v).lstrip().rstrip() - elif ftype == TYPE_BOOL: - # TODO handle this using Date: Tue, 29 Nov 2016 13:26:32 +0100 Subject: [PATCH 05/11] convert metadata.Build to a subclass of dict Like with the App class in the commit before, this makes it a lot easier to work with this data when converting between the internal formats and external formats like YAML, JSON, MsgPack, protobuf, etc. The one unfortunate thing here is Build.update. It becomes dict.update(), which is a method not an attribute. build.get('update') or build['update'] could be used, but that would be oddly inconsistent. So instead the field is renamed to 'androidupdate', except for in the .txt v0 metadata files. This better describes what field does anyway, since it runs `android update`. Build.update is only referenced in two places right next to each other for the ant builds, so this change still seems worthwhile. --- fdroidserver/common.py | 6 +- fdroidserver/metadata.py | 79 ++-- tests/metadata.TestCase | 6 + tests/metadata/dump/org.adaway.yaml | 211 ++++----- .../dump/org.smssecure.smssecure.yaml | 32 +- tests/metadata/dump/org.videolan.vlc.yaml | 408 +++++++++--------- tests/metadata/org.adaway.json | 4 +- tests/metadata/org.smssecure.smssecure.txt | 2 +- tests/metadata/org.videolan.vlc.yml | 254 +++++------ 9 files changed, 450 insertions(+), 552 deletions(-) diff --git a/fdroidserver/common.py b/fdroidserver/common.py index daacc89d..dd11a57a 100644 --- a/fdroidserver/common.py +++ b/fdroidserver/common.py @@ -1544,15 +1544,15 @@ def prepare_source(vcs, app, build, build_dir, srclib_dir, extlib_dir, onserver= (app.id, build.version), p.output) # Generate (or update) the ant build file, build.xml... - if build.build_method() == 'ant' and build.update != ['no']: + if build.build_method() == 'ant' and build.androidupdate != ['no']: parms = ['android', 'update', 'lib-project'] lparms = ['android', 'update', 'project'] if build.target: parms += ['-t', build.target] lparms += ['-t', build.target] - if build.update: - update_dirs = build.update + if build.androidupdate: + update_dirs = build.androidupdate else: update_dirs = ant_subprojects(root_dir) + ['.'] diff --git a/fdroidserver/metadata.py b/fdroidserver/metadata.py index 2b091e2c..6d9d9e0e 100644 --- a/fdroidserver/metadata.py +++ b/fdroidserver/metadata.py @@ -25,7 +25,6 @@ import cgi import logging import textwrap import io -import pprint import yaml # use libyaml if it is available @@ -242,9 +241,10 @@ build_flags_order = [ build_flags = set(build_flags_order + ['version', 'vercode']) -class Build(): +class Build(dict): def __init__(self, copydict=None): + super().__init__() self.disable = False self.commit = None self.subdir = None @@ -263,7 +263,7 @@ class Build(): self.rm = [] self.extlibs = [] self.prebuild = '' - self.update = [] + self.androidupdate = [] self.target = None self.scanignore = [] self.scandelete = [] @@ -274,45 +274,28 @@ class Build(): self.gradleprops = [] self.antcommands = [] self.novcheck = False - - self._modified = set() - if copydict: - for k, v in copydict.items(): - self.set_flag(k, v) + super().__init__(copydict) + return - def __str__(self): - return pprint.pformat(self.__dict__) - - def __repr__(self): - return self.__str__() - - def get_flag(self, f): - if f not in build_flags: - warn_or_exception('Unrecognised build flag: ' + f) - return getattr(self, f) - - def set_flag(self, f, v): - if f == 'versionName': - f = 'version' - if f == 'versionCode': - f = 'vercode' - if f not in build_flags: - warn_or_exception('Unrecognised build flag: ' + f) - self.__dict__[f] = v - self._modified.add(f) - - def append_flag(self, f, v): - if f not in build_flags: - warn_or_exception('Unrecognised build flag: ' + f) - if f not in self.__dict__: - self.__dict__[f] = [v] + def __getattr__(self, name): + if name in self: + return self[name] else: - self.__dict__[f].append(v) + raise AttributeError("No such attribute: " + name) + + def __setattr__(self, name, value): + self[name] = value + + def __delattr__(self, name): + if name in self: + del self[name] + else: + raise AttributeError("No such attribute: " + name) def build_method(self): for f in ['maven', 'gradle', 'kivy']: - if self.get_flag(f): + if self.get(f): return f if self.output: return 'raw' @@ -323,7 +306,7 @@ class Build(): if self.output: return 'raw' for f in ['maven', 'gradle', 'kivy']: - if self.get_flag(f): + if self.get(f): return f return 'ant' @@ -336,10 +319,6 @@ class Build(): return '' return paths[version] - def update_flags(self, d): - for f, v in d.items(): - self.set_flag(f, v) - flagtypes = { 'extlibs': TYPE_LIST, @@ -348,7 +327,7 @@ flagtypes = { 'rm': TYPE_LIST, 'buildjni': TYPE_LIST, 'preassemble': TYPE_LIST, - 'update': TYPE_LIST, + 'androidupdate': TYPE_LIST, 'scanignore': TYPE_LIST, 'scandelete': TYPE_LIST, 'gradle': TYPE_LIST, @@ -982,14 +961,16 @@ def parse_txt_metadata(mf, app): pk, pv = bv pk = pk.lstrip() + if pk == 'update': + pk = 'androidupdate' # avoid conflicting with Build(dict).update() t = flagtype(pk) if t == TYPE_LIST: pv = split_list_values(pv) - build.set_flag(pk, pv) + build[pk] = pv elif t == TYPE_STRING or t == TYPE_SCRIPT: - build.set_flag(pk, pv) + build[pk] = pv elif t == TYPE_BOOL: - build.set_flag(pk, _decode_bool(pv)) + build[pk] = _decode_bool(pv) def parse_buildline(lines): v = "".join(lines) @@ -1231,7 +1212,7 @@ def write_plaintext_metadata(mf, app, w_comment, w_field, w_build): if build.version == "Ignore": continue - w_comments('build:' + build.vercode) + w_comments('build:%s' % build.vercode) w_build(build) mf.write('\n') @@ -1276,11 +1257,13 @@ def write_txt(mf, app): mf.write("Build:%s,%s\n" % (build.version, build.vercode)) for f in build_flags_order: - v = build.get_flag(f) + v = build.get(f) if not v: continue t = flagtype(f) + if f == 'androidupdate': + f == 'update' # avoid conflicting with Build(dict).update() mf.write(' %s=' % f) if t == TYPE_STRING: mf.write(v) @@ -1357,7 +1340,7 @@ def write_yaml(mf, app): w_field('versionName', build.version, ' - ', TYPE_STRING) w_field('versionCode', build.vercode, ' ', TYPE_STRING) for f in build_flags_order: - v = build.get_flag(f) + v = build.get(f) if not v: continue diff --git a/tests/metadata.TestCase b/tests/metadata.TestCase index 010117af..791ac652 100755 --- a/tests/metadata.TestCase +++ b/tests/metadata.TestCase @@ -23,6 +23,11 @@ class MetadataTest(unittest.TestCase): '''fdroidserver/metadata.py''' def test_read_metadata(self): + + def _build_yaml_representer(dumper, data): + '''Creates a YAML representation of a Build instance''' + return dumper.represent_dict(data) + testsdir = os.path.dirname(__file__) os.chdir(testsdir) @@ -46,6 +51,7 @@ class MetadataTest(unittest.TestCase): self.assertEqual(frommeta, frompickle) # Uncomment to overwrite # with open(savepath, 'w') as f: + # yaml.add_representer(fdroidserver.metadata.Build, _build_yaml_representer) # yaml.dump(frommeta, f, default_flow_style=False) diff --git a/tests/metadata/dump/org.adaway.yaml b/tests/metadata/dump/org.adaway.yaml index a643fa95..e3b87a96 100644 --- a/tests/metadata/dump/org.adaway.yaml +++ b/tests/metadata/dump/org.adaway.yaml @@ -58,10 +58,10 @@ VercodeOperation: null WebSite: http://sufficientlysecure.org/index.php/adaway added: null builds: -- antcommands: [] +- androidupdate: [] + antcommands: [] build: '' - buildjni: - - 'yes' + buildjni: true commit: ea5378a94ee0dc1d99d2cec95fae7e6d81afb2b9 disable: false encoding: null @@ -87,13 +87,12 @@ builds: subdir: org_adaway/ submodules: false target: null - update: [] vercode: '13' version: '1.12' -- antcommands: [] +- androidupdate: [] + antcommands: [] build: '' - buildjni: - - 'yes' + buildjni: true commit: 4128e59da2eac5c2904c7c7568d298ca51e79540 disable: false encoding: null @@ -120,13 +119,12 @@ builds: subdir: org_adaway/ submodules: false target: null - update: [] vercode: '16' version: '1.15' -- antcommands: [] +- androidupdate: [] + antcommands: [] build: '' - buildjni: - - 'yes' + buildjni: true commit: 0b9985398b9eef7baf6aadd0dbb12002bc199d2e disable: false encoding: null @@ -153,13 +151,12 @@ builds: subdir: org_adaway/ submodules: false target: null - update: [] vercode: '19' version: '1.18' -- antcommands: [] +- androidupdate: [] + antcommands: [] build: '' - buildjni: - - 'yes' + buildjni: true commit: ab27f4dab5f3ea5e228cfb4a6b0e1fbf53695f22 disable: false encoding: null @@ -186,13 +183,12 @@ builds: subdir: org_adaway/ submodules: false target: null - update: [] vercode: '20' version: '1.19' -- antcommands: [] +- androidupdate: [] + antcommands: [] build: '' - buildjni: - - 'yes' + buildjni: true commit: 695e3801e4081026c8f7213a2345fc451d5eb89c disable: false encoding: null @@ -219,13 +215,12 @@ builds: subdir: org_adaway/ submodules: false target: null - update: [] vercode: '21' version: '1.20' -- antcommands: [] +- androidupdate: [] + antcommands: [] build: '' - buildjni: - - 'yes' + buildjni: true commit: 65138c11cc8b6affd28b68e125fbc1dff0886a4e disable: false encoding: null @@ -252,10 +247,10 @@ builds: subdir: org_adaway/ submodules: false target: null - update: [] vercode: '22' version: '1.21' -- antcommands: [] +- androidupdate: [] + antcommands: [] build: '' buildjni: [] commit: unknown - see disabled @@ -283,13 +278,12 @@ builds: subdir: null submodules: false target: null - update: [] vercode: '24' version: '1.23' -- antcommands: [] +- androidupdate: [] + antcommands: [] build: '' - buildjni: - - 'yes' + buildjni: true commit: f811e53e1e1d2ee047b18715fd7d2072b90ae76b disable: false encoding: null @@ -315,13 +309,12 @@ builds: subdir: org_adaway/ submodules: false target: null - update: [] vercode: '25' version: '1.24' -- antcommands: [] +- androidupdate: [] + antcommands: [] build: '' - buildjni: - - 'yes' + buildjni: true commit: ff97932761cdee68638dc2550751a64b2cbe18e7 disable: false encoding: null @@ -347,13 +340,12 @@ builds: subdir: org_adaway/ submodules: false target: null - update: [] vercode: '26' version: '1.25' -- antcommands: [] +- androidupdate: [] + antcommands: [] build: '' - buildjni: - - 'yes' + buildjni: true commit: 33d4d80998f30bafc88c04c80cbae00b03916f99 disable: false encoding: null @@ -379,13 +371,12 @@ builds: subdir: org_adaway/ submodules: false target: null - update: [] vercode: '27' version: '1.26' -- antcommands: [] +- androidupdate: [] + antcommands: [] build: '' - buildjni: - - 'yes' + buildjni: true commit: 743d25a7e287505461f33f4b8e57e4cf988fffea disable: false encoding: null @@ -411,13 +402,12 @@ builds: subdir: org_adaway/ submodules: false target: null - update: [] vercode: '28' version: '1.27' -- antcommands: [] +- androidupdate: [] + antcommands: [] build: '' - buildjni: - - 'yes' + buildjni: true commit: eaa07f4 disable: false encoding: null @@ -443,10 +433,10 @@ builds: subdir: org_adaway/ submodules: false target: null - update: [] vercode: '30' version: '1.29' -- antcommands: [] +- androidupdate: [] + antcommands: [] build: '' buildjni: false commit: 71ced3f @@ -475,10 +465,10 @@ builds: subdir: org_adaway/ submodules: false target: null - update: [] vercode: '33' version: '1.32' -- antcommands: [] +- androidupdate: [] + antcommands: [] build: '' buildjni: false commit: 9d63c18 @@ -506,10 +496,10 @@ builds: subdir: org_adaway/ submodules: false target: null - update: [] vercode: '34' version: '1.33' -- antcommands: [] +- androidupdate: [] + antcommands: [] build: '' buildjni: false commit: f2568b1 @@ -538,10 +528,10 @@ builds: subdir: org_adaway/ submodules: false target: null - update: [] vercode: '35' version: '1.34' -- antcommands: [] +- androidupdate: [] + antcommands: [] build: '' buildjni: false commit: 7442d5d @@ -570,10 +560,10 @@ builds: subdir: org_adaway/ submodules: false target: null - update: [] vercode: '36' version: '1.35' -- antcommands: [] +- androidupdate: [] + antcommands: [] build: '' buildjni: false commit: 83fc713 @@ -602,10 +592,10 @@ builds: subdir: org_adaway/ submodules: false target: null - update: [] vercode: '37' version: '1.36' -- antcommands: [] +- androidupdate: [] + antcommands: [] build: '' buildjni: false commit: 70da32b567122b701cdcb1609b780eb85732028f @@ -634,13 +624,16 @@ builds: subdir: org_adaway/ submodules: false target: null - update: [] vercode: '38' version: '1.37' -- antcommands: [] +- androidupdate: + - . + - android-libs/Donations + - android-libs/ActionBarSherlock + - android-libs/HtmlSpanner/htmlspanner + antcommands: [] build: '' - buildjni: - - 'yes' + buildjni: true commit: v2.1 disable: false encoding: null @@ -674,17 +667,16 @@ builds: subdir: AdAway submodules: false target: null - update: + vercode: '40' + version: '2.1' +- androidupdate: - . - android-libs/Donations - android-libs/ActionBarSherlock - android-libs/HtmlSpanner/htmlspanner - vercode: '40' - version: '2.1' -- antcommands: [] + antcommands: [] build: '' - buildjni: - - 'yes' + buildjni: true commit: v2.3 disable: false encoding: null @@ -718,25 +710,19 @@ builds: subdir: AdAway submodules: false target: null - update: - - . - - android-libs/Donations - - android-libs/ActionBarSherlock - - android-libs/HtmlSpanner/htmlspanner vercode: '42' version: '2.3' -- antcommands: [] +- androidupdate: [] + antcommands: [] build: '' - buildjni: - - 'yes' + buildjni: true commit: v2.6 disable: false encoding: null extlibs: [] forcevercode: false forceversion: false - gradle: - - 'yes' + gradle: true gradleprops: [] init: '' kivy: false @@ -756,21 +742,19 @@ builds: subdir: AdAway submodules: false target: null - update: [] vercode: '45' version: '2.6' -- antcommands: [] +- androidupdate: [] + antcommands: [] build: '' - buildjni: - - 'yes' + buildjni: true commit: v2.7 disable: false encoding: null extlibs: [] forcevercode: false forceversion: false - gradle: - - 'yes' + gradle: true gradleprops: [] init: '' kivy: false @@ -790,21 +774,19 @@ builds: subdir: AdAway submodules: false target: null - update: [] vercode: '46' version: '2.7' -- antcommands: [] +- androidupdate: [] + antcommands: [] build: '' - buildjni: - - 'yes' + buildjni: true commit: v2.8 disable: false encoding: null extlibs: [] forcevercode: false forceversion: false - gradle: - - 'yes' + gradle: true gradleprops: [] init: '' kivy: false @@ -824,21 +806,19 @@ builds: subdir: AdAway submodules: false target: null - update: [] vercode: '47' version: '2.8' -- antcommands: [] +- androidupdate: [] + antcommands: [] build: '' - buildjni: - - 'yes' + buildjni: true commit: v2.8.1 disable: false encoding: null extlibs: [] forcevercode: false forceversion: false - gradle: - - 'yes' + gradle: true gradleprops: [] init: '' kivy: false @@ -858,21 +838,19 @@ builds: subdir: AdAway submodules: false target: null - update: [] vercode: '48' version: 2.8.1 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: '' - buildjni: - - 'yes' + buildjni: true commit: v2.9 disable: false encoding: null extlibs: [] forcevercode: false forceversion: false - gradle: - - 'yes' + gradle: true gradleprops: [] init: '' kivy: false @@ -892,21 +870,19 @@ builds: subdir: AdAway submodules: false target: null - update: [] vercode: '49' version: '2.9' -- antcommands: [] +- androidupdate: [] + antcommands: [] build: '' - buildjni: - - 'yes' + buildjni: true commit: v2.9.1 disable: false encoding: null extlibs: [] forcevercode: false forceversion: false - gradle: - - 'yes' + gradle: true gradleprops: [] init: '' kivy: false @@ -926,21 +902,19 @@ builds: subdir: AdAway submodules: false target: null - update: [] vercode: '50' version: 2.9.1 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: '' - buildjni: - - 'yes' + buildjni: true commit: v2.9.2 disable: false encoding: null extlibs: [] forcevercode: false forceversion: false - gradle: - - 'yes' + gradle: true gradleprops: [] init: '' kivy: false @@ -960,21 +934,19 @@ builds: subdir: AdAway submodules: false target: null - update: [] vercode: '51' version: 2.9.2 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: '' - buildjni: - - 'yes' + buildjni: true commit: v3.0 disable: false encoding: null extlibs: [] forcevercode: false forceversion: false - gradle: - - 'yes' + gradle: true gradleprops: [] init: '' kivy: false @@ -994,7 +966,6 @@ builds: subdir: AdAway submodules: false target: null - update: [] vercode: '52' version: '3.0' comments: diff --git a/tests/metadata/dump/org.smssecure.smssecure.yaml b/tests/metadata/dump/org.smssecure.smssecure.yaml index 3c68de98..5d26d0eb 100644 --- a/tests/metadata/dump/org.smssecure.smssecure.yaml +++ b/tests/metadata/dump/org.smssecure.smssecure.yaml @@ -55,7 +55,8 @@ VercodeOperation: null WebSite: http://www.smssecure.org added: null builds: -- antcommands: [] +- androidupdate: [] + antcommands: [] build: '' buildjni: [] commit: 66367479a4f57f347b5cbe8f6f8f632adaae7727 @@ -95,10 +96,10 @@ builds: subdir: null submodules: false target: null - update: [] vercode: '5' version: 0.3.3 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: '' buildjni: [] commit: 9675ce5eecb929dcaddb43b3d9486fdb88b9ae1a @@ -130,10 +131,10 @@ builds: subdir: null submodules: true target: null - update: [] vercode: '6' version: 0.3.3 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: '' buildjni: [] commit: v0.4.2 @@ -164,10 +165,10 @@ builds: subdir: null submodules: true target: null - update: [] vercode: '9' version: 0.4.2 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: '' buildjni: [] commit: v0.5.1 @@ -198,10 +199,10 @@ builds: subdir: null submodules: true target: null - update: [] vercode: '11' version: 0.5.1 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: '' buildjni: [] commit: v0.5.2 @@ -231,10 +232,10 @@ builds: subdir: null submodules: true target: null - update: [] vercode: '12' version: 0.5.2 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: '' buildjni: [] commit: v0.5.3 @@ -264,10 +265,10 @@ builds: subdir: null submodules: true target: null - update: [] vercode: '100' version: 0.5.3 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: '' buildjni: [] commit: v0.5.4 @@ -297,10 +298,10 @@ builds: subdir: null submodules: true target: null - update: [] vercode: '101' version: 0.5.4 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: '' buildjni: [] commit: v0.6.0 @@ -330,7 +331,6 @@ builds: subdir: null submodules: true target: null - update: [] vercode: '102' version: 0.6.0 comments: {} diff --git a/tests/metadata/dump/org.videolan.vlc.yaml b/tests/metadata/dump/org.videolan.vlc.yaml index a60719f0..cf7cc6f0 100644 --- a/tests/metadata/dump/org.videolan.vlc.yaml +++ b/tests/metadata/dump/org.videolan.vlc.yaml @@ -57,7 +57,11 @@ VercodeOperation: '%c + 5' WebSite: http://www.videolan.org/vlc/download-android.html added: null builds: -- antcommands: [] +- androidupdate: + - . + - ../java-libs/SlidingMenu + - ../java-libs/ActionBarSherlock + antcommands: [] build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release buildjni: false commit: 0.0.11 @@ -85,13 +89,13 @@ builds: subdir: vlc-android submodules: false target: null - update: + vercode: 110 + version: 0.0.11-ARMv7 +- androidupdate: - . - ../java-libs/SlidingMenu - ../java-libs/ActionBarSherlock - vercode: '110' - version: 0.0.11-ARMv7 -- antcommands: [] + antcommands: [] build: cd ../ && ANDROID_ABI=armeabi ./compile.sh release buildjni: false commit: 0.0.11 @@ -119,13 +123,13 @@ builds: subdir: vlc-android submodules: false target: null - update: + vercode: 111 + version: 0.0.11-ARM +- androidupdate: - . - ../java-libs/SlidingMenu - ../java-libs/ActionBarSherlock - vercode: '111' - version: 0.0.11-ARM -- antcommands: [] + antcommands: [] build: cd ../ && ANDROID_ABI=x86 ./compile.sh release buildjni: false commit: unknown - see disabled @@ -153,13 +157,13 @@ builds: subdir: vlc-android submodules: false target: null - update: + vercode: 112 + version: 0.0.11-x86 +- androidupdate: - . - ../java-libs/SlidingMenu - ../java-libs/ActionBarSherlock - vercode: '112' - version: 0.0.11-x86 -- antcommands: [] + antcommands: [] build: cd ../ && ANDROID_ABI=mips ./compile.sh release buildjni: false commit: 0.0.11 @@ -187,13 +191,10 @@ builds: subdir: vlc-android submodules: false target: null - update: - - . - - ../java-libs/SlidingMenu - - ../java-libs/ActionBarSherlock - vercode: '113' + vercode: 113 version: 0.0.11-mips -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ANDROID_ABI=mips ./compile.sh release buildjni: false commit: 0.1.3 @@ -223,10 +224,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '1301' + vercode: 1301 version: 0.1.3-MIPS -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ANDROID_ABI=x86 ./compile.sh release buildjni: false commit: 0.1.3 @@ -256,10 +257,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '1302' + vercode: 1302 version: 0.1.3-x86 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ANDROID_ABI=armeabi ./compile.sh release buildjni: false commit: 0.1.3 @@ -289,10 +290,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '1303' + vercode: 1303 version: 0.1.3-ARM -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release buildjni: false commit: 0.1.3 @@ -322,10 +323,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '1304' + vercode: 1304 version: 0.1.3-ARMv7 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ANDROID_ABI=x86 ./compile.sh release buildjni: false commit: 0.9.0 @@ -354,10 +355,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '9002' + vercode: 9002 version: 0.9.0 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release buildjni: false commit: 0.9.0 @@ -386,10 +387,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '9004' + vercode: 9004 version: 0.9.0 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ANDROID_ABI=x86 ./compile.sh release buildjni: false commit: 0.9.1 @@ -418,10 +419,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '9102' + vercode: 9102 version: 0.9.1 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release buildjni: false commit: 0.9.1 @@ -450,10 +451,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '9104' + vercode: 9104 version: 0.9.1 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ANDROID_ABI=x86 ./compile.sh release buildjni: false commit: 0.9.5 @@ -482,10 +483,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '9502' + vercode: 9502 version: 0.9.5 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release buildjni: false commit: 0.9.5 @@ -514,10 +515,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '9504' + vercode: 9504 version: 0.9.5 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ANDROID_ABI=x86 ./compile.sh release buildjni: false commit: 0.9.6 @@ -546,10 +547,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '9602' + vercode: 9602 version: 0.9.6 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release buildjni: false commit: 0.9.6 @@ -578,10 +579,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '9604' + vercode: 9604 version: 0.9.6 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ANDROID_ABI=x86 ./compile.sh release buildjni: false commit: 0.9.7 @@ -610,10 +611,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '9702' + vercode: 9702 version: 0.9.7 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release buildjni: false commit: 0.9.7 @@ -642,10 +643,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '9704' + vercode: 9704 version: 0.9.7 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ANDROID_ABI=mips ./compile.sh release buildjni: false commit: 0.9.7.1 @@ -674,10 +675,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '9711' + vercode: 9711 version: 0.9.7.1 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ANDROID_ABI=x86 ./compile.sh release buildjni: false commit: 0.9.7.1 @@ -706,10 +707,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '9712' + vercode: 9712 version: 0.9.7.1 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release buildjni: false commit: 0.9.7.1 @@ -738,10 +739,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '9714' + vercode: 9714 version: 0.9.7.1 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ANDROID_ABI=x86 ./compile.sh release buildjni: false commit: 0.9.8 @@ -770,10 +771,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '9802' + vercode: 9802 version: 0.9.8 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ANDROID_ABI=armeabi ./compile.sh release buildjni: false commit: 0.9.8 @@ -802,10 +803,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '9803' + vercode: 9803 version: 0.9.8 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release buildjni: false commit: 0.9.8 @@ -834,10 +835,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '9804' + vercode: 9804 version: 0.9.8 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ANDROID_ABI=x86 ./compile.sh release buildjni: false commit: 0.9.9 @@ -866,10 +867,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '9902' + vercode: 9902 version: 0.9.9 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ANDROID_ABI=armeabi ./compile.sh release buildjni: false commit: 0.9.9 @@ -898,10 +899,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '9903' + vercode: 9903 version: 0.9.9 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release buildjni: false commit: 0.9.9 @@ -930,10 +931,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '9904' + vercode: 9904 version: 0.9.9 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ANDROID_ABI=x86 ./compile.sh release buildjni: false commit: 0.9.10 @@ -962,10 +963,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '10002' + vercode: 10002 version: 0.9.10 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ANDROID_ABI=armeabi ./compile.sh release buildjni: false commit: 0.9.10 @@ -994,10 +995,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '10003' + vercode: 10003 version: 0.9.10 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release buildjni: false commit: 0.9.10 @@ -1026,10 +1027,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '10004' + vercode: 10004 version: 0.9.10 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ANDROID_ABI=x86 ./compile.sh release buildjni: false commit: 1.0.0 @@ -1058,10 +1059,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '10006' + vercode: 10006 version: 1.0.0 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ANDROID_ABI=armeabi ./compile.sh release buildjni: false commit: 1.0.0 @@ -1090,10 +1091,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '10007' + vercode: 10007 version: 1.0.0 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release buildjni: false commit: 1.0.0 @@ -1122,10 +1123,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '10008' + vercode: 10008 version: 1.0.0 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ANDROID_ABI=x86 ./compile.sh release buildjni: false commit: 1.0.1 @@ -1154,10 +1155,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '10102' + vercode: 10102 version: 1.0.1 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ANDROID_ABI=armeabi ./compile.sh release buildjni: false commit: 1.0.1 @@ -1186,10 +1187,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '10103' + vercode: 10103 version: 1.0.1 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release buildjni: false commit: 1.0.1 @@ -1218,10 +1219,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '10104' + vercode: 10104 version: 1.0.1 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ./compile.sh -a "armeabi" --release buildjni: false commit: 1.1.3 @@ -1252,10 +1253,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '1010303' + vercode: 1010303 version: 1.1.3 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ./compile.sh -a "armeabi-v7a" --release buildjni: false commit: 1.1.3 @@ -1286,10 +1287,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '1010304' + vercode: 1010304 version: 1.1.3 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ./compile.sh -a "x86" --release buildjni: false commit: 1.1.3 @@ -1320,10 +1321,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '1010305' + vercode: 1010305 version: 1.1.3 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ./compile.sh -a "armeabi" --release buildjni: false commit: 1.1.5 @@ -1354,10 +1355,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '1010503' + vercode: 1010503 version: 1.1.5 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ./compile.sh -a "armeabi-v7a" --release buildjni: false commit: 1.1.5 @@ -1388,10 +1389,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '1010504' + vercode: 1010504 version: 1.1.5 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ./compile.sh -a "x86" --release buildjni: false commit: 1.1.5 @@ -1422,10 +1423,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '1010505' + vercode: 1010505 version: 1.1.5 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ./compile.sh -a "armeabi" --release buildjni: false commit: 1.1.6 @@ -1456,10 +1457,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '1010603' + vercode: 1010603 version: 1.1.6 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ./compile.sh -a "armeabi-v7a" --release buildjni: false commit: 1.1.6 @@ -1490,10 +1491,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '1010604' + vercode: 1010604 version: 1.1.6 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ./compile.sh -a "x86" --release buildjni: false commit: 1.1.6 @@ -1524,10 +1525,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '1010605' + vercode: 1010605 version: 1.1.6 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ./compile.sh -a "armeabi" --release buildjni: false commit: 1.2.0 @@ -1558,10 +1559,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '1020003' + vercode: 1020003 version: 1.2.0 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ./compile.sh -a "armeabi-v7a" --release buildjni: false commit: 1.2.0 @@ -1592,10 +1593,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '1020004' + vercode: 1020004 version: 1.2.0 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ./compile.sh -a "x86" --release buildjni: false commit: 1.2.0 @@ -1626,10 +1627,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '1020005' + vercode: 1020005 version: 1.2.0 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ./compile.sh -a "armeabi" --release buildjni: false commit: 1.2.1 @@ -1660,10 +1661,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '1020103' + vercode: 1020103 version: 1.2.1 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ./compile.sh -a "armeabi-v7a" --release buildjni: false commit: 1.2.1 @@ -1694,10 +1695,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '1020104' + vercode: 1020104 version: 1.2.1 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ./compile.sh -a "x86" --release buildjni: false commit: 1.2.1 @@ -1728,10 +1729,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '1020105' + vercode: 1020105 version: 1.2.1 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ./compile.sh -a "armeabi" --release buildjni: false commit: 1.2.2 @@ -1762,10 +1763,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '1020203' + vercode: 1020203 version: 1.2.2 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ./compile.sh -a "armeabi-v7a" --release buildjni: false commit: 1.2.2 @@ -1796,10 +1797,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '1020204' + vercode: 1020204 version: 1.2.2 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ./compile.sh -a "x86" --release buildjni: false commit: 1.2.2 @@ -1830,10 +1831,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '1020205' + vercode: 1020205 version: 1.2.2 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ./compile.sh -a "armeabi" --release buildjni: false commit: 1.2.3 @@ -1864,10 +1865,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '1020303' + vercode: 1020303 version: 1.2.3 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ./compile.sh -a "armeabi-v7a" --release buildjni: false commit: 1.2.3 @@ -1898,10 +1899,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '1020304' + vercode: 1020304 version: 1.2.3 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ./compile.sh -a "x86" --release buildjni: false commit: 1.2.3 @@ -1932,10 +1933,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '1020305' + vercode: 1020305 version: 1.2.3 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ./compile.sh -a "armeabi" --release buildjni: false commit: 1.2.4 @@ -1966,10 +1967,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '1020403' + vercode: 1020403 version: 1.2.4 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ./compile.sh -a "armeabi-v7a" --release buildjni: false commit: 1.2.4 @@ -2000,10 +2001,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '1020404' + vercode: 1020404 version: 1.2.4 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ./compile.sh -a "x86" --release buildjni: false commit: 1.2.4 @@ -2034,10 +2035,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '1020405' + vercode: 1020405 version: 1.2.4 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ./compile.sh -a "armeabi" --release buildjni: false commit: 1.2.5 @@ -2068,10 +2069,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '1020503' + vercode: 1020503 version: 1.2.5 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ./compile.sh -a "armeabi-v7a" --release buildjni: false commit: 1.2.5 @@ -2102,10 +2103,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '1020504' + vercode: 1020504 version: 1.2.5 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ./compile.sh -a "x86" --release buildjni: false commit: 1.2.5 @@ -2136,10 +2137,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '1020505' + vercode: 1020505 version: 1.2.5 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ./compile.sh -a "armeabi" --release buildjni: false commit: 1.2.6 @@ -2170,10 +2171,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '1030003' + vercode: 1030003 version: 1.2.6 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ./compile.sh -a "armeabi-v7a" --release buildjni: false commit: 1.2.6 @@ -2204,10 +2205,10 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '1030004' + vercode: 1030004 version: 1.2.6 -- antcommands: [] +- androidupdate: [] + antcommands: [] build: cd ../ && ./compile.sh -a "x86" --release buildjni: false commit: 1.2.6 @@ -2238,8 +2239,7 @@ builds: subdir: vlc-android submodules: false target: null - update: [] - vercode: '1030005' + vercode: 1030005 version: 1.2.6 comments: {} id: org.videolan.vlc diff --git a/tests/metadata/org.adaway.json b/tests/metadata/org.adaway.json index 0b95a963..c95a8878 100644 --- a/tests/metadata/org.adaway.json +++ b/tests/metadata/org.adaway.json @@ -182,7 +182,7 @@ "prebuild": "rm -rf ../update_zip libs/root-commands-1.2.jar libs/htmlspanner-0.2-fork.jar && cp -f libs/htmlcleaner-2.2.jar android-libs/HtmlSpanner/htmlspanner/libs/ && echo \"android.library.reference.3=$$RootCommands$$\" >> project.properties && echo \"android.library.reference.4=android-libs/HtmlSpanner/htmlspanner\" >> project.properties && find . -type f -print0 | xargs -0 sed -i 's/org.rootcommands/org.sufficientlysecure.rootcommands/g' && cp android-libs/Donations/ant-templates/other/DonationsConfig.java android-libs/Donations/src/org/donations/", "srclibs": ["RootCommands@c940b0e503"], "subdir": "AdAway", - "update": [".", + "androidupdate": [".", "android-libs/Donations", "android-libs/ActionBarSherlock", "android-libs/HtmlSpanner/htmlspanner"], @@ -197,7 +197,7 @@ "prebuild": "rm -rf ../update_zip libs/root-commands-1.2.jar libs/htmlspanner-0.2-fork.jar && cp -f libs/htmlcleaner-2.2.jar android-libs/HtmlSpanner/htmlspanner/libs/ && echo \"android.library.reference.3=$$RootCommands$$\" >> project.properties && echo \"android.library.reference.4=android-libs/HtmlSpanner/htmlspanner\" >> project.properties && find . -type f -print0 | xargs -0 sed -i 's/org.rootcommands/org.sufficientlysecure.rootcommands/g' && cp android-libs/Donations/ant-templates/other/DonationsConfig.java android-libs/Donations/src/org/donations/", "srclibs": ["RootCommands@c940b0e503"], "subdir": "AdAway", - "update": [".", + "androidupdate": [".", "android-libs/Donations", "android-libs/ActionBarSherlock", "android-libs/HtmlSpanner/htmlspanner"], diff --git a/tests/metadata/org.smssecure.smssecure.txt b/tests/metadata/org.smssecure.smssecure.txt index 2f324b7d..d4ff2384 100644 --- a/tests/metadata/org.smssecure.smssecure.txt +++ b/tests/metadata/org.smssecure.smssecure.txt @@ -45,7 +45,7 @@ Build:0.3.3,5 cp -fR smil/java/org src/ && \ rm -fR smil && \ sed -i -e '/org.w3c.smil/d' build.gradle && \ - cp -fR $$AospMms$$/src/org src/ + cp -fR $$AospMms$$/src/org src/ Build:0.3.3,6 disable=builds, wait for upstream diff --git a/tests/metadata/org.videolan.vlc.yml b/tests/metadata/org.videolan.vlc.yml index 5bedfb9e..67b0d297 100644 --- a/tests/metadata/org.videolan.vlc.yml +++ b/tests/metadata/org.videolan.vlc.yml @@ -25,12 +25,11 @@ builds: forceversion: yes forcevercode: yes prebuild: sed -i '48d' ../Makefile - update: + androidupdate: - . - ../java-libs/SlidingMenu - ../java-libs/ActionBarSherlock - build: cd ../ && \ - ANDROID_ABI=armeabi-v7a ./compile.sh release + build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release buildjni: no - versionName: 0.0.11-ARM @@ -40,7 +39,7 @@ builds: forceversion: yes forcevercode: yes prebuild: sed -i '48d' ../Makefile - update: + androidupdate: - . - ../java-libs/SlidingMenu - ../java-libs/ActionBarSherlock @@ -57,7 +56,7 @@ builds: forceversion: yes forcevercode: yes prebuild: sed -i '48d' ../Makefile - update: + androidupdate: - . - ../java-libs/SlidingMenu - ../java-libs/ActionBarSherlock @@ -73,7 +72,7 @@ builds: forceversion: yes forcevercode: yes prebuild: sed -i '48d' ../Makefile - update: + androidupdate: - . - ../java-libs/SlidingMenu - ../java-libs/ActionBarSherlock @@ -108,8 +107,7 @@ builds: forcevercode: yes prebuild: sed -i '/ant/d' ../Makefile && \ ln -s vlc-android/$$VLC$$ ../vlc - build: cd ../ && \ - ANDROID_ABI=x86 ./compile.sh release + build: cd ../ && ANDROID_ABI=x86 ./compile.sh release buildjni: no - versionName: 0.1.3-ARM @@ -122,8 +120,7 @@ builds: forcevercode: yes prebuild: sed -i '/ant/d' ../Makefile && \ ln -s vlc-android/$$VLC$$ ../vlc - build: cd ../ && \ - ANDROID_ABI=armeabi ./compile.sh release + build: cd ../ && ANDROID_ABI=armeabi ./compile.sh release buildjni: no - versionName: 0.1.3-ARMv7 @@ -136,8 +133,7 @@ builds: forcevercode: yes prebuild: sed -i '/ant/d' ../Makefile && \ ln -s vlc-android/$$VLC$$ ../vlc - build: cd ../ && \ - ANDROID_ABI=armeabi-v7a ./compile.sh release + build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release buildjni: no - versionName: 0.9.0 @@ -148,8 +144,7 @@ builds: forcevercode: yes prebuild: sed -i '/ant/d' ../Makefile && \ ln -s vlc-android/$$VLC$$ ../vlc - build: cd ../ && \ - ANDROID_ABI=x86 ./compile.sh release + build: cd ../ && ANDROID_ABI=x86 ./compile.sh release buildjni: no - versionName: 0.9.0 @@ -160,8 +155,7 @@ builds: forcevercode: yes prebuild: sed -i '/ant/d' ../Makefile && \ ln -s vlc-android/$$VLC$$ ../vlc - build: cd ../ && \ - ANDROID_ABI=armeabi-v7a ./compile.sh release + build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release buildjni: no - versionName: 0.9.1 @@ -172,8 +166,7 @@ builds: forcevercode: yes prebuild: sed -i '/ant/d' ../Makefile && \ ln -s vlc-android/$$VLC$$ ../vlc - build: cd ../ && \ - ANDROID_ABI=x86 ./compile.sh release + build: cd ../ && ANDROID_ABI=x86 ./compile.sh release buildjni: no - versionName: 0.9.1 @@ -184,8 +177,7 @@ builds: forcevercode: yes prebuild: sed -i '/ant/d' ../Makefile && \ ln -s vlc-android/$$VLC$$ ../vlc - build: cd ../ && \ - ANDROID_ABI=armeabi-v7a ./compile.sh release + build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release buildjni: no - versionName: 0.9.5 @@ -197,8 +189,7 @@ builds: forcevercode: yes prebuild: sed -i '/ant/d' ../Makefile && \ ln -s vlc-android/$$VLC$$ ../vlc - build: cd ../ && \ - ANDROID_ABI=x86 ./compile.sh release + build: cd ../ && ANDROID_ABI=x86 ./compile.sh release buildjni: no - versionName: 0.9.5 @@ -210,8 +201,7 @@ builds: forcevercode: yes prebuild: sed -i '/ant/d' ../Makefile && \ ln -s vlc-android/$$VLC$$ ../vlc - build: cd ../ && \ - ANDROID_ABI=armeabi-v7a ./compile.sh release + build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release buildjni: no - versionName: 0.9.6 @@ -222,8 +212,7 @@ builds: forcevercode: yes prebuild: sed -i '/ant/d' ../Makefile && \ ln -s vlc-android/$$VLC-2.2$$ ../vlc - build: cd ../ && \ - ANDROID_ABI=x86 ./compile.sh release + build: cd ../ && ANDROID_ABI=x86 ./compile.sh release buildjni: no - versionName: 0.9.6 @@ -234,8 +223,7 @@ builds: forcevercode: yes prebuild: sed -i '/ant/d' ../Makefile && \ ln -s vlc-android/$$VLC-2.2$$ ../vlc - build: cd ../ && \ - ANDROID_ABI=armeabi-v7a ./compile.sh release + build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release buildjni: no - versionName: 0.9.7 @@ -246,8 +234,7 @@ builds: forcevercode: yes prebuild: sed -i '/ant/d' ../Makefile && \ ln -s vlc-android/$$VLC-2.2$$ ../vlc - build: cd ../ && \ - ANDROID_ABI=x86 ./compile.sh release + build: cd ../ && ANDROID_ABI=x86 ./compile.sh release buildjni: no - versionName: 0.9.7 @@ -258,8 +245,7 @@ builds: forcevercode: yes prebuild: sed -i '/ant/d' ../Makefile && \ ln -s vlc-android/$$VLC-2.2$$ ../vlc - build: cd ../ && \ - ANDROID_ABI=armeabi-v7a ./compile.sh release + build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release buildjni: no - versionName: 0.9.7.1 @@ -271,8 +257,7 @@ builds: forcevercode: yes prebuild: sed -i '/ant/d' ../Makefile && \ ln -s vlc-android/$$VLC-2.2$$ ../vlc - build: cd ../ && \ - ANDROID_ABI=mips ./compile.sh release + build: cd ../ && ANDROID_ABI=mips ./compile.sh release buildjni: no - versionName: 0.9.7.1 @@ -283,8 +268,7 @@ builds: forcevercode: yes prebuild: sed -i '/ant/d' ../Makefile && \ ln -s vlc-android/$$VLC-2.2$$ ../vlc - build: cd ../ && \ - ANDROID_ABI=x86 ./compile.sh release + build: cd ../ && ANDROID_ABI=x86 ./compile.sh release buildjni: no - versionName: 0.9.7.1 @@ -295,8 +279,7 @@ builds: forcevercode: yes prebuild: sed -i '/ant/d' ../Makefile && \ ln -s vlc-android/$$VLC-2.2$$ ../vlc - build: cd ../ && \ - ANDROID_ABI=armeabi-v7a ./compile.sh release + build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release buildjni: no - versionName: 0.9.8 @@ -307,8 +290,7 @@ builds: forcevercode: yes prebuild: sed -i '/ant/d' ../Makefile && \ ln -s vlc-android/$$VLC-2.2$$ ../vlc - build: cd ../ && \ - ANDROID_ABI=x86 ./compile.sh release + build: cd ../ && ANDROID_ABI=x86 ./compile.sh release buildjni: no - versionName: 0.9.8 @@ -319,8 +301,7 @@ builds: forcevercode: yes prebuild: sed -i '/ant/d' ../Makefile && \ ln -s vlc-android/$$VLC-2.2$$ ../vlc - build: cd ../ && \ - ANDROID_ABI=armeabi ./compile.sh release + build: cd ../ && ANDROID_ABI=armeabi ./compile.sh release buildjni: no - versionName: 0.9.8 @@ -331,8 +312,7 @@ builds: forcevercode: yes prebuild: sed -i '/ant/d' ../Makefile && \ ln -s vlc-android/$$VLC-2.2$$ ../vlc - build: cd ../ && \ - ANDROID_ABI=armeabi-v7a ./compile.sh release + build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release buildjni: no - versionName: 0.9.9 @@ -343,8 +323,7 @@ builds: forcevercode: yes prebuild: sed -i '/ant/d' ../Makefile && \ ln -s vlc-android/$$VLC-2.2$$ ../vlc - build: cd ../ && \ - ANDROID_ABI=x86 ./compile.sh release + build: cd ../ && ANDROID_ABI=x86 ./compile.sh release buildjni: no - versionName: 0.9.9 @@ -355,8 +334,7 @@ builds: forcevercode: yes prebuild: sed -i '/ant/d' ../Makefile && \ ln -s vlc-android/$$VLC-2.2$$ ../vlc - build: cd ../ && \ - ANDROID_ABI=armeabi ./compile.sh release + build: cd ../ && ANDROID_ABI=armeabi ./compile.sh release buildjni: no - versionName: 0.9.9 @@ -367,8 +345,7 @@ builds: forcevercode: yes prebuild: sed -i '/ant/d' ../Makefile && \ ln -s vlc-android/$$VLC-2.2$$ ../vlc - build: cd ../ && \ - ANDROID_ABI=armeabi-v7a ./compile.sh release + build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release buildjni: no - versionName: 0.9.10 @@ -379,8 +356,7 @@ builds: forcevercode: yes prebuild: sed -i '/ant/d' ../Makefile && \ ln -s vlc-android/$$VLC-2.2$$ ../vlc - build: cd ../ && \ - ANDROID_ABI=x86 ./compile.sh release + build: cd ../ && ANDROID_ABI=x86 ./compile.sh release buildjni: no - versionName: 0.9.10 @@ -391,8 +367,7 @@ builds: forcevercode: yes prebuild: sed -i '/ant/d' ../Makefile && \ ln -s vlc-android/$$VLC-2.2$$ ../vlc - build: cd ../ && \ - ANDROID_ABI=armeabi ./compile.sh release + build: cd ../ && ANDROID_ABI=armeabi ./compile.sh release buildjni: no - versionName: 0.9.10 @@ -403,8 +378,7 @@ builds: forcevercode: yes prebuild: sed -i '/ant/d' ../Makefile && \ ln -s vlc-android/$$VLC-2.2$$ ../vlc - build: cd ../ && \ - ANDROID_ABI=armeabi-v7a ./compile.sh release + build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release buildjni: no #0.9.10 vercodes were off @@ -417,8 +391,7 @@ builds: forcevercode: yes prebuild: sed -i '/ant/d' ../Makefile && \ ln -s vlc-android/$$VLC-2.2$$ ../vlc - build: cd ../ && \ - ANDROID_ABI=x86 ./compile.sh release + build: cd ../ && ANDROID_ABI=x86 ./compile.sh release buildjni: no #0.9.10 vercodes were off @@ -431,8 +404,7 @@ builds: forcevercode: yes prebuild: sed -i '/ant/d' ../Makefile && \ ln -s vlc-android/$$VLC-2.2$$ ../vlc - build: cd ../ && \ - ANDROID_ABI=armeabi ./compile.sh release + build: cd ../ && ANDROID_ABI=armeabi ./compile.sh release buildjni: no #0.9.10 vercodes were off @@ -445,8 +417,7 @@ builds: forcevercode: yes prebuild: sed -i '/ant/d' ../Makefile && \ ln -s vlc-android/$$VLC-2.2$$ ../vlc - build: cd ../ && \ - ANDROID_ABI=armeabi-v7a ./compile.sh release + build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release buildjni: no - versionName: 1.0.1 @@ -457,8 +428,7 @@ builds: forcevercode: yes prebuild: sed -i '/ant/d' ../Makefile && \ ln -s vlc-android/$$VLC-2.2$$ ../vlc - build: cd ../ && \ - ANDROID_ABI=x86 ./compile.sh release + build: cd ../ && ANDROID_ABI=x86 ./compile.sh release buildjni: no - versionName: 1.0.1 @@ -469,8 +439,7 @@ builds: forcevercode: yes prebuild: sed -i '/ant/d' ../Makefile && \ ln -s vlc-android/$$VLC-2.2$$ ../vlc - build: cd ../ && \ - ANDROID_ABI=armeabi ./compile.sh release + build: cd ../ && ANDROID_ABI=armeabi ./compile.sh release buildjni: no - versionName: 1.0.1 @@ -481,8 +450,7 @@ builds: forcevercode: yes prebuild: sed -i '/ant/d' ../Makefile && \ ln -s vlc-android/$$VLC-2.2$$ ../vlc - build: cd ../ && \ - ANDROID_ABI=armeabi-v7a ./compile.sh release + build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release buildjni: no - versionName: 1.1.3 @@ -491,10 +459,9 @@ builds: subdir: vlc-android gradle: VanillaARMv6fpu srclibs: VLC@a9b19e4 - prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && \ + prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc - build: cd ../ && \ - ./compile.sh -a "armeabi" --release + build: cd ../ && ./compile.sh -a "armeabi" --release buildjni: no ndk: r10d @@ -504,10 +471,9 @@ builds: subdir: vlc-android gradle: VanillaARMv7 srclibs: VLC@a9b19e4 - prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && \ + prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc - build: cd ../ && \ - ./compile.sh -a "armeabi-v7a" --release + build: cd ../ && ./compile.sh -a "armeabi-v7a" --release buildjni: no ndk: r10d @@ -517,10 +483,9 @@ builds: subdir: vlc-android gradle: VanillaX86 srclibs: VLC@a9b19e4 - prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && \ + prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc - build: cd ../ && \ - ./compile.sh -a "x86" --release + build: cd ../ && ./compile.sh -a "x86" --release buildjni: no ndk: r10d @@ -530,10 +495,9 @@ builds: subdir: vlc-android gradle: VanillaARMv6fpu srclibs: VLC@e6b4585 - prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && \ + prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc - build: cd ../ && \ - ./compile.sh -a "armeabi" --release + build: cd ../ && ./compile.sh -a "armeabi" --release buildjni: no ndk: r10d @@ -543,10 +507,9 @@ builds: subdir: vlc-android gradle: VanillaARMv7 srclibs: VLC@e6b4585 - prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && \ + prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc - build: cd ../ && \ - ./compile.sh -a "armeabi-v7a" --release + build: cd ../ && ./compile.sh -a "armeabi-v7a" --release buildjni: no ndk: r10d @@ -556,10 +519,9 @@ builds: subdir: vlc-android gradle: VanillaX86 srclibs: VLC@e6b4585 - prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && \ + prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc - build: cd ../ && \ - ./compile.sh -a "x86" --release + build: cd ../ && ./compile.sh -a "x86" --release buildjni: no ndk: r10d @@ -569,10 +531,9 @@ builds: subdir: vlc-android gradle: VanillaARMv6fpu srclibs: VLC@551b670 - prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && \ + prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc - build: cd ../ && \ - ./compile.sh -a "armeabi" --release + build: cd ../ && ./compile.sh -a "armeabi" --release buildjni: no ndk: r10d @@ -582,10 +543,9 @@ builds: subdir: vlc-android gradle: VanillaARMv7 srclibs: VLC@551b670 - prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && \ + prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc - build: cd ../ && \ - ./compile.sh -a "armeabi-v7a" --release + build: cd ../ && ./compile.sh -a "armeabi-v7a" --release buildjni: no ndk: r10d @@ -595,10 +555,9 @@ builds: subdir: vlc-android gradle: VanillaX86 srclibs: VLC@551b670 - prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && \ + prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc - build: cd ../ && \ - ./compile.sh -a "x86" --release + build: cd ../ && ./compile.sh -a "x86" --release buildjni: no ndk: r10d @@ -608,10 +567,9 @@ builds: subdir: vlc-android gradle: VanillaARMv6fpu srclibs: VLC@23c8d86 - prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && \ + prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc - build: cd ../ && \ - ./compile.sh -a "armeabi" --release + build: cd ../ && ./compile.sh -a "armeabi" --release buildjni: no ndk: r10d @@ -621,10 +579,9 @@ builds: subdir: vlc-android gradle: VanillaARMv7 srclibs: VLC@23c8d86 - prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && \ + prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc - build: cd ../ && \ - ./compile.sh -a "armeabi-v7a" --release + build: cd ../ && ./compile.sh -a "armeabi-v7a" --release buildjni: no ndk: r10d @@ -634,10 +591,9 @@ builds: subdir: vlc-android gradle: VanillaX86 srclibs: VLC@23c8d86 - prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && \ + prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc - build: cd ../ && \ - ./compile.sh -a "x86" --release + build: cd ../ && ./compile.sh -a "x86" --release buildjni: no ndk: r10d @@ -647,10 +603,9 @@ builds: subdir: vlc-android gradle: VanillaARMv6fpu srclibs: VLC@23c8d86 - prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && \ + prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc - build: cd ../ && \ - ./compile.sh -a "armeabi" --release + build: cd ../ && ./compile.sh -a "armeabi" --release buildjni: no ndk: r10d @@ -660,10 +615,9 @@ builds: subdir: vlc-android gradle: VanillaARMv7 srclibs: VLC@23c8d86 - prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && \ + prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc - build: cd ../ && \ - ./compile.sh -a "armeabi-v7a" --release + build: cd ../ && ./compile.sh -a "armeabi-v7a" --release buildjni: no ndk: r10d @@ -673,10 +627,9 @@ builds: subdir: vlc-android gradle: VanillaX86 srclibs: VLC@23c8d86 - prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && \ + prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc - build: cd ../ && \ - ./compile.sh -a "x86" --release + build: cd ../ && ./compile.sh -a "x86" --release buildjni: no ndk: r10d @@ -686,10 +639,9 @@ builds: subdir: vlc-android gradle: VanillaARMv6fpu srclibs: VLC@7491a5f - prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && \ + prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc - build: cd ../ && \ - ./compile.sh -a "armeabi" --release + build: cd ../ && ./compile.sh -a "armeabi" --release buildjni: no ndk: r10d @@ -699,10 +651,9 @@ builds: subdir: vlc-android gradle: VanillaARMv7 srclibs: VLC@7491a5f - prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && \ + prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc - build: cd ../ && \ - ./compile.sh -a "armeabi-v7a" --release + build: cd ../ && ./compile.sh -a "armeabi-v7a" --release buildjni: no ndk: r10d @@ -712,10 +663,9 @@ builds: subdir: vlc-android gradle: VanillaX86 srclibs: VLC@7491a5f - prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && \ + prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc - build: cd ../ && \ - ./compile.sh -a "x86" --release + build: cd ../ && ./compile.sh -a "x86" --release buildjni: no ndk: r10d @@ -725,10 +675,9 @@ builds: subdir: vlc-android gradle: VanillaARMv6fpu srclibs: VLC@7491a5f - prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && \ + prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc - build: cd ../ && \ - ./compile.sh -a "armeabi" --release + build: cd ../ && ./compile.sh -a "armeabi" --release buildjni: no ndk: r10d @@ -738,10 +687,9 @@ builds: subdir: vlc-android gradle: VanillaARMv7 srclibs: VLC@7491a5f - prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && \ + prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc - build: cd ../ && \ - ./compile.sh -a "armeabi-v7a" --release + build: cd ../ && ./compile.sh -a "armeabi-v7a" --release buildjni: no ndk: r10d @@ -751,10 +699,9 @@ builds: subdir: vlc-android gradle: VanillaX86 srclibs: VLC@7491a5f - prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && \ + prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc - build: cd ../ && \ - ./compile.sh -a "x86" --release + build: cd ../ && ./compile.sh -a "x86" --release buildjni: no ndk: r10d @@ -764,10 +711,9 @@ builds: subdir: vlc-android gradle: VanillaARMv6fpu srclibs: VLC@7491a5f - prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && \ + prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc - build: cd ../ && \ - ./compile.sh -a "armeabi" --release + build: cd ../ && ./compile.sh -a "armeabi" --release buildjni: no ndk: r10d @@ -777,10 +723,9 @@ builds: subdir: vlc-android gradle: VanillaARMv7 srclibs: VLC@7491a5f - prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && \ + prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc - build: cd ../ && \ - ./compile.sh -a "armeabi-v7a" --release + build: cd ../ && ./compile.sh -a "armeabi-v7a" --release buildjni: no ndk: r10d @@ -790,10 +735,9 @@ builds: subdir: vlc-android gradle: VanillaX86 srclibs: VLC@7491a5f - prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && \ + prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc - build: cd ../ && \ - ./compile.sh -a "x86" --release + build: cd ../ && ./compile.sh -a "x86" --release buildjni: no ndk: r10d @@ -803,10 +747,9 @@ builds: subdir: vlc-android gradle: VanillaARMv6fpu srclibs: VLC@50accb8 - prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && \ + prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc - build: cd ../ && \ - ./compile.sh -a "armeabi" --release + build: cd ../ && ./compile.sh -a "armeabi" --release buildjni: no ndk: r10d @@ -816,10 +759,9 @@ builds: subdir: vlc-android gradle: VanillaARMv7 srclibs: VLC@50accb8 - prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && \ + prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc - build: cd ../ && \ - ./compile.sh -a "armeabi-v7a" --release + build: cd ../ && ./compile.sh -a "armeabi-v7a" --release buildjni: no ndk: r10d @@ -829,10 +771,9 @@ builds: subdir: vlc-android gradle: VanillaX86 srclibs: VLC@50accb8 - prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && \ + prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc - build: cd ../ && \ - ./compile.sh -a "x86" --release + build: cd ../ && ./compile.sh -a "x86" --release buildjni: no ndk: r10d @@ -842,10 +783,9 @@ builds: subdir: vlc-android gradle: VanillaARMv6fpu srclibs: VLC@d59b81a - prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && \ + prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc - build: cd ../ && \ - ./compile.sh -a "armeabi" --release + build: cd ../ && ./compile.sh -a "armeabi" --release buildjni: no ndk: r10d @@ -855,10 +795,9 @@ builds: subdir: vlc-android gradle: VanillaARMv7 srclibs: VLC@d59b81a - prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && \ + prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc - build: cd ../ && \ - ./compile.sh -a "armeabi-v7a" --release + build: cd ../ && ./compile.sh -a "armeabi-v7a" --release buildjni: no ndk: r10d @@ -868,10 +807,9 @@ builds: subdir: vlc-android gradle: VanillaX86 srclibs: VLC@d59b81a - prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && \ + prebuild: sed -i -e '/^TARGET/aexit 0' -e 's@\-d \"gradle\/wrapper\"@1@g' ../compile.sh && ln -s vlc-android/$$VLC$$ ../vlc - build: cd ../ && \ - ./compile.sh -a "x86" --release + build: cd ../ && ./compile.sh -a "x86" --release buildjni: no ndk: r10d From e0f39a7e7b6eb13a2f552a65d8229ce2a322e94e Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Wed, 23 Nov 2016 17:52:04 +0100 Subject: [PATCH 06/11] rename Build fields: version -> versionName, vercode -> versionCode Since the YAML/JSON/etc. field names are now exactly the same as the field names used in the internal dict in the Build class, this is a global rename This keeps with the standard names used in Android: https://developer.android.com/guide/topics/manifest/manifest-element.html --- fdroidserver/build.py | 44 +-- fdroidserver/checkupdates.py | 16 +- fdroidserver/common.py | 26 +- fdroidserver/dscanner.py | 4 +- fdroidserver/import.py | 14 +- fdroidserver/lint.py | 12 +- fdroidserver/metadata.py | 45 +-- fdroidserver/scanner.py | 6 +- fdroidserver/update.py | 18 +- tests/common.TestCase | 8 +- tests/metadata/dump/org.adaway.yaml | 112 ++++---- .../dump/org.smssecure.smssecure.yaml | 32 +-- tests/metadata/dump/org.videolan.vlc.yaml | 264 +++++++++--------- 13 files changed, 301 insertions(+), 300 deletions(-) diff --git a/fdroidserver/build.py b/fdroidserver/build.py index ae3b702a..e2cc6389 100644 --- a/fdroidserver/build.py +++ b/fdroidserver/build.py @@ -393,7 +393,7 @@ def build_server(app, build, vcs, build_dir, output_dir, force): cmdline += ' --force --test' if options.verbose: cmdline += ' --verbose' - cmdline += " %s:%s" % (app.id, build.vercode) + cmdline += " %s:%s" % (app.id, build.versionCode) chan.exec_command('bash --login -c "' + cmdline + '"') output = bytes() @@ -413,7 +413,7 @@ def build_server(app, build, vcs, build_dir, output_dir, force): if returncode != 0: raise BuildException( "Build.py failed on server for {0}:{1}".format( - app.id, build.version), str(output, 'utf-8')) + app.id, build.versionName), str(output, 'utf-8')) # Retrieve the built files... logging.info("Retrieving build output...") @@ -430,7 +430,7 @@ def build_server(app, build, vcs, build_dir, output_dir, force): except: raise BuildException( "Build failed for %s:%s - missing output files".format( - app.id, build.version), output) + app.id, build.versionName), output) ftp.close() finally: @@ -499,8 +499,8 @@ def get_metadata_from_apk(app, build, apkfile): if nativecode is None: raise BuildException("Native code should have been built but none was packaged") if build.novcheck: - vercode = build.vercode - version = build.version + vercode = build.versionCode + version = build.versionName if not version or not vercode: raise BuildException("Could not find version information in build in output") if not foundid: @@ -589,7 +589,7 @@ def build_local(app, build, vcs, build_dir, output_dir, srclib_dir, extlib_dir, if p is not None and p.returncode != 0: raise BuildException("Error cleaning %s:%s" % - (app.id, build.version), p.output) + (app.id, build.versionName), p.output) for root, dirs, files in os.walk(build_dir): @@ -658,7 +658,7 @@ def build_local(app, build, vcs, build_dir, output_dir, srclib_dir, extlib_dir, if p.returncode != 0: raise BuildException("Error running build command for %s:%s" % - (app.id, build.version), p.output) + (app.id, build.versionName), p.output) # Build native stuff if required... if build.buildjni and build.buildjni != ['no']: @@ -686,7 +686,7 @@ def build_local(app, build, vcs, build_dir, output_dir, srclib_dir, extlib_dir, del manifest_text p = FDroidPopen(cmd, cwd=os.path.join(root_dir, d)) if p.returncode != 0: - raise BuildException("NDK build failed for %s:%s" % (app.id, build.version), p.output) + raise BuildException("NDK build failed for %s:%s" % (app.id, build.versionName), p.output) p = None # Build the release... @@ -800,8 +800,8 @@ def build_local(app, build, vcs, build_dir, output_dir, srclib_dir, extlib_dir, bindir = os.path.join(root_dir, 'bin') if p is not None and p.returncode != 0: - raise BuildException("Build failed for %s:%s" % (app.id, build.version), p.output) - logging.info("Successfully built version " + build.version + ' of ' + app.id) + raise BuildException("Build failed for %s:%s" % (app.id, build.versionName), p.output) + logging.info("Successfully built version " + build.versionName + ' of ' + app.id) omethod = build.output_method() if omethod == 'maven': @@ -877,15 +877,15 @@ def build_local(app, build, vcs, build_dir, output_dir, srclib_dir, extlib_dir, if common.get_file_extension(src) == 'apk': vercode, version = get_metadata_from_apk(app, build, src) - if (version != build.version or vercode != build.vercode): + if (version != build.versionName or vercode != build.versionCode): raise BuildException(("Unexpected version/version code in output;" " APK: '%s' / '%s', " " Expected: '%s' / '%s'") - % (version, str(vercode), build.version, - str(build.vercode))) + % (version, str(vercode), build.versionName, + str(build.versionCode))) else: - vercode = build.vercode - version = build.version + vercode = build.versionCode + version = build.versionName # Add information for 'fdroid verify' to be able to reproduce the build # environment. @@ -948,7 +948,7 @@ def trybuild(app, build, build_dir, output_dir, also_check_dir, srclib_dir, extl return False logging.info("Building version %s (%s) of %s" % ( - build.version, build.vercode, app.id)) + build.versionName, build.versionCode, app.id)) if server: # When using server mode, still keep a local cache of the repo, by @@ -1159,7 +1159,7 @@ def main(): vcs, build_dir = common.setup_vcs(app) first = False - logging.debug("Checking " + build.version) + logging.debug("Checking " + build.versionName) if trybuild(app, build, build_dir, output_dir, also_check_dir, srclib_dir, extlib_dir, tmp_dir, repo_dir, vcs, options.test, @@ -1173,10 +1173,10 @@ def main(): # alongside our built one in the 'unsigend' # directory. url = app.Binaries - url = url.replace('%v', build.version) - url = url.replace('%c', str(build.vercode)) + url = url.replace('%v', build.versionName) + url = url.replace('%c', str(build.versionCode)) logging.info("...retrieving " + url) - of = "{0}_{1}.apk.binary".format(app.id, build.vercode) + of = "{0}_{1}.apk.binary".format(app.id, build.versionCode) of = os.path.join(output_dir, of) net.download_file(url, local_filename=of) @@ -1194,7 +1194,7 @@ def main(): with open(os.path.join(log_dir, appid + '.log'), 'a+') as f: f.write('\n\n============================================================\n') f.write('versionCode: %s\nversionName: %s\ncommit: %s\n' % - (build.vercode, build.version, build.commit)) + (build.versionCode, build.versionName, build.commit)) f.write('Build completed at ' + time.strftime("%Y-%m-%d %H:%M:%SZ", time.gmtime()) + '\n') f.write('\n' + tools_version_log + '\n') @@ -1215,7 +1215,7 @@ def main(): if options.wiki and wikilog: try: # Write a page with the last build log for this version code - lastbuildpage = appid + '/lastbuild_' + build.vercode + lastbuildpage = appid + '/lastbuild_' + build.versionCode newpage = site.Pages[lastbuildpage] with open(os.path.join('tmp', 'fdroidserverid')) as fp: fdroidserverid = fp.read().rstrip() diff --git a/fdroidserver/checkupdates.py b/fdroidserver/checkupdates.py index 7f5314b8..91e5ecbe 100644 --- a/fdroidserver/checkupdates.py +++ b/fdroidserver/checkupdates.py @@ -462,22 +462,22 @@ def checkupdates_app(app, first=True): gotcur = False latest = None for build in app.builds: - if int(build.vercode) >= int(app.CurrentVersionCode): + if int(build.versionCode) >= int(app.CurrentVersionCode): gotcur = True - if not latest or int(build.vercode) > int(latest.vercode): + if not latest or int(build.versionCode) > int(latest.versionCode): latest = build - if int(latest.vercode) > int(app.CurrentVersionCode): + if int(latest.versionCode) > int(app.CurrentVersionCode): logging.info("Refusing to auto update, since the latest build is newer") if not gotcur: newbuild = copy.deepcopy(latest) newbuild.disable = False - newbuild.vercode = app.CurrentVersionCode - newbuild.version = app.CurrentVersion + suffix - logging.info("...auto-generating build for " + newbuild.version) - commit = pattern.replace('%v', newbuild.version) - commit = commit.replace('%c', newbuild.vercode) + newbuild.versionCode = app.CurrentVersionCode + newbuild.versionName = app.CurrentVersion + suffix + logging.info("...auto-generating build for " + newbuild.versionName) + commit = pattern.replace('%v', newbuild.versionName) + commit = commit.replace('%c', newbuild.versionCode) newbuild.commit = commit app.builds.append(newbuild) name = common.getappname(app) diff --git a/fdroidserver/common.py b/fdroidserver/common.py index dd11a57a..5e0419b0 100644 --- a/fdroidserver/common.py +++ b/fdroidserver/common.py @@ -443,10 +443,10 @@ def read_app_args(args, allapps, allow_vercodes=False): vc = vercodes[appid] if not vc: continue - app.builds = [b for b in app.builds if b.vercode in vc] + app.builds = [b for b in app.builds if b.versionCode in vc] if len(app.builds) != len(vercodes[appid]): error = True - allvcs = [b.vercode for b in app.builds] + allvcs = [b.versionCode for b in app.builds] for v in vercodes[appid]: if v not in allvcs: logging.critical("No such vercode %s for app %s" % (v, appid)) @@ -497,13 +497,13 @@ def publishednameinfo(filename): def get_release_filename(app, build): if build.output: - return "%s_%s.%s" % (app.id, build.vercode, get_file_extension(build.output)) + return "%s_%s.%s" % (app.id, build.versionCode, get_file_extension(build.output)) else: - return "%s_%s.apk" % (app.id, build.vercode) + return "%s_%s.apk" % (app.id, build.versionCode) def getsrcname(app, build): - return "%s_%s_src.tar.gz" % (app.id, build.vercode) + return "%s_%s_src.tar.gz" % (app.id, build.versionCode) def getappname(app): @@ -1384,7 +1384,7 @@ def prepare_source(vcs, app, build, build_dir, srclib_dir, extlib_dir, onserver= p = FDroidPopen(['bash', '-x', '-c', cmd], cwd=root_dir) if p.returncode != 0: raise BuildException("Error running init command for %s:%s" % - (app.id, build.version), p.output) + (app.id, build.versionName), p.output) # Apply patches if any if build.patch: @@ -1475,11 +1475,11 @@ def prepare_source(vcs, app, build, build_dir, srclib_dir, extlib_dir, onserver= continue if has_extension(path, 'xml'): regsub_file(r'android:versionName="[^"]*"', - r'android:versionName="%s"' % build.version, + r'android:versionName="%s"' % build.versionName, path) elif has_extension(path, 'gradle'): regsub_file(r"""(\s*)versionName[\s'"=]+.*""", - r"""\1versionName '%s'""" % build.version, + r"""\1versionName '%s'""" % build.versionName, path) if build.forcevercode: @@ -1489,11 +1489,11 @@ def prepare_source(vcs, app, build, build_dir, srclib_dir, extlib_dir, onserver= continue if has_extension(path, 'xml'): regsub_file(r'android:versionCode="[^"]*"', - r'android:versionCode="%s"' % build.vercode, + r'android:versionCode="%s"' % build.versionCode, path) elif has_extension(path, 'gradle'): regsub_file(r'versionCode[ =]+[0-9]+', - r'versionCode %s' % build.vercode, + r'versionCode %s' % build.versionCode, path) # Delete unwanted files @@ -1541,7 +1541,7 @@ def prepare_source(vcs, app, build, build_dir, srclib_dir, extlib_dir, onserver= p = FDroidPopen(['bash', '-x', '-c', cmd], cwd=root_dir) if p.returncode != 0: raise BuildException("Error running prebuild command for %s:%s" % - (app.id, build.version), p.output) + (app.id, build.versionName), p.output) # Generate (or update) the ant build file, build.xml... if build.build_method() == 'ant' and build.androidupdate != ['no']: @@ -1918,8 +1918,8 @@ def replace_config_vars(cmd, build): cmd = cmd.replace('$$QT$$', config['qt_sdk_path'] or '') if build is not None: cmd = cmd.replace('$$COMMIT$$', build.commit) - cmd = cmd.replace('$$VERSION$$', build.version) - cmd = cmd.replace('$$VERCODE$$', build.vercode) + cmd = cmd.replace('$$VERSION$$', build.versionName) + cmd = cmd.replace('$$VERCODE$$', build.versionCode) return cmd diff --git a/fdroidserver/dscanner.py b/fdroidserver/dscanner.py index 84915b9a..8e224bdb 100644 --- a/fdroidserver/dscanner.py +++ b/fdroidserver/dscanner.py @@ -457,7 +457,7 @@ def main(): for build in reversed(app.builds): if build.disable: continue - if options.latest or vercode == 0 or build.vercode == vercode: + if options.latest or vercode == 0 or build.versionCode == vercode: app.builds = [build] break continue @@ -467,7 +467,7 @@ def main(): for build in app.builds: apks = [] for f in os.listdir(options.repo_path): - n = "%v_%v.apk".format(app_id, build.vercode) + n = "%v_%v.apk".format(app_id, build.versionCode) if f == n: apks.append(f) for apk in sorted(apks): diff --git a/fdroidserver/import.py b/fdroidserver/import.py index 5ba4323c..8090abb7 100644 --- a/fdroidserver/import.py +++ b/fdroidserver/import.py @@ -230,13 +230,13 @@ def main(): paths = common.manifest_paths(root_dir, []) if paths: - version, vercode, package = common.parse_androidmanifests(paths, app) + versionName, versionCode, package = common.parse_androidmanifests(paths, app) if not package: logging.error("Couldn't find package ID") sys.exit(1) - if not version: + if not versionName: logging.warn("Couldn't find latest version name") - if not vercode: + if not versionCode: logging.warn("Couldn't find latest version code") else: spec = os.path.join(root_dir, 'buildozer.spec') @@ -246,8 +246,8 @@ def main(): bconfig = ConfigParser(defaults, allow_no_value=True) bconfig.read(spec) package = bconfig.get('app', 'package.domain') + '.' + bconfig.get('app', 'package.name') - version = bconfig.get('app', 'version') - vercode = None + versionName = bconfig.get('app', 'version') + versionCode = None else: logging.error("No android or kivy project could be found. Specify --subdir?") sys.exit(1) @@ -258,8 +258,8 @@ def main(): sys.exit(1) # Create a build line... - build.version = version or '?' - build.vercode = vercode or '?' + build.versionName = versionName or '?' + build.versionCode = versionCode or '?' if options.subdir: build.subdir = options.subdir if os.path.exists(os.path.join(root_dir, 'jni')): diff --git a/fdroidserver/lint.py b/fdroidserver/lint.py index f70097c4..b9c0eaf8 100644 --- a/fdroidserver/lint.py +++ b/fdroidserver/lint.py @@ -139,10 +139,10 @@ def get_lastbuild(builds): lastbuild = None for build in builds: if not build.disable: - vercode = int(build.vercode) + vercode = int(build.versionCode) if lowest_vercode == -1 or vercode < lowest_vercode: lowest_vercode = vercode - if not lastbuild or int(build.vercode) > int(lastbuild.vercode): + if not lastbuild or int(build.versionCode) > int(lastbuild.versionCode): lastbuild = build return lastbuild @@ -153,7 +153,7 @@ def check_ucm_tags(app): and lastbuild.commit and app.UpdateCheckMode == 'RepoManifest' and not lastbuild.commit.startswith('unknown') - and lastbuild.vercode == app.CurrentVersionCode + and lastbuild.versionCode == app.CurrentVersionCode and not lastbuild.forcevercode and any(s in lastbuild.commit for s in '.,_-/')): yield "Last used commit '%s' looks like a tag, but Update Check Mode is '%s'" % ( @@ -307,7 +307,7 @@ def check_builds(app): continue for s in ['master', 'origin', 'HEAD', 'default', 'trunk']: if build.commit and build.commit.startswith(s): - yield "Branch '%s' used as commit in build '%s'" % (s, build.version) + yield "Branch '%s' used as commit in build '%s'" % (s, build.versionName) for srclib in build.srclibs: ref = srclib.split('@')[1].split('/')[0] if ref.startswith(s): @@ -330,7 +330,7 @@ def check_files_dir(app): for build in app.builds: for fname in build.patch: if fname not in files: - yield "Unknown file %s in build '%s'" % (fname, build.version) + yield "Unknown file %s in build '%s'" % (fname, build.versionName) else: used.add(fname) @@ -355,7 +355,7 @@ def check_extlib_dir(apps): for build in app.builds: for path in build.extlibs: if path not in files: - yield "%s: Unknown extlib %s in build '%s'" % (app.id, path, build.version) + yield "%s: Unknown extlib %s in build '%s'" % (app.id, path, build.versionName) else: used.add(path) diff --git a/fdroidserver/metadata.py b/fdroidserver/metadata.py index 6d9d9e0e..0d446f54 100644 --- a/fdroidserver/metadata.py +++ b/fdroidserver/metadata.py @@ -238,7 +238,7 @@ build_flags_order = [ ] -build_flags = set(build_flags_order + ['version', 'vercode']) +build_flags = set(build_flags_order + ['versionName', 'versionCode']) class Build(dict): @@ -801,7 +801,7 @@ def get_default_app_info(metadatapath=None): def sorted_builds(builds): - return sorted(builds, key=lambda build: int(build.vercode)) + return sorted(builds, key=lambda build: int(build.versionCode)) esc_newlines = re.compile(r'\\( |\n)') @@ -978,9 +978,9 @@ def parse_txt_metadata(mf, app): if len(parts) < 3: warn_or_exception("Invalid build format: " + v + " in " + mf.name) build = Build() - build.version = parts[0] - build.vercode = parts[1] - check_versionCode(build.vercode) + build.versionName = parts[0] + build.versionCode = parts[1] + check_versionCode(build.versionCode) if parts[2].startswith('!'): # For backwards compatibility, handle old-style disabling, @@ -1038,10 +1038,10 @@ def parse_txt_metadata(mf, app): else: if not build.commit and not build.disable: warn_or_exception("No commit specified for {0} in {1}" - .format(build.version, linedesc)) + .format(build.versionName, linedesc)) app.builds.append(build) - add_comments('build:' + build.vercode) + add_comments('build:' + build.versionCode) mode = 0 if mode == 0: @@ -1086,21 +1086,22 @@ def parse_txt_metadata(mf, app): else: build = parse_buildline([v]) app.builds.append(build) - add_comments('build:' + app.builds[-1].vercode) + add_comments('build:' + app.builds[-1].versionCode) elif ftype == TYPE_BUILD_V2: vv = v.split(',') if len(vv) != 2: warn_or_exception('Build should have comma-separated', - 'version and vercode,', + 'versionName and versionCode,', 'not "{0}", in {1}'.format(v, linedesc)) build = Build() - build.version = vv[0] - build.vercode = vv[1] - check_versionCode(build.vercode) - if build.vercode in vc_seen: - warn_or_exception('Duplicate build recipe found for vercode %s in %s' - % (build.vercode, linedesc)) - vc_seen.add(build.vercode) + build.versionName = vv[0] + build.versionCode = vv[1] + check_versionCode(build.versionCode) + + if build.versionCode in vc_seen: + warn_or_exception('Duplicate build recipe found for versionCode %s in %s' + % (build.versionCode, linedesc)) + vc_seen.add(build.versionCode) del buildlines[:] mode = 3 elif ftype == TYPE_OBSOLETE: @@ -1121,7 +1122,7 @@ def parse_txt_metadata(mf, app): buildlines.append(line) build = parse_buildline(buildlines) app.builds.append(build) - add_comments('build:' + app.builds[-1].vercode) + add_comments('build:' + app.builds[-1].versionCode) mode = 0 add_comments(None) @@ -1209,10 +1210,10 @@ def write_plaintext_metadata(mf, app, w_comment, w_field, w_build): for build in app.builds: - if build.version == "Ignore": + if build.versionName == "Ignore": continue - w_comments('build:%s' % build.vercode) + w_comments('build:%s' % build.versionCode) w_build(build) mf.write('\n') @@ -1254,7 +1255,7 @@ def write_txt(mf, app): mf.write("%s:%s\n" % (f, v)) def w_build(build): - mf.write("Build:%s,%s\n" % (build.version, build.vercode)) + mf.write("Build:%s,%s\n" % (build.versionName, build.versionCode)) for f in build_flags_order: v = build.get(f) @@ -1337,8 +1338,8 @@ def write_yaml(mf, app): mf.write("builds:\n") first_build = False - w_field('versionName', build.version, ' - ', TYPE_STRING) - w_field('versionCode', build.vercode, ' ', TYPE_STRING) + w_field('versionName', build.versionName, ' - ', TYPE_STRING) + w_field('versionCode', build.versionCode, ' ', TYPE_STRING) for f in build_flags_order: v = build.get(f) if not v: diff --git a/fdroidserver/scanner.py b/fdroidserver/scanner.py index af7fee06..8e031fcb 100644 --- a/fdroidserver/scanner.py +++ b/fdroidserver/scanner.py @@ -296,9 +296,9 @@ def main(): if build.disable: logging.info("...skipping version %s - %s" % ( - build.version, build.get('disable', build.commit[1:]))) + build.versionName, build.get('disable', build.commit[1:]))) else: - logging.info("...scanning version " + build.version) + logging.info("...scanning version " + build.versionName) # Prepare the source code... root_dir, _ = common.prepare_source(vcs, app, build, @@ -309,7 +309,7 @@ def main(): count = scan_source(build_dir, root_dir, build) if count > 0: logging.warn('Scanner found %d problems in %s (%s)' % ( - count, appid, build.vercode)) + count, appid, build.versionCode)) probcount += count except BuildException as be: diff --git a/fdroidserver/update.py b/fdroidserver/update.py index 98396d27..ea536152 100644 --- a/fdroidserver/update.py +++ b/fdroidserver/update.py @@ -156,24 +156,24 @@ def update_wiki(apps, sortedids, apks): # Include ones we can't build, as a special case... for build in app.builds: if build.disable: - if build.vercode == app.CurrentVersionCode: + if build.versionCode == app.CurrentVersionCode: cantupdate = True # TODO: Nasty: vercode is a string in the build, and an int elsewhere - apklist.append({'versioncode': int(build.vercode), - 'version': build.version, + apklist.append({'versioncode': int(build.versionCode), + 'version': build.versionName, 'buildproblem': "The build for this version was manually disabled. Reason: {0}".format(build.disable), }) else: builtit = False for apk in apklist: - if apk['versioncode'] == int(build.vercode): + if apk['versioncode'] == int(build.versionCode): builtit = True break if not builtit: buildfails = True - apklist.append({'versioncode': int(build.vercode), - 'version': build.version, - 'buildproblem': "The build for this version appears to have failed. Check the [[{0}/lastbuild_{1}|build log]].".format(appid, build.vercode), + apklist.append({'versioncode': int(build.versionCode), + 'version': build.versionName, + 'buildproblem': "The build for this version appears to have failed. Check the [[{0}/lastbuild_{1}|build log]].".format(appid, build.versionCode), }) if app.CurrentVersionCode == '0': cantupdate = True @@ -305,10 +305,10 @@ def delete_disabled_builds(apps, apkcache, repodirs): for build in app['builds']: if not build.disable: continue - apkfilename = appid + '_' + str(build.vercode) + '.apk' + apkfilename = appid + '_' + str(build.versionCode) + '.apk' iconfilename = "%s.%s.png" % ( appid, - build.vercode) + build.versionCode) for repodir in repodirs: files = [ os.path.join(repodir, apkfilename), diff --git a/tests/common.TestCase b/tests/common.TestCase index c95ec9de..9e00904f 100755 --- a/tests/common.TestCase +++ b/tests/common.TestCase @@ -124,8 +124,8 @@ class CommonTest(unittest.TestCase): build.forcevercode = True build.gradle = ['yes'] build.target = 'android-' + str(testint) - build.version = teststr - build.vercode = testint + build.versionName = teststr + build.versionCode = testint class FakeVcs(): # no need to change to the correct commit here @@ -145,8 +145,8 @@ class CommonTest(unittest.TestCase): with open(os.path.join(testdir, 'AndroidManifest.xml')) as f: filedata = f.read() self.assertIsNone(re.search('android:debuggable', filedata)) - self.assertIsNotNone(re.search('android:versionName="%s"' % build.version, filedata)) - self.assertIsNotNone(re.search('android:versionCode="%s"' % build.vercode, filedata)) + self.assertIsNotNone(re.search('android:versionName="%s"' % build.versionName, filedata)) + self.assertIsNotNone(re.search('android:versionCode="%s"' % build.versionCode, filedata)) def test_fdroid_popen_stderr_redirect(self): commands = ['sh', '-c', 'echo stdout message && echo stderr message 1>&2'] diff --git a/tests/metadata/dump/org.adaway.yaml b/tests/metadata/dump/org.adaway.yaml index e3b87a96..c028e297 100644 --- a/tests/metadata/dump/org.adaway.yaml +++ b/tests/metadata/dump/org.adaway.yaml @@ -87,8 +87,8 @@ builds: subdir: org_adaway/ submodules: false target: null - vercode: '13' - version: '1.12' + versionCode: '13' + versionName: '1.12' - androidupdate: [] antcommands: [] build: '' @@ -119,8 +119,8 @@ builds: subdir: org_adaway/ submodules: false target: null - vercode: '16' - version: '1.15' + versionCode: '16' + versionName: '1.15' - androidupdate: [] antcommands: [] build: '' @@ -151,8 +151,8 @@ builds: subdir: org_adaway/ submodules: false target: null - vercode: '19' - version: '1.18' + versionCode: '19' + versionName: '1.18' - androidupdate: [] antcommands: [] build: '' @@ -183,8 +183,8 @@ builds: subdir: org_adaway/ submodules: false target: null - vercode: '20' - version: '1.19' + versionCode: '20' + versionName: '1.19' - androidupdate: [] antcommands: [] build: '' @@ -215,8 +215,8 @@ builds: subdir: org_adaway/ submodules: false target: null - vercode: '21' - version: '1.20' + versionCode: '21' + versionName: '1.20' - androidupdate: [] antcommands: [] build: '' @@ -247,8 +247,8 @@ builds: subdir: org_adaway/ submodules: false target: null - vercode: '22' - version: '1.21' + versionCode: '22' + versionName: '1.21' - androidupdate: [] antcommands: [] build: '' @@ -278,8 +278,8 @@ builds: subdir: null submodules: false target: null - vercode: '24' - version: '1.23' + versionCode: '24' + versionName: '1.23' - androidupdate: [] antcommands: [] build: '' @@ -309,8 +309,8 @@ builds: subdir: org_adaway/ submodules: false target: null - vercode: '25' - version: '1.24' + versionCode: '25' + versionName: '1.24' - androidupdate: [] antcommands: [] build: '' @@ -340,8 +340,8 @@ builds: subdir: org_adaway/ submodules: false target: null - vercode: '26' - version: '1.25' + versionCode: '26' + versionName: '1.25' - androidupdate: [] antcommands: [] build: '' @@ -371,8 +371,8 @@ builds: subdir: org_adaway/ submodules: false target: null - vercode: '27' - version: '1.26' + versionCode: '27' + versionName: '1.26' - androidupdate: [] antcommands: [] build: '' @@ -402,8 +402,8 @@ builds: subdir: org_adaway/ submodules: false target: null - vercode: '28' - version: '1.27' + versionCode: '28' + versionName: '1.27' - androidupdate: [] antcommands: [] build: '' @@ -433,8 +433,8 @@ builds: subdir: org_adaway/ submodules: false target: null - vercode: '30' - version: '1.29' + versionCode: '30' + versionName: '1.29' - androidupdate: [] antcommands: [] build: '' @@ -465,8 +465,8 @@ builds: subdir: org_adaway/ submodules: false target: null - vercode: '33' - version: '1.32' + versionCode: '33' + versionName: '1.32' - androidupdate: [] antcommands: [] build: '' @@ -496,8 +496,8 @@ builds: subdir: org_adaway/ submodules: false target: null - vercode: '34' - version: '1.33' + versionCode: '34' + versionName: '1.33' - androidupdate: [] antcommands: [] build: '' @@ -528,8 +528,8 @@ builds: subdir: org_adaway/ submodules: false target: null - vercode: '35' - version: '1.34' + versionCode: '35' + versionName: '1.34' - androidupdate: [] antcommands: [] build: '' @@ -560,8 +560,8 @@ builds: subdir: org_adaway/ submodules: false target: null - vercode: '36' - version: '1.35' + versionCode: '36' + versionName: '1.35' - androidupdate: [] antcommands: [] build: '' @@ -592,8 +592,8 @@ builds: subdir: org_adaway/ submodules: false target: null - vercode: '37' - version: '1.36' + versionCode: '37' + versionName: '1.36' - androidupdate: [] antcommands: [] build: '' @@ -624,8 +624,8 @@ builds: subdir: org_adaway/ submodules: false target: null - vercode: '38' - version: '1.37' + versionCode: '38' + versionName: '1.37' - androidupdate: - . - android-libs/Donations @@ -667,8 +667,8 @@ builds: subdir: AdAway submodules: false target: null - vercode: '40' - version: '2.1' + versionCode: '40' + versionName: '2.1' - androidupdate: - . - android-libs/Donations @@ -710,8 +710,8 @@ builds: subdir: AdAway submodules: false target: null - vercode: '42' - version: '2.3' + versionCode: '42' + versionName: '2.3' - androidupdate: [] antcommands: [] build: '' @@ -742,8 +742,8 @@ builds: subdir: AdAway submodules: false target: null - vercode: '45' - version: '2.6' + versionCode: '45' + versionName: '2.6' - androidupdate: [] antcommands: [] build: '' @@ -774,8 +774,8 @@ builds: subdir: AdAway submodules: false target: null - vercode: '46' - version: '2.7' + versionCode: '46' + versionName: '2.7' - androidupdate: [] antcommands: [] build: '' @@ -806,8 +806,8 @@ builds: subdir: AdAway submodules: false target: null - vercode: '47' - version: '2.8' + versionCode: '47' + versionName: '2.8' - androidupdate: [] antcommands: [] build: '' @@ -838,8 +838,8 @@ builds: subdir: AdAway submodules: false target: null - vercode: '48' - version: 2.8.1 + versionCode: '48' + versionName: 2.8.1 - androidupdate: [] antcommands: [] build: '' @@ -870,8 +870,8 @@ builds: subdir: AdAway submodules: false target: null - vercode: '49' - version: '2.9' + versionCode: '49' + versionName: '2.9' - androidupdate: [] antcommands: [] build: '' @@ -902,8 +902,8 @@ builds: subdir: AdAway submodules: false target: null - vercode: '50' - version: 2.9.1 + versionCode: '50' + versionName: 2.9.1 - androidupdate: [] antcommands: [] build: '' @@ -934,8 +934,8 @@ builds: subdir: AdAway submodules: false target: null - vercode: '51' - version: 2.9.2 + versionCode: '51' + versionName: 2.9.2 - androidupdate: [] antcommands: [] build: '' @@ -966,8 +966,8 @@ builds: subdir: AdAway submodules: false target: null - vercode: '52' - version: '3.0' + versionCode: '52' + versionName: '3.0' comments: build:40: - '#RootCommands srclib needs changing on fdroidserver' diff --git a/tests/metadata/dump/org.smssecure.smssecure.yaml b/tests/metadata/dump/org.smssecure.smssecure.yaml index 5d26d0eb..b8b4e692 100644 --- a/tests/metadata/dump/org.smssecure.smssecure.yaml +++ b/tests/metadata/dump/org.smssecure.smssecure.yaml @@ -96,8 +96,8 @@ builds: subdir: null submodules: false target: null - vercode: '5' - version: 0.3.3 + versionCode: '5' + versionName: 0.3.3 - androidupdate: [] antcommands: [] build: '' @@ -131,8 +131,8 @@ builds: subdir: null submodules: true target: null - vercode: '6' - version: 0.3.3 + versionCode: '6' + versionName: 0.3.3 - androidupdate: [] antcommands: [] build: '' @@ -165,8 +165,8 @@ builds: subdir: null submodules: true target: null - vercode: '9' - version: 0.4.2 + versionCode: '9' + versionName: 0.4.2 - androidupdate: [] antcommands: [] build: '' @@ -199,8 +199,8 @@ builds: subdir: null submodules: true target: null - vercode: '11' - version: 0.5.1 + versionCode: '11' + versionName: 0.5.1 - androidupdate: [] antcommands: [] build: '' @@ -232,8 +232,8 @@ builds: subdir: null submodules: true target: null - vercode: '12' - version: 0.5.2 + versionCode: '12' + versionName: 0.5.2 - androidupdate: [] antcommands: [] build: '' @@ -265,8 +265,8 @@ builds: subdir: null submodules: true target: null - vercode: '100' - version: 0.5.3 + versionCode: '100' + versionName: 0.5.3 - androidupdate: [] antcommands: [] build: '' @@ -298,8 +298,8 @@ builds: subdir: null submodules: true target: null - vercode: '101' - version: 0.5.4 + versionCode: '101' + versionName: 0.5.4 - androidupdate: [] antcommands: [] build: '' @@ -331,8 +331,8 @@ builds: subdir: null submodules: true target: null - vercode: '102' - version: 0.6.0 + versionCode: '102' + versionName: 0.6.0 comments: {} id: org.smssecure.smssecure lastupdated: null diff --git a/tests/metadata/dump/org.videolan.vlc.yaml b/tests/metadata/dump/org.videolan.vlc.yaml index cf7cc6f0..801b56f7 100644 --- a/tests/metadata/dump/org.videolan.vlc.yaml +++ b/tests/metadata/dump/org.videolan.vlc.yaml @@ -89,8 +89,8 @@ builds: subdir: vlc-android submodules: false target: null - vercode: 110 - version: 0.0.11-ARMv7 + versionCode: 110 + versionName: 0.0.11-ARMv7 - androidupdate: - . - ../java-libs/SlidingMenu @@ -123,8 +123,8 @@ builds: subdir: vlc-android submodules: false target: null - vercode: 111 - version: 0.0.11-ARM + versionCode: 111 + versionName: 0.0.11-ARM - androidupdate: - . - ../java-libs/SlidingMenu @@ -157,8 +157,8 @@ builds: subdir: vlc-android submodules: false target: null - vercode: 112 - version: 0.0.11-x86 + versionCode: 112 + versionName: 0.0.11-x86 - androidupdate: - . - ../java-libs/SlidingMenu @@ -191,8 +191,8 @@ builds: subdir: vlc-android submodules: false target: null - vercode: 113 - version: 0.0.11-mips + versionCode: 113 + versionName: 0.0.11-mips - androidupdate: [] antcommands: [] build: cd ../ && ANDROID_ABI=mips ./compile.sh release @@ -224,8 +224,8 @@ builds: subdir: vlc-android submodules: false target: null - vercode: 1301 - version: 0.1.3-MIPS + versionCode: 1301 + versionName: 0.1.3-MIPS - androidupdate: [] antcommands: [] build: cd ../ && ANDROID_ABI=x86 ./compile.sh release @@ -257,8 +257,8 @@ builds: subdir: vlc-android submodules: false target: null - vercode: 1302 - version: 0.1.3-x86 + versionCode: 1302 + versionName: 0.1.3-x86 - androidupdate: [] antcommands: [] build: cd ../ && ANDROID_ABI=armeabi ./compile.sh release @@ -290,8 +290,8 @@ builds: subdir: vlc-android submodules: false target: null - vercode: 1303 - version: 0.1.3-ARM + versionCode: 1303 + versionName: 0.1.3-ARM - androidupdate: [] antcommands: [] build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release @@ -323,8 +323,8 @@ builds: subdir: vlc-android submodules: false target: null - vercode: 1304 - version: 0.1.3-ARMv7 + versionCode: 1304 + versionName: 0.1.3-ARMv7 - androidupdate: [] antcommands: [] build: cd ../ && ANDROID_ABI=x86 ./compile.sh release @@ -355,8 +355,8 @@ builds: subdir: vlc-android submodules: false target: null - vercode: 9002 - version: 0.9.0 + versionCode: 9002 + versionName: 0.9.0 - androidupdate: [] antcommands: [] build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release @@ -387,8 +387,8 @@ builds: subdir: vlc-android submodules: false target: null - vercode: 9004 - version: 0.9.0 + versionCode: 9004 + versionName: 0.9.0 - androidupdate: [] antcommands: [] build: cd ../ && ANDROID_ABI=x86 ./compile.sh release @@ -419,8 +419,8 @@ builds: subdir: vlc-android submodules: false target: null - vercode: 9102 - version: 0.9.1 + versionCode: 9102 + versionName: 0.9.1 - androidupdate: [] antcommands: [] build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release @@ -451,8 +451,8 @@ builds: subdir: vlc-android submodules: false target: null - vercode: 9104 - version: 0.9.1 + versionCode: 9104 + versionName: 0.9.1 - androidupdate: [] antcommands: [] build: cd ../ && ANDROID_ABI=x86 ./compile.sh release @@ -483,8 +483,8 @@ builds: subdir: vlc-android submodules: false target: null - vercode: 9502 - version: 0.9.5 + versionCode: 9502 + versionName: 0.9.5 - androidupdate: [] antcommands: [] build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release @@ -515,8 +515,8 @@ builds: subdir: vlc-android submodules: false target: null - vercode: 9504 - version: 0.9.5 + versionCode: 9504 + versionName: 0.9.5 - androidupdate: [] antcommands: [] build: cd ../ && ANDROID_ABI=x86 ./compile.sh release @@ -547,8 +547,8 @@ builds: subdir: vlc-android submodules: false target: null - vercode: 9602 - version: 0.9.6 + versionCode: 9602 + versionName: 0.9.6 - androidupdate: [] antcommands: [] build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release @@ -579,8 +579,8 @@ builds: subdir: vlc-android submodules: false target: null - vercode: 9604 - version: 0.9.6 + versionCode: 9604 + versionName: 0.9.6 - androidupdate: [] antcommands: [] build: cd ../ && ANDROID_ABI=x86 ./compile.sh release @@ -611,8 +611,8 @@ builds: subdir: vlc-android submodules: false target: null - vercode: 9702 - version: 0.9.7 + versionCode: 9702 + versionName: 0.9.7 - androidupdate: [] antcommands: [] build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release @@ -643,8 +643,8 @@ builds: subdir: vlc-android submodules: false target: null - vercode: 9704 - version: 0.9.7 + versionCode: 9704 + versionName: 0.9.7 - androidupdate: [] antcommands: [] build: cd ../ && ANDROID_ABI=mips ./compile.sh release @@ -675,8 +675,8 @@ builds: subdir: vlc-android submodules: false target: null - vercode: 9711 - version: 0.9.7.1 + versionCode: 9711 + versionName: 0.9.7.1 - androidupdate: [] antcommands: [] build: cd ../ && ANDROID_ABI=x86 ./compile.sh release @@ -707,8 +707,8 @@ builds: subdir: vlc-android submodules: false target: null - vercode: 9712 - version: 0.9.7.1 + versionCode: 9712 + versionName: 0.9.7.1 - androidupdate: [] antcommands: [] build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release @@ -739,8 +739,8 @@ builds: subdir: vlc-android submodules: false target: null - vercode: 9714 - version: 0.9.7.1 + versionCode: 9714 + versionName: 0.9.7.1 - androidupdate: [] antcommands: [] build: cd ../ && ANDROID_ABI=x86 ./compile.sh release @@ -771,8 +771,8 @@ builds: subdir: vlc-android submodules: false target: null - vercode: 9802 - version: 0.9.8 + versionCode: 9802 + versionName: 0.9.8 - androidupdate: [] antcommands: [] build: cd ../ && ANDROID_ABI=armeabi ./compile.sh release @@ -803,8 +803,8 @@ builds: subdir: vlc-android submodules: false target: null - vercode: 9803 - version: 0.9.8 + versionCode: 9803 + versionName: 0.9.8 - androidupdate: [] antcommands: [] build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release @@ -835,8 +835,8 @@ builds: subdir: vlc-android submodules: false target: null - vercode: 9804 - version: 0.9.8 + versionCode: 9804 + versionName: 0.9.8 - androidupdate: [] antcommands: [] build: cd ../ && ANDROID_ABI=x86 ./compile.sh release @@ -867,8 +867,8 @@ builds: subdir: vlc-android submodules: false target: null - vercode: 9902 - version: 0.9.9 + versionCode: 9902 + versionName: 0.9.9 - androidupdate: [] antcommands: [] build: cd ../ && ANDROID_ABI=armeabi ./compile.sh release @@ -899,8 +899,8 @@ builds: subdir: vlc-android submodules: false target: null - vercode: 9903 - version: 0.9.9 + versionCode: 9903 + versionName: 0.9.9 - androidupdate: [] antcommands: [] build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release @@ -931,8 +931,8 @@ builds: subdir: vlc-android submodules: false target: null - vercode: 9904 - version: 0.9.9 + versionCode: 9904 + versionName: 0.9.9 - androidupdate: [] antcommands: [] build: cd ../ && ANDROID_ABI=x86 ./compile.sh release @@ -963,8 +963,8 @@ builds: subdir: vlc-android submodules: false target: null - vercode: 10002 - version: 0.9.10 + versionCode: 10002 + versionName: 0.9.10 - androidupdate: [] antcommands: [] build: cd ../ && ANDROID_ABI=armeabi ./compile.sh release @@ -995,8 +995,8 @@ builds: subdir: vlc-android submodules: false target: null - vercode: 10003 - version: 0.9.10 + versionCode: 10003 + versionName: 0.9.10 - androidupdate: [] antcommands: [] build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release @@ -1027,8 +1027,8 @@ builds: subdir: vlc-android submodules: false target: null - vercode: 10004 - version: 0.9.10 + versionCode: 10004 + versionName: 0.9.10 - androidupdate: [] antcommands: [] build: cd ../ && ANDROID_ABI=x86 ./compile.sh release @@ -1059,8 +1059,8 @@ builds: subdir: vlc-android submodules: false target: null - vercode: 10006 - version: 1.0.0 + versionCode: 10006 + versionName: 1.0.0 - androidupdate: [] antcommands: [] build: cd ../ && ANDROID_ABI=armeabi ./compile.sh release @@ -1091,8 +1091,8 @@ builds: subdir: vlc-android submodules: false target: null - vercode: 10007 - version: 1.0.0 + versionCode: 10007 + versionName: 1.0.0 - androidupdate: [] antcommands: [] build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release @@ -1123,8 +1123,8 @@ builds: subdir: vlc-android submodules: false target: null - vercode: 10008 - version: 1.0.0 + versionCode: 10008 + versionName: 1.0.0 - androidupdate: [] antcommands: [] build: cd ../ && ANDROID_ABI=x86 ./compile.sh release @@ -1155,8 +1155,8 @@ builds: subdir: vlc-android submodules: false target: null - vercode: 10102 - version: 1.0.1 + versionCode: 10102 + versionName: 1.0.1 - androidupdate: [] antcommands: [] build: cd ../ && ANDROID_ABI=armeabi ./compile.sh release @@ -1187,8 +1187,8 @@ builds: subdir: vlc-android submodules: false target: null - vercode: 10103 - version: 1.0.1 + versionCode: 10103 + versionName: 1.0.1 - androidupdate: [] antcommands: [] build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release @@ -1219,8 +1219,8 @@ builds: subdir: vlc-android submodules: false target: null - vercode: 10104 - version: 1.0.1 + versionCode: 10104 + versionName: 1.0.1 - androidupdate: [] antcommands: [] build: cd ../ && ./compile.sh -a "armeabi" --release @@ -1253,8 +1253,8 @@ builds: subdir: vlc-android submodules: false target: null - vercode: 1010303 - version: 1.1.3 + versionCode: 1010303 + versionName: 1.1.3 - androidupdate: [] antcommands: [] build: cd ../ && ./compile.sh -a "armeabi-v7a" --release @@ -1287,8 +1287,8 @@ builds: subdir: vlc-android submodules: false target: null - vercode: 1010304 - version: 1.1.3 + versionCode: 1010304 + versionName: 1.1.3 - androidupdate: [] antcommands: [] build: cd ../ && ./compile.sh -a "x86" --release @@ -1321,8 +1321,8 @@ builds: subdir: vlc-android submodules: false target: null - vercode: 1010305 - version: 1.1.3 + versionCode: 1010305 + versionName: 1.1.3 - androidupdate: [] antcommands: [] build: cd ../ && ./compile.sh -a "armeabi" --release @@ -1355,8 +1355,8 @@ builds: subdir: vlc-android submodules: false target: null - vercode: 1010503 - version: 1.1.5 + versionCode: 1010503 + versionName: 1.1.5 - androidupdate: [] antcommands: [] build: cd ../ && ./compile.sh -a "armeabi-v7a" --release @@ -1389,8 +1389,8 @@ builds: subdir: vlc-android submodules: false target: null - vercode: 1010504 - version: 1.1.5 + versionCode: 1010504 + versionName: 1.1.5 - androidupdate: [] antcommands: [] build: cd ../ && ./compile.sh -a "x86" --release @@ -1423,8 +1423,8 @@ builds: subdir: vlc-android submodules: false target: null - vercode: 1010505 - version: 1.1.5 + versionCode: 1010505 + versionName: 1.1.5 - androidupdate: [] antcommands: [] build: cd ../ && ./compile.sh -a "armeabi" --release @@ -1457,8 +1457,8 @@ builds: subdir: vlc-android submodules: false target: null - vercode: 1010603 - version: 1.1.6 + versionCode: 1010603 + versionName: 1.1.6 - androidupdate: [] antcommands: [] build: cd ../ && ./compile.sh -a "armeabi-v7a" --release @@ -1491,8 +1491,8 @@ builds: subdir: vlc-android submodules: false target: null - vercode: 1010604 - version: 1.1.6 + versionCode: 1010604 + versionName: 1.1.6 - androidupdate: [] antcommands: [] build: cd ../ && ./compile.sh -a "x86" --release @@ -1525,8 +1525,8 @@ builds: subdir: vlc-android submodules: false target: null - vercode: 1010605 - version: 1.1.6 + versionCode: 1010605 + versionName: 1.1.6 - androidupdate: [] antcommands: [] build: cd ../ && ./compile.sh -a "armeabi" --release @@ -1559,8 +1559,8 @@ builds: subdir: vlc-android submodules: false target: null - vercode: 1020003 - version: 1.2.0 + versionCode: 1020003 + versionName: 1.2.0 - androidupdate: [] antcommands: [] build: cd ../ && ./compile.sh -a "armeabi-v7a" --release @@ -1593,8 +1593,8 @@ builds: subdir: vlc-android submodules: false target: null - vercode: 1020004 - version: 1.2.0 + versionCode: 1020004 + versionName: 1.2.0 - androidupdate: [] antcommands: [] build: cd ../ && ./compile.sh -a "x86" --release @@ -1627,8 +1627,8 @@ builds: subdir: vlc-android submodules: false target: null - vercode: 1020005 - version: 1.2.0 + versionCode: 1020005 + versionName: 1.2.0 - androidupdate: [] antcommands: [] build: cd ../ && ./compile.sh -a "armeabi" --release @@ -1661,8 +1661,8 @@ builds: subdir: vlc-android submodules: false target: null - vercode: 1020103 - version: 1.2.1 + versionCode: 1020103 + versionName: 1.2.1 - androidupdate: [] antcommands: [] build: cd ../ && ./compile.sh -a "armeabi-v7a" --release @@ -1695,8 +1695,8 @@ builds: subdir: vlc-android submodules: false target: null - vercode: 1020104 - version: 1.2.1 + versionCode: 1020104 + versionName: 1.2.1 - androidupdate: [] antcommands: [] build: cd ../ && ./compile.sh -a "x86" --release @@ -1729,8 +1729,8 @@ builds: subdir: vlc-android submodules: false target: null - vercode: 1020105 - version: 1.2.1 + versionCode: 1020105 + versionName: 1.2.1 - androidupdate: [] antcommands: [] build: cd ../ && ./compile.sh -a "armeabi" --release @@ -1763,8 +1763,8 @@ builds: subdir: vlc-android submodules: false target: null - vercode: 1020203 - version: 1.2.2 + versionCode: 1020203 + versionName: 1.2.2 - androidupdate: [] antcommands: [] build: cd ../ && ./compile.sh -a "armeabi-v7a" --release @@ -1797,8 +1797,8 @@ builds: subdir: vlc-android submodules: false target: null - vercode: 1020204 - version: 1.2.2 + versionCode: 1020204 + versionName: 1.2.2 - androidupdate: [] antcommands: [] build: cd ../ && ./compile.sh -a "x86" --release @@ -1831,8 +1831,8 @@ builds: subdir: vlc-android submodules: false target: null - vercode: 1020205 - version: 1.2.2 + versionCode: 1020205 + versionName: 1.2.2 - androidupdate: [] antcommands: [] build: cd ../ && ./compile.sh -a "armeabi" --release @@ -1865,8 +1865,8 @@ builds: subdir: vlc-android submodules: false target: null - vercode: 1020303 - version: 1.2.3 + versionCode: 1020303 + versionName: 1.2.3 - androidupdate: [] antcommands: [] build: cd ../ && ./compile.sh -a "armeabi-v7a" --release @@ -1899,8 +1899,8 @@ builds: subdir: vlc-android submodules: false target: null - vercode: 1020304 - version: 1.2.3 + versionCode: 1020304 + versionName: 1.2.3 - androidupdate: [] antcommands: [] build: cd ../ && ./compile.sh -a "x86" --release @@ -1933,8 +1933,8 @@ builds: subdir: vlc-android submodules: false target: null - vercode: 1020305 - version: 1.2.3 + versionCode: 1020305 + versionName: 1.2.3 - androidupdate: [] antcommands: [] build: cd ../ && ./compile.sh -a "armeabi" --release @@ -1967,8 +1967,8 @@ builds: subdir: vlc-android submodules: false target: null - vercode: 1020403 - version: 1.2.4 + versionCode: 1020403 + versionName: 1.2.4 - androidupdate: [] antcommands: [] build: cd ../ && ./compile.sh -a "armeabi-v7a" --release @@ -2001,8 +2001,8 @@ builds: subdir: vlc-android submodules: false target: null - vercode: 1020404 - version: 1.2.4 + versionCode: 1020404 + versionName: 1.2.4 - androidupdate: [] antcommands: [] build: cd ../ && ./compile.sh -a "x86" --release @@ -2035,8 +2035,8 @@ builds: subdir: vlc-android submodules: false target: null - vercode: 1020405 - version: 1.2.4 + versionCode: 1020405 + versionName: 1.2.4 - androidupdate: [] antcommands: [] build: cd ../ && ./compile.sh -a "armeabi" --release @@ -2069,8 +2069,8 @@ builds: subdir: vlc-android submodules: false target: null - vercode: 1020503 - version: 1.2.5 + versionCode: 1020503 + versionName: 1.2.5 - androidupdate: [] antcommands: [] build: cd ../ && ./compile.sh -a "armeabi-v7a" --release @@ -2103,8 +2103,8 @@ builds: subdir: vlc-android submodules: false target: null - vercode: 1020504 - version: 1.2.5 + versionCode: 1020504 + versionName: 1.2.5 - androidupdate: [] antcommands: [] build: cd ../ && ./compile.sh -a "x86" --release @@ -2137,8 +2137,8 @@ builds: subdir: vlc-android submodules: false target: null - vercode: 1020505 - version: 1.2.5 + versionCode: 1020505 + versionName: 1.2.5 - androidupdate: [] antcommands: [] build: cd ../ && ./compile.sh -a "armeabi" --release @@ -2171,8 +2171,8 @@ builds: subdir: vlc-android submodules: false target: null - vercode: 1030003 - version: 1.2.6 + versionCode: 1030003 + versionName: 1.2.6 - androidupdate: [] antcommands: [] build: cd ../ && ./compile.sh -a "armeabi-v7a" --release @@ -2205,8 +2205,8 @@ builds: subdir: vlc-android submodules: false target: null - vercode: 1030004 - version: 1.2.6 + versionCode: 1030004 + versionName: 1.2.6 - androidupdate: [] antcommands: [] build: cd ../ && ./compile.sh -a "x86" --release @@ -2239,8 +2239,8 @@ builds: subdir: vlc-android submodules: false target: null - vercode: 1030005 - version: 1.2.6 + versionCode: 1030005 + versionName: 1.2.6 comments: {} id: org.videolan.vlc lastupdated: null From f7ae398aae5f2be18723aaea3bc5b12a30e3e934 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Thu, 23 Feb 2017 18:33:39 +0100 Subject: [PATCH 07/11] add script for mass testing metadata parsing after changes This requires manually running it. I suppose it would be possible to include a snapshot of the dumped internal representation for each release, then make the tests run automatically against that. Right now, the dump is 17megs of YAML. Seems large to include in this git repo. --- tests/dump_internal_metadata_format.py | 99 ++++++++++++++++++++++++++ 1 file changed, 99 insertions(+) create mode 100755 tests/dump_internal_metadata_format.py diff --git a/tests/dump_internal_metadata_format.py b/tests/dump_internal_metadata_format.py new file mode 100755 index 00000000..4dc95890 --- /dev/null +++ b/tests/dump_internal_metadata_format.py @@ -0,0 +1,99 @@ +#!/usr/bin/env python3 +# +# This is for running manual tests when changing the metadata format. +# The idea is to test changes using all of the files in +# fdroiddata.git. To run it, do: +# +# cd fdroidserver/tests +# cp dump_internal_metadata_format.py dump.py # since this isn't in old commits +# git checkout 0.7.0 # or any old commit of your choosing +# cd ../../fdroiddata +# ../fdroidserver/tests/dump.py +# mv metadata/dump metadata/dump_0.7.0 +# cd ../fdroidserver +# git checkout master +# cd ../fdroiddata +# ../fdroidserver/tests/dump.py +# meld metadata/dump_0.7.0 metadata/dump_0.7.0-179-ge85486a/ + +import git +import inspect +import optparse +import os +import sys +import yaml + +localmodule = os.path.realpath( + os.path.join(os.path.dirname(inspect.getfile(inspect.currentframe())), '..')) +if localmodule not in sys.path: + sys.path.insert(0, localmodule) + +import fdroidserver.common # noqa +import fdroidserver.metadata # noqa + + +def _build_yaml_representer(dumper, data): + '''Creates a YAML representation of a Build instance''' + if hasattr(data, 'append_flag'): + # for 0.7.0 and earlier, before https://gitlab.com/fdroid/fdroidserver/merge_requests/210 + del(data._modified) + readdict = data.__dict__ + else: + readdict = data + + # these key names were all renamed in + # https://gitlab.com/fdroid/fdroidserver/merge_requests/210 + output = dict() + for k, v in readdict.items(): + if k == 'vercode': + output['versionCode'] = v + elif k == 'version': + output['versionName'] = v + elif k == 'update': + output['androidupdate'] = v + else: + output[k] = v + + return dumper.represent_dict(output) + + +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']) + +os.chdir('/home/hans/code/fdroid/fdroiddata') +# 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'] = ['txt'] +fdroidserver.common.config = config + +repo = git.Repo(localmodule) +savedir = os.path.join('metadata', 'dump_' + repo.git.describe()) +if not os.path.isdir(savedir): + os.mkdir(savedir) + +apps = fdroidserver.metadata.read_metadata(xref=True) +for appid, app in apps.items(): + savepath = os.path.join(savedir, appid + '.yaml') + print('dumping', savepath) + if hasattr(app, 'attr_to_field'): + # for 0.7.0 and earlier, before https://gitlab.com/fdroid/fdroidserver/merge_requests/210 + app.__dict__['lastUpdated'] = app.__dict__['lastupdated'] + del(app.__dict__['lastupdated']) + del(app._modified) + frommeta = dict(app.__dict__) + else: + frommeta = dict(app) + + with open(savepath, 'w') as f: + yaml.add_representer(fdroidserver.metadata.Build, _build_yaml_representer) + yaml.dump(frommeta, f, default_flow_style=False) + + # if appid == 'at.tomtasche.reader': + # import pprint + # pprint.pprint(app) + # sys.exit(1) From c178cfb84368cc400984f86cb2b10d48a32c68ae Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Thu, 23 Feb 2017 18:54:33 +0100 Subject: [PATCH 08/11] normalize Build TYPE_LIST data based on .txt In the future, we should have better internal datatypes for this stuff, i.e. instead of gradle: ['yes'] for True, actually use a boolean. For now, make the YAML and JSON metadata produce the same internal data as .txt. --- fdroidserver/metadata.py | 9 ++ tests/metadata/dump/org.adaway.yaml | 99 ++++++++++------ tests/metadata/dump/org.videolan.vlc.yaml | 132 +++++++++++----------- tests/metadata/org.videolan.vlc.yml | 112 ++++++------------ 4 files changed, 175 insertions(+), 177 deletions(-) diff --git a/fdroidserver/metadata.py b/fdroidserver/metadata.py index 0d446f54..924d7d87 100644 --- a/fdroidserver/metadata.py +++ b/fdroidserver/metadata.py @@ -818,6 +818,15 @@ def post_metadata_parse(app): for build in app['builds']: if not isinstance(build, Build): build = Build(build) + for k, v in build.items(): + if flagtype(k) == TYPE_LIST: + if isinstance(v, str): + build[k] = [v] + elif isinstance(v, bool): + if v: + build[k] = ['yes'] + else: + build[k] = [] builds.append(build) if not app.get('Description'): diff --git a/tests/metadata/dump/org.adaway.yaml b/tests/metadata/dump/org.adaway.yaml index c028e297..2be4c114 100644 --- a/tests/metadata/dump/org.adaway.yaml +++ b/tests/metadata/dump/org.adaway.yaml @@ -61,7 +61,8 @@ builds: - androidupdate: [] antcommands: [] build: '' - buildjni: true + buildjni: + - 'yes' commit: ea5378a94ee0dc1d99d2cec95fae7e6d81afb2b9 disable: false encoding: null @@ -92,7 +93,8 @@ builds: - androidupdate: [] antcommands: [] build: '' - buildjni: true + buildjni: + - 'yes' commit: 4128e59da2eac5c2904c7c7568d298ca51e79540 disable: false encoding: null @@ -124,7 +126,8 @@ builds: - androidupdate: [] antcommands: [] build: '' - buildjni: true + buildjni: + - 'yes' commit: 0b9985398b9eef7baf6aadd0dbb12002bc199d2e disable: false encoding: null @@ -156,7 +159,8 @@ builds: - androidupdate: [] antcommands: [] build: '' - buildjni: true + buildjni: + - 'yes' commit: ab27f4dab5f3ea5e228cfb4a6b0e1fbf53695f22 disable: false encoding: null @@ -188,7 +192,8 @@ builds: - androidupdate: [] antcommands: [] build: '' - buildjni: true + buildjni: + - 'yes' commit: 695e3801e4081026c8f7213a2345fc451d5eb89c disable: false encoding: null @@ -220,7 +225,8 @@ builds: - androidupdate: [] antcommands: [] build: '' - buildjni: true + buildjni: + - 'yes' commit: 65138c11cc8b6affd28b68e125fbc1dff0886a4e disable: false encoding: null @@ -283,7 +289,8 @@ builds: - androidupdate: [] antcommands: [] build: '' - buildjni: true + buildjni: + - 'yes' commit: f811e53e1e1d2ee047b18715fd7d2072b90ae76b disable: false encoding: null @@ -314,7 +321,8 @@ builds: - androidupdate: [] antcommands: [] build: '' - buildjni: true + buildjni: + - 'yes' commit: ff97932761cdee68638dc2550751a64b2cbe18e7 disable: false encoding: null @@ -345,7 +353,8 @@ builds: - androidupdate: [] antcommands: [] build: '' - buildjni: true + buildjni: + - 'yes' commit: 33d4d80998f30bafc88c04c80cbae00b03916f99 disable: false encoding: null @@ -376,7 +385,8 @@ builds: - androidupdate: [] antcommands: [] build: '' - buildjni: true + buildjni: + - 'yes' commit: 743d25a7e287505461f33f4b8e57e4cf988fffea disable: false encoding: null @@ -407,7 +417,8 @@ builds: - androidupdate: [] antcommands: [] build: '' - buildjni: true + buildjni: + - 'yes' commit: eaa07f4 disable: false encoding: null @@ -438,7 +449,7 @@ builds: - androidupdate: [] antcommands: [] build: '' - buildjni: false + buildjni: [] commit: 71ced3f disable: false encoding: null @@ -470,7 +481,7 @@ builds: - androidupdate: [] antcommands: [] build: '' - buildjni: false + buildjni: [] commit: 9d63c18 disable: false encoding: null @@ -501,7 +512,7 @@ builds: - androidupdate: [] antcommands: [] build: '' - buildjni: false + buildjni: [] commit: f2568b1 disable: false encoding: null @@ -533,7 +544,7 @@ builds: - androidupdate: [] antcommands: [] build: '' - buildjni: false + buildjni: [] commit: 7442d5d disable: false encoding: null @@ -565,7 +576,7 @@ builds: - androidupdate: [] antcommands: [] build: '' - buildjni: false + buildjni: [] commit: 83fc713 disable: false encoding: null @@ -597,7 +608,7 @@ builds: - androidupdate: [] antcommands: [] build: '' - buildjni: false + buildjni: [] commit: 70da32b567122b701cdcb1609b780eb85732028f disable: false encoding: null @@ -633,7 +644,8 @@ builds: - android-libs/HtmlSpanner/htmlspanner antcommands: [] build: '' - buildjni: true + buildjni: + - 'yes' commit: v2.1 disable: false encoding: null @@ -676,7 +688,8 @@ builds: - android-libs/HtmlSpanner/htmlspanner antcommands: [] build: '' - buildjni: true + buildjni: + - 'yes' commit: v2.3 disable: false encoding: null @@ -715,14 +728,16 @@ builds: - androidupdate: [] antcommands: [] build: '' - buildjni: true + buildjni: + - 'yes' commit: v2.6 disable: false encoding: null extlibs: [] forcevercode: false forceversion: false - gradle: true + gradle: + - 'yes' gradleprops: [] init: '' kivy: false @@ -747,14 +762,16 @@ builds: - androidupdate: [] antcommands: [] build: '' - buildjni: true + buildjni: + - 'yes' commit: v2.7 disable: false encoding: null extlibs: [] forcevercode: false forceversion: false - gradle: true + gradle: + - 'yes' gradleprops: [] init: '' kivy: false @@ -779,14 +796,16 @@ builds: - androidupdate: [] antcommands: [] build: '' - buildjni: true + buildjni: + - 'yes' commit: v2.8 disable: false encoding: null extlibs: [] forcevercode: false forceversion: false - gradle: true + gradle: + - 'yes' gradleprops: [] init: '' kivy: false @@ -811,14 +830,16 @@ builds: - androidupdate: [] antcommands: [] build: '' - buildjni: true + buildjni: + - 'yes' commit: v2.8.1 disable: false encoding: null extlibs: [] forcevercode: false forceversion: false - gradle: true + gradle: + - 'yes' gradleprops: [] init: '' kivy: false @@ -843,14 +864,16 @@ builds: - androidupdate: [] antcommands: [] build: '' - buildjni: true + buildjni: + - 'yes' commit: v2.9 disable: false encoding: null extlibs: [] forcevercode: false forceversion: false - gradle: true + gradle: + - 'yes' gradleprops: [] init: '' kivy: false @@ -875,14 +898,16 @@ builds: - androidupdate: [] antcommands: [] build: '' - buildjni: true + buildjni: + - 'yes' commit: v2.9.1 disable: false encoding: null extlibs: [] forcevercode: false forceversion: false - gradle: true + gradle: + - 'yes' gradleprops: [] init: '' kivy: false @@ -907,14 +932,16 @@ builds: - androidupdate: [] antcommands: [] build: '' - buildjni: true + buildjni: + - 'yes' commit: v2.9.2 disable: false encoding: null extlibs: [] forcevercode: false forceversion: false - gradle: true + gradle: + - 'yes' gradleprops: [] init: '' kivy: false @@ -939,14 +966,16 @@ builds: - androidupdate: [] antcommands: [] build: '' - buildjni: true + buildjni: + - 'yes' commit: v3.0 disable: false encoding: null extlibs: [] forcevercode: false forceversion: false - gradle: true + gradle: + - 'yes' gradleprops: [] init: '' kivy: false diff --git a/tests/metadata/dump/org.videolan.vlc.yaml b/tests/metadata/dump/org.videolan.vlc.yaml index 801b56f7..aa51aab8 100644 --- a/tests/metadata/dump/org.videolan.vlc.yaml +++ b/tests/metadata/dump/org.videolan.vlc.yaml @@ -63,7 +63,7 @@ builds: - ../java-libs/ActionBarSherlock antcommands: [] build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release - buildjni: false + buildjni: [] commit: 0.0.11 disable: false encoding: null @@ -97,7 +97,7 @@ builds: - ../java-libs/ActionBarSherlock antcommands: [] build: cd ../ && ANDROID_ABI=armeabi ./compile.sh release - buildjni: false + buildjni: [] commit: 0.0.11 disable: false encoding: null @@ -131,7 +131,7 @@ builds: - ../java-libs/ActionBarSherlock antcommands: [] build: cd ../ && ANDROID_ABI=x86 ./compile.sh release - buildjni: false + buildjni: [] commit: unknown - see disabled disable: ffmpeg error 0.0.11 encoding: null @@ -165,7 +165,7 @@ builds: - ../java-libs/ActionBarSherlock antcommands: [] build: cd ../ && ANDROID_ABI=mips ./compile.sh release - buildjni: false + buildjni: [] commit: 0.0.11 disable: false encoding: null @@ -196,7 +196,7 @@ builds: - androidupdate: [] antcommands: [] build: cd ../ && ANDROID_ABI=mips ./compile.sh release - buildjni: false + buildjni: [] commit: 0.1.3 disable: build failing (at 0.1.3) encoding: null @@ -229,7 +229,7 @@ builds: - androidupdate: [] antcommands: [] build: cd ../ && ANDROID_ABI=x86 ./compile.sh release - buildjni: false + buildjni: [] commit: 0.1.3 disable: false encoding: null @@ -262,7 +262,7 @@ builds: - androidupdate: [] antcommands: [] build: cd ../ && ANDROID_ABI=armeabi ./compile.sh release - buildjni: false + buildjni: [] commit: 0.1.3 disable: false encoding: null @@ -295,7 +295,7 @@ builds: - androidupdate: [] antcommands: [] build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release - buildjni: false + buildjni: [] commit: 0.1.3 disable: false encoding: null @@ -328,7 +328,7 @@ builds: - androidupdate: [] antcommands: [] build: cd ../ && ANDROID_ABI=x86 ./compile.sh release - buildjni: false + buildjni: [] commit: 0.9.0 disable: false encoding: null @@ -360,7 +360,7 @@ builds: - androidupdate: [] antcommands: [] build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release - buildjni: false + buildjni: [] commit: 0.9.0 disable: false encoding: null @@ -392,7 +392,7 @@ builds: - androidupdate: [] antcommands: [] build: cd ../ && ANDROID_ABI=x86 ./compile.sh release - buildjni: false + buildjni: [] commit: 0.9.1 disable: false encoding: null @@ -424,7 +424,7 @@ builds: - androidupdate: [] antcommands: [] build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release - buildjni: false + buildjni: [] commit: 0.9.1 disable: false encoding: null @@ -456,7 +456,7 @@ builds: - androidupdate: [] antcommands: [] build: cd ../ && ANDROID_ABI=x86 ./compile.sh release - buildjni: false + buildjni: [] commit: 0.9.5 disable: can't download gmp encoding: null @@ -488,7 +488,7 @@ builds: - androidupdate: [] antcommands: [] build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release - buildjni: false + buildjni: [] commit: 0.9.5 disable: can't download gmp encoding: null @@ -520,7 +520,7 @@ builds: - androidupdate: [] antcommands: [] build: cd ../ && ANDROID_ABI=x86 ./compile.sh release - buildjni: false + buildjni: [] commit: 0.9.6 disable: false encoding: null @@ -552,7 +552,7 @@ builds: - androidupdate: [] antcommands: [] build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release - buildjni: false + buildjni: [] commit: 0.9.6 disable: false encoding: null @@ -584,7 +584,7 @@ builds: - androidupdate: [] antcommands: [] build: cd ../ && ANDROID_ABI=x86 ./compile.sh release - buildjni: false + buildjni: [] commit: 0.9.7 disable: false encoding: null @@ -616,7 +616,7 @@ builds: - androidupdate: [] antcommands: [] build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release - buildjni: false + buildjni: [] commit: 0.9.7 disable: false encoding: null @@ -648,7 +648,7 @@ builds: - androidupdate: [] antcommands: [] build: cd ../ && ANDROID_ABI=mips ./compile.sh release - buildjni: false + buildjni: [] commit: 0.9.7.1 disable: build fails encoding: null @@ -680,7 +680,7 @@ builds: - androidupdate: [] antcommands: [] build: cd ../ && ANDROID_ABI=x86 ./compile.sh release - buildjni: false + buildjni: [] commit: 0.9.7.1 disable: false encoding: null @@ -712,7 +712,7 @@ builds: - androidupdate: [] antcommands: [] build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release - buildjni: false + buildjni: [] commit: 0.9.7.1 disable: false encoding: null @@ -744,7 +744,7 @@ builds: - androidupdate: [] antcommands: [] build: cd ../ && ANDROID_ABI=x86 ./compile.sh release - buildjni: false + buildjni: [] commit: 0.9.8 disable: false encoding: null @@ -776,7 +776,7 @@ builds: - androidupdate: [] antcommands: [] build: cd ../ && ANDROID_ABI=armeabi ./compile.sh release - buildjni: false + buildjni: [] commit: 0.9.8 disable: false encoding: null @@ -808,7 +808,7 @@ builds: - androidupdate: [] antcommands: [] build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release - buildjni: false + buildjni: [] commit: 0.9.8 disable: false encoding: null @@ -840,7 +840,7 @@ builds: - androidupdate: [] antcommands: [] build: cd ../ && ANDROID_ABI=x86 ./compile.sh release - buildjni: false + buildjni: [] commit: 0.9.9 disable: false encoding: null @@ -872,7 +872,7 @@ builds: - androidupdate: [] antcommands: [] build: cd ../ && ANDROID_ABI=armeabi ./compile.sh release - buildjni: false + buildjni: [] commit: 0.9.9 disable: false encoding: null @@ -904,7 +904,7 @@ builds: - androidupdate: [] antcommands: [] build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release - buildjni: false + buildjni: [] commit: 0.9.9 disable: false encoding: null @@ -936,7 +936,7 @@ builds: - androidupdate: [] antcommands: [] build: cd ../ && ANDROID_ABI=x86 ./compile.sh release - buildjni: false + buildjni: [] commit: 0.9.10 disable: false encoding: null @@ -968,7 +968,7 @@ builds: - androidupdate: [] antcommands: [] build: cd ../ && ANDROID_ABI=armeabi ./compile.sh release - buildjni: false + buildjni: [] commit: 0.9.10 disable: false encoding: null @@ -1000,7 +1000,7 @@ builds: - androidupdate: [] antcommands: [] build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release - buildjni: false + buildjni: [] commit: 0.9.10 disable: false encoding: null @@ -1032,7 +1032,7 @@ builds: - androidupdate: [] antcommands: [] build: cd ../ && ANDROID_ABI=x86 ./compile.sh release - buildjni: false + buildjni: [] commit: 1.0.0 disable: doesn't build encoding: null @@ -1064,7 +1064,7 @@ builds: - androidupdate: [] antcommands: [] build: cd ../ && ANDROID_ABI=armeabi ./compile.sh release - buildjni: false + buildjni: [] commit: 1.0.0 disable: doesn't build encoding: null @@ -1096,7 +1096,7 @@ builds: - androidupdate: [] antcommands: [] build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release - buildjni: false + buildjni: [] commit: 1.0.0 disable: doesn't build encoding: null @@ -1128,7 +1128,7 @@ builds: - androidupdate: [] antcommands: [] build: cd ../ && ANDROID_ABI=x86 ./compile.sh release - buildjni: false + buildjni: [] commit: 1.0.1 disable: false encoding: null @@ -1160,7 +1160,7 @@ builds: - androidupdate: [] antcommands: [] build: cd ../ && ANDROID_ABI=armeabi ./compile.sh release - buildjni: false + buildjni: [] commit: 1.0.1 disable: false encoding: null @@ -1192,7 +1192,7 @@ builds: - androidupdate: [] antcommands: [] build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release - buildjni: false + buildjni: [] commit: 1.0.1 disable: false encoding: null @@ -1224,7 +1224,7 @@ builds: - androidupdate: [] antcommands: [] build: cd ../ && ./compile.sh -a "armeabi" --release - buildjni: false + buildjni: [] commit: 1.1.3 disable: false encoding: null @@ -1258,7 +1258,7 @@ builds: - androidupdate: [] antcommands: [] build: cd ../ && ./compile.sh -a "armeabi-v7a" --release - buildjni: false + buildjni: [] commit: 1.1.3 disable: false encoding: null @@ -1292,7 +1292,7 @@ builds: - androidupdate: [] antcommands: [] build: cd ../ && ./compile.sh -a "x86" --release - buildjni: false + buildjni: [] commit: 1.1.3 disable: false encoding: null @@ -1326,7 +1326,7 @@ builds: - androidupdate: [] antcommands: [] build: cd ../ && ./compile.sh -a "armeabi" --release - buildjni: false + buildjni: [] commit: 1.1.5 disable: false encoding: null @@ -1360,7 +1360,7 @@ builds: - androidupdate: [] antcommands: [] build: cd ../ && ./compile.sh -a "armeabi-v7a" --release - buildjni: false + buildjni: [] commit: 1.1.5 disable: false encoding: null @@ -1394,7 +1394,7 @@ builds: - androidupdate: [] antcommands: [] build: cd ../ && ./compile.sh -a "x86" --release - buildjni: false + buildjni: [] commit: 1.1.5 disable: false encoding: null @@ -1428,7 +1428,7 @@ builds: - androidupdate: [] antcommands: [] build: cd ../ && ./compile.sh -a "armeabi" --release - buildjni: false + buildjni: [] commit: 1.1.6 disable: false encoding: null @@ -1462,7 +1462,7 @@ builds: - androidupdate: [] antcommands: [] build: cd ../ && ./compile.sh -a "armeabi-v7a" --release - buildjni: false + buildjni: [] commit: 1.1.6 disable: false encoding: null @@ -1496,7 +1496,7 @@ builds: - androidupdate: [] antcommands: [] build: cd ../ && ./compile.sh -a "x86" --release - buildjni: false + buildjni: [] commit: 1.1.6 disable: false encoding: null @@ -1530,7 +1530,7 @@ builds: - androidupdate: [] antcommands: [] build: cd ../ && ./compile.sh -a "armeabi" --release - buildjni: false + buildjni: [] commit: 1.2.0 disable: false encoding: null @@ -1564,7 +1564,7 @@ builds: - androidupdate: [] antcommands: [] build: cd ../ && ./compile.sh -a "armeabi-v7a" --release - buildjni: false + buildjni: [] commit: 1.2.0 disable: false encoding: null @@ -1598,7 +1598,7 @@ builds: - androidupdate: [] antcommands: [] build: cd ../ && ./compile.sh -a "x86" --release - buildjni: false + buildjni: [] commit: 1.2.0 disable: false encoding: null @@ -1632,7 +1632,7 @@ builds: - androidupdate: [] antcommands: [] build: cd ../ && ./compile.sh -a "armeabi" --release - buildjni: false + buildjni: [] commit: 1.2.1 disable: false encoding: null @@ -1666,7 +1666,7 @@ builds: - androidupdate: [] antcommands: [] build: cd ../ && ./compile.sh -a "armeabi-v7a" --release - buildjni: false + buildjni: [] commit: 1.2.1 disable: false encoding: null @@ -1700,7 +1700,7 @@ builds: - androidupdate: [] antcommands: [] build: cd ../ && ./compile.sh -a "x86" --release - buildjni: false + buildjni: [] commit: 1.2.1 disable: false encoding: null @@ -1734,7 +1734,7 @@ builds: - androidupdate: [] antcommands: [] build: cd ../ && ./compile.sh -a "armeabi" --release - buildjni: false + buildjni: [] commit: 1.2.2 disable: false encoding: null @@ -1768,7 +1768,7 @@ builds: - androidupdate: [] antcommands: [] build: cd ../ && ./compile.sh -a "armeabi-v7a" --release - buildjni: false + buildjni: [] commit: 1.2.2 disable: false encoding: null @@ -1802,7 +1802,7 @@ builds: - androidupdate: [] antcommands: [] build: cd ../ && ./compile.sh -a "x86" --release - buildjni: false + buildjni: [] commit: 1.2.2 disable: false encoding: null @@ -1836,7 +1836,7 @@ builds: - androidupdate: [] antcommands: [] build: cd ../ && ./compile.sh -a "armeabi" --release - buildjni: false + buildjni: [] commit: 1.2.3 disable: false encoding: null @@ -1870,7 +1870,7 @@ builds: - androidupdate: [] antcommands: [] build: cd ../ && ./compile.sh -a "armeabi-v7a" --release - buildjni: false + buildjni: [] commit: 1.2.3 disable: false encoding: null @@ -1904,7 +1904,7 @@ builds: - androidupdate: [] antcommands: [] build: cd ../ && ./compile.sh -a "x86" --release - buildjni: false + buildjni: [] commit: 1.2.3 disable: false encoding: null @@ -1938,7 +1938,7 @@ builds: - androidupdate: [] antcommands: [] build: cd ../ && ./compile.sh -a "armeabi" --release - buildjni: false + buildjni: [] commit: 1.2.4 disable: false encoding: null @@ -1972,7 +1972,7 @@ builds: - androidupdate: [] antcommands: [] build: cd ../ && ./compile.sh -a "armeabi-v7a" --release - buildjni: false + buildjni: [] commit: 1.2.4 disable: false encoding: null @@ -2006,7 +2006,7 @@ builds: - androidupdate: [] antcommands: [] build: cd ../ && ./compile.sh -a "x86" --release - buildjni: false + buildjni: [] commit: 1.2.4 disable: false encoding: null @@ -2040,7 +2040,7 @@ builds: - androidupdate: [] antcommands: [] build: cd ../ && ./compile.sh -a "armeabi" --release - buildjni: false + buildjni: [] commit: 1.2.5 disable: false encoding: null @@ -2074,7 +2074,7 @@ builds: - androidupdate: [] antcommands: [] build: cd ../ && ./compile.sh -a "armeabi-v7a" --release - buildjni: false + buildjni: [] commit: 1.2.5 disable: false encoding: null @@ -2108,7 +2108,7 @@ builds: - androidupdate: [] antcommands: [] build: cd ../ && ./compile.sh -a "x86" --release - buildjni: false + buildjni: [] commit: 1.2.5 disable: false encoding: null @@ -2142,7 +2142,7 @@ builds: - androidupdate: [] antcommands: [] build: cd ../ && ./compile.sh -a "armeabi" --release - buildjni: false + buildjni: [] commit: 1.2.6 disable: false encoding: null @@ -2176,7 +2176,7 @@ builds: - androidupdate: [] antcommands: [] build: cd ../ && ./compile.sh -a "armeabi-v7a" --release - buildjni: false + buildjni: [] commit: 1.2.6 disable: false encoding: null @@ -2210,7 +2210,7 @@ builds: - androidupdate: [] antcommands: [] build: cd ../ && ./compile.sh -a "x86" --release - buildjni: false + buildjni: [] commit: 1.2.6 disable: false encoding: null diff --git a/tests/metadata/org.videolan.vlc.yml b/tests/metadata/org.videolan.vlc.yml index 67b0d297..7d38ecce 100644 --- a/tests/metadata/org.videolan.vlc.yml +++ b/tests/metadata/org.videolan.vlc.yml @@ -43,9 +43,7 @@ builds: - . - ../java-libs/SlidingMenu - ../java-libs/ActionBarSherlock - build: | - cd ../ && \ - ANDROID_ABI=armeabi ./compile.sh release + build: cd ../ && ANDROID_ABI=armeabi ./compile.sh release buildjni: no - versionName: 0.0.11-x86 @@ -60,9 +58,7 @@ builds: - . - ../java-libs/SlidingMenu - ../java-libs/ActionBarSherlock - build: | - cd ../ && \ - ANDROID_ABI=x86 ./compile.sh release + build: cd ../ && ANDROID_ABI=x86 ./compile.sh release buildjni: no - versionName: 0.0.11-mips @@ -76,9 +72,7 @@ builds: - . - ../java-libs/SlidingMenu - ../java-libs/ActionBarSherlock - build: > - cd ../ && \ - ANDROID_ABI=mips ./compile.sh release + build: cd ../ && ANDROID_ABI=mips ./compile.sh release buildjni: no - versionName: 0.1.3-MIPS @@ -90,11 +84,8 @@ builds: srclibs: VLC@7c52aacbe forceversion: yes forcevercode: yes - prebuild: sed -i '/ant/d' ../Makefile && \ - ln -s vlc-android/$$VLC$$ ../vlc - build: | - cd ../ && \ - ANDROID_ABI=mips ./compile.sh release + prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC$$ ../vlc + build: cd ../ && ANDROID_ABI=mips ./compile.sh release buildjni: no - versionName: 0.1.3-x86 @@ -105,8 +96,7 @@ builds: srclibs: VLC@7c52aacbe forceversion: yes forcevercode: yes - prebuild: sed -i '/ant/d' ../Makefile && \ - ln -s vlc-android/$$VLC$$ ../vlc + prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC$$ ../vlc build: cd ../ && ANDROID_ABI=x86 ./compile.sh release buildjni: no @@ -118,8 +108,7 @@ builds: srclibs: VLC@7c52aacbe forceversion: yes forcevercode: yes - prebuild: sed -i '/ant/d' ../Makefile && \ - ln -s vlc-android/$$VLC$$ ../vlc + prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC$$ ../vlc build: cd ../ && ANDROID_ABI=armeabi ./compile.sh release buildjni: no @@ -131,8 +120,7 @@ builds: srclibs: VLC@7c52aacbe forceversion: yes forcevercode: yes - prebuild: sed -i '/ant/d' ../Makefile && \ - ln -s vlc-android/$$VLC$$ ../vlc + prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC$$ ../vlc build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release buildjni: no @@ -142,8 +130,7 @@ builds: subdir: vlc-android srclibs: VLC@31ffb20309264994 forcevercode: yes - prebuild: sed -i '/ant/d' ../Makefile && \ - ln -s vlc-android/$$VLC$$ ../vlc + prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC$$ ../vlc build: cd ../ && ANDROID_ABI=x86 ./compile.sh release buildjni: no @@ -153,8 +140,7 @@ builds: subdir: vlc-android srclibs: VLC@31ffb20309264994 forcevercode: yes - prebuild: sed -i '/ant/d' ../Makefile && \ - ln -s vlc-android/$$VLC$$ ../vlc + prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC$$ ../vlc build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release buildjni: no @@ -164,8 +150,7 @@ builds: subdir: vlc-android srclibs: VLC@37e886d113b8b567c15208579fb2f forcevercode: yes - prebuild: sed -i '/ant/d' ../Makefile && \ - ln -s vlc-android/$$VLC$$ ../vlc + prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC$$ ../vlc build: cd ../ && ANDROID_ABI=x86 ./compile.sh release buildjni: no @@ -175,8 +160,7 @@ builds: subdir: vlc-android srclibs: VLC@37e886d113b8b567c15208579fb2f forcevercode: yes - prebuild: sed -i '/ant/d' ../Makefile && \ - ln -s vlc-android/$$VLC$$ ../vlc + prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC$$ ../vlc build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release buildjni: no @@ -187,8 +171,7 @@ builds: subdir: vlc-android srclibs: VLC@052600173f376ff58ff04d53746961a2 forcevercode: yes - prebuild: sed -i '/ant/d' ../Makefile && \ - ln -s vlc-android/$$VLC$$ ../vlc + prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC$$ ../vlc build: cd ../ && ANDROID_ABI=x86 ./compile.sh release buildjni: no @@ -199,8 +182,7 @@ builds: subdir: vlc-android srclibs: VLC@052600173f376ff58ff04d53746961a2 forcevercode: yes - prebuild: sed -i '/ant/d' ../Makefile && \ - ln -s vlc-android/$$VLC$$ ../vlc + prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC$$ ../vlc build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release buildjni: no @@ -210,8 +192,7 @@ builds: subdir: vlc-android srclibs: VLC-2.2@27f4799 forcevercode: yes - prebuild: sed -i '/ant/d' ../Makefile && \ - ln -s vlc-android/$$VLC-2.2$$ ../vlc + prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc build: cd ../ && ANDROID_ABI=x86 ./compile.sh release buildjni: no @@ -221,8 +202,7 @@ builds: subdir: vlc-android srclibs: VLC-2.2@27f4799 forcevercode: yes - prebuild: sed -i '/ant/d' ../Makefile && \ - ln -s vlc-android/$$VLC-2.2$$ ../vlc + prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release buildjni: no @@ -232,8 +212,7 @@ builds: subdir: vlc-android srclibs: VLC-2.2@9e1c6ff forcevercode: yes - prebuild: sed -i '/ant/d' ../Makefile && \ - ln -s vlc-android/$$VLC-2.2$$ ../vlc + prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc build: cd ../ && ANDROID_ABI=x86 ./compile.sh release buildjni: no @@ -243,8 +222,7 @@ builds: subdir: vlc-android srclibs: VLC-2.2@9e1c6ff forcevercode: yes - prebuild: sed -i '/ant/d' ../Makefile && \ - ln -s vlc-android/$$VLC-2.2$$ ../vlc + prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release buildjni: no @@ -255,8 +233,7 @@ builds: subdir: vlc-android srclibs: VLC-2.2@57cd36b forcevercode: yes - prebuild: sed -i '/ant/d' ../Makefile && \ - ln -s vlc-android/$$VLC-2.2$$ ../vlc + prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc build: cd ../ && ANDROID_ABI=mips ./compile.sh release buildjni: no @@ -266,8 +243,7 @@ builds: subdir: vlc-android srclibs: VLC-2.2@57cd36b forcevercode: yes - prebuild: sed -i '/ant/d' ../Makefile && \ - ln -s vlc-android/$$VLC-2.2$$ ../vlc + prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc build: cd ../ && ANDROID_ABI=x86 ./compile.sh release buildjni: no @@ -277,8 +253,7 @@ builds: subdir: vlc-android srclibs: VLC-2.2@57cd36b forcevercode: yes - prebuild: sed -i '/ant/d' ../Makefile && \ - ln -s vlc-android/$$VLC-2.2$$ ../vlc + prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release buildjni: no @@ -288,8 +263,7 @@ builds: subdir: vlc-android srclibs: VLC-2.2@f2db364 forcevercode: yes - prebuild: sed -i '/ant/d' ../Makefile && \ - ln -s vlc-android/$$VLC-2.2$$ ../vlc + prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc build: cd ../ && ANDROID_ABI=x86 ./compile.sh release buildjni: no @@ -299,8 +273,7 @@ builds: subdir: vlc-android srclibs: VLC-2.2@f2db364 forcevercode: yes - prebuild: sed -i '/ant/d' ../Makefile && \ - ln -s vlc-android/$$VLC-2.2$$ ../vlc + prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc build: cd ../ && ANDROID_ABI=armeabi ./compile.sh release buildjni: no @@ -310,8 +283,7 @@ builds: subdir: vlc-android srclibs: VLC-2.2@f2db364 forcevercode: yes - prebuild: sed -i '/ant/d' ../Makefile && \ - ln -s vlc-android/$$VLC-2.2$$ ../vlc + prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release buildjni: no @@ -321,8 +293,7 @@ builds: subdir: vlc-android srclibs: VLC-2.2@e731dc23a4f8ef6782c7cc2236bbbf41c034dad1 forcevercode: yes - prebuild: sed -i '/ant/d' ../Makefile && \ - ln -s vlc-android/$$VLC-2.2$$ ../vlc + prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc build: cd ../ && ANDROID_ABI=x86 ./compile.sh release buildjni: no @@ -332,8 +303,7 @@ builds: subdir: vlc-android srclibs: VLC-2.2@e731dc23a4f8ef6782c7cc2236bbbf41c034dad1 forcevercode: yes - prebuild: sed -i '/ant/d' ../Makefile && \ - ln -s vlc-android/$$VLC-2.2$$ ../vlc + prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc build: cd ../ && ANDROID_ABI=armeabi ./compile.sh release buildjni: no @@ -343,8 +313,7 @@ builds: subdir: vlc-android srclibs: VLC-2.2@e731dc23a4f8ef6782c7cc2236bbbf41c034dad1 forcevercode: yes - prebuild: sed -i '/ant/d' ../Makefile && \ - ln -s vlc-android/$$VLC-2.2$$ ../vlc + prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release buildjni: no @@ -354,8 +323,7 @@ builds: subdir: vlc-android srclibs: VLC-2.2@e33e5de forcevercode: yes - prebuild: sed -i '/ant/d' ../Makefile && \ - ln -s vlc-android/$$VLC-2.2$$ ../vlc + prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc build: cd ../ && ANDROID_ABI=x86 ./compile.sh release buildjni: no @@ -365,8 +333,7 @@ builds: subdir: vlc-android srclibs: VLC-2.2@e33e5de forcevercode: yes - prebuild: sed -i '/ant/d' ../Makefile && \ - ln -s vlc-android/$$VLC-2.2$$ ../vlc + prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc build: cd ../ && ANDROID_ABI=armeabi ./compile.sh release buildjni: no @@ -376,8 +343,7 @@ builds: subdir: vlc-android srclibs: VLC-2.2@e33e5de forcevercode: yes - prebuild: sed -i '/ant/d' ../Makefile && \ - ln -s vlc-android/$$VLC-2.2$$ ../vlc + prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release buildjni: no @@ -389,8 +355,7 @@ builds: subdir: vlc-android srclibs: VLC-2.2@036010e forcevercode: yes - prebuild: sed -i '/ant/d' ../Makefile && \ - ln -s vlc-android/$$VLC-2.2$$ ../vlc + prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc build: cd ../ && ANDROID_ABI=x86 ./compile.sh release buildjni: no @@ -402,8 +367,7 @@ builds: subdir: vlc-android srclibs: VLC-2.2@036010e forcevercode: yes - prebuild: sed -i '/ant/d' ../Makefile && \ - ln -s vlc-android/$$VLC-2.2$$ ../vlc + prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc build: cd ../ && ANDROID_ABI=armeabi ./compile.sh release buildjni: no @@ -415,8 +379,7 @@ builds: subdir: vlc-android srclibs: VLC-2.2@036010e forcevercode: yes - prebuild: sed -i '/ant/d' ../Makefile && \ - ln -s vlc-android/$$VLC-2.2$$ ../vlc + prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release buildjni: no @@ -426,8 +389,7 @@ builds: subdir: vlc-android srclibs: VLC-2.2@59409d5 forcevercode: yes - prebuild: sed -i '/ant/d' ../Makefile && \ - ln -s vlc-android/$$VLC-2.2$$ ../vlc + prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc build: cd ../ && ANDROID_ABI=x86 ./compile.sh release buildjni: no @@ -437,8 +399,7 @@ builds: subdir: vlc-android srclibs: VLC-2.2@59409d5 forcevercode: yes - prebuild: sed -i '/ant/d' ../Makefile && \ - ln -s vlc-android/$$VLC-2.2$$ ../vlc + prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc build: cd ../ && ANDROID_ABI=armeabi ./compile.sh release buildjni: no @@ -448,8 +409,7 @@ builds: subdir: vlc-android srclibs: VLC-2.2@59409d5 forcevercode: yes - prebuild: sed -i '/ant/d' ../Makefile && \ - ln -s vlc-android/$$VLC-2.2$$ ../vlc + prebuild: sed -i '/ant/d' ../Makefile && ln -s vlc-android/$$VLC-2.2$$ ../vlc build: cd ../ && ANDROID_ABI=armeabi-v7a ./compile.sh release buildjni: no From 593613043e0770dd5c702d8b5a9f00cff132d11a Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Thu, 23 Feb 2017 22:25:33 +0100 Subject: [PATCH 09/11] normalize Build TYPE_STRING data based on .txt Unfortunately, things like versionCode must be strings. That should be converted to be ints throughout. --- fdroidserver/metadata.py | 2 + tests/metadata/dump/org.videolan.vlc.yaml | 132 +++++++++++----------- 2 files changed, 68 insertions(+), 66 deletions(-) diff --git a/fdroidserver/metadata.py b/fdroidserver/metadata.py index 924d7d87..e10013d1 100644 --- a/fdroidserver/metadata.py +++ b/fdroidserver/metadata.py @@ -827,6 +827,8 @@ def post_metadata_parse(app): build[k] = ['yes'] else: build[k] = [] + elif flagtype(k) == TYPE_STRING and type(v) in (float, int): + build[k] = str(v) builds.append(build) if not app.get('Description'): diff --git a/tests/metadata/dump/org.videolan.vlc.yaml b/tests/metadata/dump/org.videolan.vlc.yaml index aa51aab8..4e0b5c9e 100644 --- a/tests/metadata/dump/org.videolan.vlc.yaml +++ b/tests/metadata/dump/org.videolan.vlc.yaml @@ -89,7 +89,7 @@ builds: subdir: vlc-android submodules: false target: null - versionCode: 110 + versionCode: '110' versionName: 0.0.11-ARMv7 - androidupdate: - . @@ -123,7 +123,7 @@ builds: subdir: vlc-android submodules: false target: null - versionCode: 111 + versionCode: '111' versionName: 0.0.11-ARM - androidupdate: - . @@ -157,7 +157,7 @@ builds: subdir: vlc-android submodules: false target: null - versionCode: 112 + versionCode: '112' versionName: 0.0.11-x86 - androidupdate: - . @@ -191,7 +191,7 @@ builds: subdir: vlc-android submodules: false target: null - versionCode: 113 + versionCode: '113' versionName: 0.0.11-mips - androidupdate: [] antcommands: [] @@ -224,7 +224,7 @@ builds: subdir: vlc-android submodules: false target: null - versionCode: 1301 + versionCode: '1301' versionName: 0.1.3-MIPS - androidupdate: [] antcommands: [] @@ -257,7 +257,7 @@ builds: subdir: vlc-android submodules: false target: null - versionCode: 1302 + versionCode: '1302' versionName: 0.1.3-x86 - androidupdate: [] antcommands: [] @@ -290,7 +290,7 @@ builds: subdir: vlc-android submodules: false target: null - versionCode: 1303 + versionCode: '1303' versionName: 0.1.3-ARM - androidupdate: [] antcommands: [] @@ -323,7 +323,7 @@ builds: subdir: vlc-android submodules: false target: null - versionCode: 1304 + versionCode: '1304' versionName: 0.1.3-ARMv7 - androidupdate: [] antcommands: [] @@ -355,7 +355,7 @@ builds: subdir: vlc-android submodules: false target: null - versionCode: 9002 + versionCode: '9002' versionName: 0.9.0 - androidupdate: [] antcommands: [] @@ -387,7 +387,7 @@ builds: subdir: vlc-android submodules: false target: null - versionCode: 9004 + versionCode: '9004' versionName: 0.9.0 - androidupdate: [] antcommands: [] @@ -419,7 +419,7 @@ builds: subdir: vlc-android submodules: false target: null - versionCode: 9102 + versionCode: '9102' versionName: 0.9.1 - androidupdate: [] antcommands: [] @@ -451,7 +451,7 @@ builds: subdir: vlc-android submodules: false target: null - versionCode: 9104 + versionCode: '9104' versionName: 0.9.1 - androidupdate: [] antcommands: [] @@ -483,7 +483,7 @@ builds: subdir: vlc-android submodules: false target: null - versionCode: 9502 + versionCode: '9502' versionName: 0.9.5 - androidupdate: [] antcommands: [] @@ -515,7 +515,7 @@ builds: subdir: vlc-android submodules: false target: null - versionCode: 9504 + versionCode: '9504' versionName: 0.9.5 - androidupdate: [] antcommands: [] @@ -547,7 +547,7 @@ builds: subdir: vlc-android submodules: false target: null - versionCode: 9602 + versionCode: '9602' versionName: 0.9.6 - androidupdate: [] antcommands: [] @@ -579,7 +579,7 @@ builds: subdir: vlc-android submodules: false target: null - versionCode: 9604 + versionCode: '9604' versionName: 0.9.6 - androidupdate: [] antcommands: [] @@ -611,7 +611,7 @@ builds: subdir: vlc-android submodules: false target: null - versionCode: 9702 + versionCode: '9702' versionName: 0.9.7 - androidupdate: [] antcommands: [] @@ -643,7 +643,7 @@ builds: subdir: vlc-android submodules: false target: null - versionCode: 9704 + versionCode: '9704' versionName: 0.9.7 - androidupdate: [] antcommands: [] @@ -675,7 +675,7 @@ builds: subdir: vlc-android submodules: false target: null - versionCode: 9711 + versionCode: '9711' versionName: 0.9.7.1 - androidupdate: [] antcommands: [] @@ -707,7 +707,7 @@ builds: subdir: vlc-android submodules: false target: null - versionCode: 9712 + versionCode: '9712' versionName: 0.9.7.1 - androidupdate: [] antcommands: [] @@ -739,7 +739,7 @@ builds: subdir: vlc-android submodules: false target: null - versionCode: 9714 + versionCode: '9714' versionName: 0.9.7.1 - androidupdate: [] antcommands: [] @@ -771,7 +771,7 @@ builds: subdir: vlc-android submodules: false target: null - versionCode: 9802 + versionCode: '9802' versionName: 0.9.8 - androidupdate: [] antcommands: [] @@ -803,7 +803,7 @@ builds: subdir: vlc-android submodules: false target: null - versionCode: 9803 + versionCode: '9803' versionName: 0.9.8 - androidupdate: [] antcommands: [] @@ -835,7 +835,7 @@ builds: subdir: vlc-android submodules: false target: null - versionCode: 9804 + versionCode: '9804' versionName: 0.9.8 - androidupdate: [] antcommands: [] @@ -867,7 +867,7 @@ builds: subdir: vlc-android submodules: false target: null - versionCode: 9902 + versionCode: '9902' versionName: 0.9.9 - androidupdate: [] antcommands: [] @@ -899,7 +899,7 @@ builds: subdir: vlc-android submodules: false target: null - versionCode: 9903 + versionCode: '9903' versionName: 0.9.9 - androidupdate: [] antcommands: [] @@ -931,7 +931,7 @@ builds: subdir: vlc-android submodules: false target: null - versionCode: 9904 + versionCode: '9904' versionName: 0.9.9 - androidupdate: [] antcommands: [] @@ -963,7 +963,7 @@ builds: subdir: vlc-android submodules: false target: null - versionCode: 10002 + versionCode: '10002' versionName: 0.9.10 - androidupdate: [] antcommands: [] @@ -995,7 +995,7 @@ builds: subdir: vlc-android submodules: false target: null - versionCode: 10003 + versionCode: '10003' versionName: 0.9.10 - androidupdate: [] antcommands: [] @@ -1027,7 +1027,7 @@ builds: subdir: vlc-android submodules: false target: null - versionCode: 10004 + versionCode: '10004' versionName: 0.9.10 - androidupdate: [] antcommands: [] @@ -1059,7 +1059,7 @@ builds: subdir: vlc-android submodules: false target: null - versionCode: 10006 + versionCode: '10006' versionName: 1.0.0 - androidupdate: [] antcommands: [] @@ -1091,7 +1091,7 @@ builds: subdir: vlc-android submodules: false target: null - versionCode: 10007 + versionCode: '10007' versionName: 1.0.0 - androidupdate: [] antcommands: [] @@ -1123,7 +1123,7 @@ builds: subdir: vlc-android submodules: false target: null - versionCode: 10008 + versionCode: '10008' versionName: 1.0.0 - androidupdate: [] antcommands: [] @@ -1155,7 +1155,7 @@ builds: subdir: vlc-android submodules: false target: null - versionCode: 10102 + versionCode: '10102' versionName: 1.0.1 - androidupdate: [] antcommands: [] @@ -1187,7 +1187,7 @@ builds: subdir: vlc-android submodules: false target: null - versionCode: 10103 + versionCode: '10103' versionName: 1.0.1 - androidupdate: [] antcommands: [] @@ -1219,7 +1219,7 @@ builds: subdir: vlc-android submodules: false target: null - versionCode: 10104 + versionCode: '10104' versionName: 1.0.1 - androidupdate: [] antcommands: [] @@ -1253,7 +1253,7 @@ builds: subdir: vlc-android submodules: false target: null - versionCode: 1010303 + versionCode: '1010303' versionName: 1.1.3 - androidupdate: [] antcommands: [] @@ -1287,7 +1287,7 @@ builds: subdir: vlc-android submodules: false target: null - versionCode: 1010304 + versionCode: '1010304' versionName: 1.1.3 - androidupdate: [] antcommands: [] @@ -1321,7 +1321,7 @@ builds: subdir: vlc-android submodules: false target: null - versionCode: 1010305 + versionCode: '1010305' versionName: 1.1.3 - androidupdate: [] antcommands: [] @@ -1355,7 +1355,7 @@ builds: subdir: vlc-android submodules: false target: null - versionCode: 1010503 + versionCode: '1010503' versionName: 1.1.5 - androidupdate: [] antcommands: [] @@ -1389,7 +1389,7 @@ builds: subdir: vlc-android submodules: false target: null - versionCode: 1010504 + versionCode: '1010504' versionName: 1.1.5 - androidupdate: [] antcommands: [] @@ -1423,7 +1423,7 @@ builds: subdir: vlc-android submodules: false target: null - versionCode: 1010505 + versionCode: '1010505' versionName: 1.1.5 - androidupdate: [] antcommands: [] @@ -1457,7 +1457,7 @@ builds: subdir: vlc-android submodules: false target: null - versionCode: 1010603 + versionCode: '1010603' versionName: 1.1.6 - androidupdate: [] antcommands: [] @@ -1491,7 +1491,7 @@ builds: subdir: vlc-android submodules: false target: null - versionCode: 1010604 + versionCode: '1010604' versionName: 1.1.6 - androidupdate: [] antcommands: [] @@ -1525,7 +1525,7 @@ builds: subdir: vlc-android submodules: false target: null - versionCode: 1010605 + versionCode: '1010605' versionName: 1.1.6 - androidupdate: [] antcommands: [] @@ -1559,7 +1559,7 @@ builds: subdir: vlc-android submodules: false target: null - versionCode: 1020003 + versionCode: '1020003' versionName: 1.2.0 - androidupdate: [] antcommands: [] @@ -1593,7 +1593,7 @@ builds: subdir: vlc-android submodules: false target: null - versionCode: 1020004 + versionCode: '1020004' versionName: 1.2.0 - androidupdate: [] antcommands: [] @@ -1627,7 +1627,7 @@ builds: subdir: vlc-android submodules: false target: null - versionCode: 1020005 + versionCode: '1020005' versionName: 1.2.0 - androidupdate: [] antcommands: [] @@ -1661,7 +1661,7 @@ builds: subdir: vlc-android submodules: false target: null - versionCode: 1020103 + versionCode: '1020103' versionName: 1.2.1 - androidupdate: [] antcommands: [] @@ -1695,7 +1695,7 @@ builds: subdir: vlc-android submodules: false target: null - versionCode: 1020104 + versionCode: '1020104' versionName: 1.2.1 - androidupdate: [] antcommands: [] @@ -1729,7 +1729,7 @@ builds: subdir: vlc-android submodules: false target: null - versionCode: 1020105 + versionCode: '1020105' versionName: 1.2.1 - androidupdate: [] antcommands: [] @@ -1763,7 +1763,7 @@ builds: subdir: vlc-android submodules: false target: null - versionCode: 1020203 + versionCode: '1020203' versionName: 1.2.2 - androidupdate: [] antcommands: [] @@ -1797,7 +1797,7 @@ builds: subdir: vlc-android submodules: false target: null - versionCode: 1020204 + versionCode: '1020204' versionName: 1.2.2 - androidupdate: [] antcommands: [] @@ -1831,7 +1831,7 @@ builds: subdir: vlc-android submodules: false target: null - versionCode: 1020205 + versionCode: '1020205' versionName: 1.2.2 - androidupdate: [] antcommands: [] @@ -1865,7 +1865,7 @@ builds: subdir: vlc-android submodules: false target: null - versionCode: 1020303 + versionCode: '1020303' versionName: 1.2.3 - androidupdate: [] antcommands: [] @@ -1899,7 +1899,7 @@ builds: subdir: vlc-android submodules: false target: null - versionCode: 1020304 + versionCode: '1020304' versionName: 1.2.3 - androidupdate: [] antcommands: [] @@ -1933,7 +1933,7 @@ builds: subdir: vlc-android submodules: false target: null - versionCode: 1020305 + versionCode: '1020305' versionName: 1.2.3 - androidupdate: [] antcommands: [] @@ -1967,7 +1967,7 @@ builds: subdir: vlc-android submodules: false target: null - versionCode: 1020403 + versionCode: '1020403' versionName: 1.2.4 - androidupdate: [] antcommands: [] @@ -2001,7 +2001,7 @@ builds: subdir: vlc-android submodules: false target: null - versionCode: 1020404 + versionCode: '1020404' versionName: 1.2.4 - androidupdate: [] antcommands: [] @@ -2035,7 +2035,7 @@ builds: subdir: vlc-android submodules: false target: null - versionCode: 1020405 + versionCode: '1020405' versionName: 1.2.4 - androidupdate: [] antcommands: [] @@ -2069,7 +2069,7 @@ builds: subdir: vlc-android submodules: false target: null - versionCode: 1020503 + versionCode: '1020503' versionName: 1.2.5 - androidupdate: [] antcommands: [] @@ -2103,7 +2103,7 @@ builds: subdir: vlc-android submodules: false target: null - versionCode: 1020504 + versionCode: '1020504' versionName: 1.2.5 - androidupdate: [] antcommands: [] @@ -2137,7 +2137,7 @@ builds: subdir: vlc-android submodules: false target: null - versionCode: 1020505 + versionCode: '1020505' versionName: 1.2.5 - androidupdate: [] antcommands: [] @@ -2171,7 +2171,7 @@ builds: subdir: vlc-android submodules: false target: null - versionCode: 1030003 + versionCode: '1030003' versionName: 1.2.6 - androidupdate: [] antcommands: [] @@ -2205,7 +2205,7 @@ builds: subdir: vlc-android submodules: false target: null - versionCode: 1030004 + versionCode: '1030004' versionName: 1.2.6 - androidupdate: [] antcommands: [] @@ -2239,7 +2239,7 @@ builds: subdir: vlc-android submodules: false target: null - versionCode: 1030005 + versionCode: '1030005' versionName: 1.2.6 comments: {} id: org.videolan.vlc From 388c336e7676ce8ee5b06f147caa72991c43a569 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Thu, 23 Feb 2017 22:32:08 +0100 Subject: [PATCH 10/11] build: ensure test is running on git commit that this code works with Since https://gitlab.com/fdroid/ci-test-app is a separate git repo, things with incompatible changes could get out of sync. Therefore, this test should specify which git commit is runs against. For example, the .fdroid.yml file is still a moving target. Just now, the keys had the spaces removed as part of this MR. --- tests/run-tests | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/run-tests b/tests/run-tests index 09f401c1..8a9b500a 100755 --- a/tests/run-tests +++ b/tests/run-tests @@ -144,6 +144,10 @@ $fdroid update echo_header 'run `fdroid build` in fresh git checkout from import.TestCase' cd $WORKSPACE/tests/tmp/importer +git remote update -p +git clean -fdx +# stick with known working commit, in case future commits break things for this code +git reset --hard cecf00c08aec56ae7a5eba444150c4d1ae868814 if [ -d $ANDROID_HOME/platforms/android-23 ]; then echo "build_tools = '`ls -1 $ANDROID_HOME/build-tools/ | sort -n | tail -1`'" > config.py echo "force_build_tools = True" >> config.py From 4e396216013f1e1b5a34dcb11f9c46b489eb9981 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Fri, 24 Feb 2017 10:28:00 +0100 Subject: [PATCH 11/11] provide warning if config items will not preserve order If a group of items are enclosed in {}, then that will be a Python set, which does not preserve order. To preserve order, the data must be either a tuple () or list []. --- fdroidserver/common.py | 6 ++++++ tests/run-tests | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/fdroidserver/common.py b/fdroidserver/common.py index 5e0419b0..5321b7b6 100644 --- a/fdroidserver/common.py +++ b/fdroidserver/common.py @@ -221,6 +221,12 @@ def read_config(opts, config_file='config.py'): logging.critical("Missing config file - is this a repo directory?") sys.exit(2) + for k in ('mirrors', 'install_list', 'uninstall_list', 'serverwebroot', 'servergitroot'): + if k in config: + if not type(config[k]) in (str, list, tuple): + logging.warn('"' + k + '" will be in random order!' + + ' Use () or [] brackets if order is important!') + # smartcardoptions must be a list since its command line args for Popen if 'smartcardoptions' in config: config['smartcardoptions'] = config['smartcardoptions'].split(' ') diff --git a/tests/run-tests b/tests/run-tests index 8a9b500a..14dcfd1a 100755 --- a/tests/run-tests +++ b/tests/run-tests @@ -131,7 +131,7 @@ cd $REPOROOT $fdroid init sed -i.tmp 's,^ *repo_description.*,repo_description = """获取已安装在您的设备上的应用的,' config.py -echo "mirrors = {'https://foo.bar/fdroid', 'http://secret.onion/fdroid'}" >> config.py +echo "mirrors = ('https://foo.bar/fdroid', 'http://secret.onion/fdroid')" >> config.py mkdir metadata cp $WORKSPACE/tests/urzip.apk repo/ cp $WORKSPACE/tests/metadata/info.guardianproject.urzip.txt metadata/