diff --git a/checkmarket.py b/checkmarket.py new file mode 100755 index 00000000..47a212bf --- /dev/null +++ b/checkmarket.py @@ -0,0 +1,32 @@ +#!/usr/bin/env python2 +# -*- coding: utf-8 -*- +# +# checkmarket.py - part of the FDroid server tools +# Copyright (C) 2011, Ciaran Gultnieks, ciaran@ciarang.com +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . + +import subprocess + +#Read configuration... +repo_name = None +repo_description = None +repo_icon = None +repo_url = None +execfile('config.py') + +subprocess.call('./run.sh ' + market_user + ' ' + market_password + + ' ' + market_deviceid, + cwd='marketcheck', shell=True) + diff --git a/common.py b/common.py index 148a383b..43630e1b 100644 --- a/common.py +++ b/common.py @@ -91,7 +91,7 @@ class vcs_git(vcs): def reset(self, rev=None): if rev is None: - rev = 'HEAD' + rev = 'origin' if subprocess.call(['git', 'reset', '--hard', rev], cwd=self.local) != 0: print "Git reset failed" diff --git a/config.sample.py b/config.sample.py index bdfc022d..e6615dab 100644 --- a/config.sample.py +++ b/config.sample.py @@ -39,4 +39,9 @@ keydname = "CN=Birdman, OU=Cell, O=Alcatraz, L=Alcatraz, S=California, C=US" keyaliases = {} keyaliases['com.example.app'] = 'example' +#For the market checker, which is used only to determine a 'current' version +#that the developer recommends, for those apps that are there. +market_user = "" +market_password = "" +market_deviceid = "" diff --git a/marketcheck/test.java b/marketcheck/test.java index 68d1ddfa..28431806 100644 --- a/marketcheck/test.java +++ b/marketcheck/test.java @@ -20,13 +20,14 @@ class test { */ public static void main(String[] args) { try { - if(args.length < 2) { + if(args.length < 3) { System.out.println("Parameters :\n" + - "email password"); + "email password deviceid"); return; } String login = args[0]; String password = args[1]; + String deviceid = args[2]; // Get a list of apps we want to check - i.e. those that // we have metadata files for... @@ -45,7 +46,7 @@ class test { MarketSession session = new MarketSession(); - session.getContext().setAndroidId("353027030727248"); + session.getContext().setAndroidId(deviceid); session.getContext().setDeviceAndSdkVersion("sapphire:7"); System.out.println("Login..."); session.login(login,password); diff --git a/metadata/net.osmand.plus.txt b/metadata/net.osmand.plus.txt index 49809a2f..bb7c09a1 100644 --- a/metadata/net.osmand.plus.txt +++ b/metadata/net.osmand.plus.txt @@ -20,6 +20,7 @@ Build Version:0.6.7,37,v0.6.7,subdir=OsmAnd,encoding=utf-8,prebuild=mkdir raw,pa Build Version:0.6.8,39,v0.6.8,subdir=OsmAnd,encoding=utf-8,prebuild=mkdir raw Build Version:0.6.8',41,!No corresponding source for whatever this is Build Version:0.6.9,42,v0.6.9,subdir=OsmAnd,encoding=utf-8,prebuild=mkdir raw +Build Version:0.6.9',43,!No corresponding source for whatever this is -Market Version:0.6.9 -Market Version Code:42 +Market Version:0.6.9' +Market Version Code:43 diff --git a/metadata/org.coolreader.txt b/metadata/org.coolreader.txt index cfb3abd5..e6e338ca 100644 --- a/metadata/org.coolreader.txt +++ b/metadata/org.coolreader.txt @@ -46,7 +46,7 @@ Build Version:3.0.53-14,259,cr3.0.53-14,subdir=android,rm=android/build.properti Build Version:3.0.53-18,263,c555ecd66d18b218fb255733c8b33a0825992f76,subdir=android,rm=android/build.properties,buildjni=yes Build Version:3.0.53-19,264,cr3.0.53-19,subdir=android,rm=android/build.properties,buildjni=yes Build Version:3.0.54-5,275,cr3.0.54-5,subdir=android,rm=android/build.properties,buildjni=yes +Build Version:3.0.54-9,279,cr3.0.54-9,subdir=android,rm=android/build.properties,buildjni=yes -Market Version:3.0.54-5 -Market Version Code:275 -Build Version:3.0.53-14,259,cr3.0.53-14,subdir=android,rm=android/build.properties,buildjni=yes +Market Version:3.0.54-9 +Market Version Code:279 diff --git a/metadata/org.eehouse.android.xw4.txt b/metadata/org.eehouse.android.xw4.txt index 900295b4..e18983b2 100644 --- a/metadata/org.eehouse.android.xw4.txt +++ b/metadata/org.eehouse.android.xw4.txt @@ -17,6 +17,8 @@ Repo:git://xwords.git.sourceforge.net/gitroot/xwords/xwords #Build Version:4.4 beta 26,19,!Missing resources? android_beta_26,subdir=xwords4/android/XWords4 Build Version:4.4 beta 33,26,android_beta_33,subdir=xwords4/android/XWords4 Build Version:4.4 beta 38,30,android_beta_38,subdir=xwords4/android/XWords4 +Build Version:4.4 beta 39,31,android_beta_39,subdir=xwords4/android/XWords4,target=android-8,prebuild=cd .. && ./scripts/genvers.sh >ant_out.txt -Market Version:4.4 beta 38 -Market Version Code:30 + +Market Version:4.4 beta 39 +Market Version Code:31 diff --git a/metadata/org.linphone.txt b/metadata/org.linphone.txt index dfefca70..9eb77350 100644 --- a/metadata/org.linphone.txt +++ b/metadata/org.linphone.txt @@ -6,5 +6,5 @@ Summary:SIP (VOIP) client Description: A SIP (VOIP) client. . -Market Version:1.2.1 -Market Version Code:1210 +Market Version:1.2.2 +Market Version Code:1220 diff --git a/metadata/tuioDroid.impl.txt b/metadata/tuioDroid.impl.txt index 46187fca..2152f44e 100644 --- a/metadata/tuioDroid.impl.txt +++ b/metadata/tuioDroid.impl.txt @@ -15,3 +15,5 @@ Repo:http://tuiodroid.googlecode.com/svn/trunk/ Build Version:1.0,4,28,subdir=TUIOdroid,prebuild=rm -rf bin && rm -rf gen,target=android-11 +Market Version:1.0 +Market Version Code:4 diff --git a/wp-fdroid/wp-fdroid.php b/wp-fdroid/wp-fdroid.php index 7d1b1dfc..2168d76c 100644 --- a/wp-fdroid/wp-fdroid.php +++ b/wp-fdroid/wp-fdroid.php @@ -66,7 +66,6 @@ class FDroid global $wp_query,$wp_rewrite; $this->lazyinit(); - // Init local query vars foreach($this->queryvars(array()) as $qv) { if(array_key_exists($qv,$wp_query->query_vars)) { @@ -95,6 +94,7 @@ class FDroid $out.=$this->get_apps($query_vars); } + return $out; } @@ -330,9 +330,8 @@ class FDroid } $total++; } + } - } - $out.=$outputter->outputEnd(); $numpages = ceil((float)$total/$outputter->perpage);