From 6d9982dc0017ab23d2a612a9912ec2606536c05c Mon Sep 17 00:00:00 2001 From: David Black Date: Mon, 14 Jan 2013 11:34:13 +0000 Subject: [PATCH 1/5] one srclib, k9Mail via jberkel --- fdroidserver/common.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/fdroidserver/common.py b/fdroidserver/common.py index 4955c4a3..34685273 100644 --- a/fdroidserver/common.py +++ b/fdroidserver/common.py @@ -1448,6 +1448,17 @@ def getsrclib(spec, extlib_dir, sdk_path, basepath=False): return sdir return libdir + if name == 'K9Mail-XOAuth': + sdir = os.path.join(extlib_dir, 'K9Mail-XOAUTH') + vcs = getvcs('git', + 'https://github.com/jberkel/k9mail.git', sdir, sdk_path) + vcs.gotorevision(ref) + if subprocess.call([os.path.join(sdk_path, 'tools', 'android'), + 'update', 'project', '-p', + sdir]) != 0: + raise BuildException('Error updating KMail-XOAUTH project') + return sdir + raise BuildException('Unknown srclib ' + name) From f7ecd0cd235b9a319cdd1b77dcbd4fe183863537 Mon Sep 17 00:00:00 2001 From: David Black Date: Mon, 14 Jan 2013 13:20:42 +0000 Subject: [PATCH 2/5] one srclibs RootTools --- fdroidserver/common.py | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/fdroidserver/common.py b/fdroidserver/common.py index 34685273..742d480c 100644 --- a/fdroidserver/common.py +++ b/fdroidserver/common.py @@ -1459,6 +1459,22 @@ def getsrclib(spec, extlib_dir, sdk_path, basepath=False): raise BuildException('Error updating KMail-XOAUTH project') return sdir + if name == 'RootTools': + sdir = os.path.join(extlib_dir, 'RootTools') + vcs = getvcs('svn', + 'http://roottools.googlecode.com/svn/trunk/Stable/RootTools-sdk3-generic', sdir, sdk_path) + vcs.gotorevision(ref) + pp = open(os.path.join(sdir, 'project.properties'), 'w') + pp.write('android.library=true\n') + pp.write('target=android-16\n') + pp.close() + if subprocess.call([os.path.join(sdk_path, 'tools', 'android'), + 'update', 'project', '-p', + sdir]) != 0: + raise BuildException('Error updating RootTools project') + os.remove(os.path.join(sdir, 'android.jar')) + return sdir + raise BuildException('Unknown srclib ' + name) From 6ba6a32559391b0f4d86bff7b85e8c2d2db2e0d5 Mon Sep 17 00:00:00 2001 From: David Black Date: Fri, 18 Jan 2013 12:08:13 +0000 Subject: [PATCH 3/5] typo fix --- fdroidserver/common.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fdroidserver/common.py b/fdroidserver/common.py index 742d480c..b1e0d108 100644 --- a/fdroidserver/common.py +++ b/fdroidserver/common.py @@ -1448,7 +1448,7 @@ def getsrclib(spec, extlib_dir, sdk_path, basepath=False): return sdir return libdir - if name == 'K9Mail-XOAuth': + if name == 'K9Mail-XOAUTH': sdir = os.path.join(extlib_dir, 'K9Mail-XOAUTH') vcs = getvcs('git', 'https://github.com/jberkel/k9mail.git', sdir, sdk_path) From a363d2ea46e9af6e02f0e4a648604f69609ffb9c Mon Sep 17 00:00:00 2001 From: David Black Date: Sun, 20 Jan 2013 13:42:57 +0000 Subject: [PATCH 4/5] OsmAnd srclibs --- fdroidserver/common.py | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/fdroidserver/common.py b/fdroidserver/common.py index b1e0d108..a77fc11c 100644 --- a/fdroidserver/common.py +++ b/fdroidserver/common.py @@ -1475,6 +1475,23 @@ def getsrclib(spec, extlib_dir, sdk_path, basepath=False): os.remove(os.path.join(sdir, 'android.jar')) return sdir + if name == 'OsmAnd-tools': + sdir = os.path.join(extlib_dir, 'OsmAnd-tools') + vcs = getvcs('git', + 'https://github.com/osmandapp/OsmAnd-tools', sdir, sdk_path) + vcs.gotorevision(ref) + libdir = os.path.join(sdir, 'OsmAndMapCreator') + if basepath: + return sdir + return libdir + + if name == 'OsmAnd-core': + sdir = os.path.join(extlib_dir, 'OsmAnd-core') + vcs = getvcs('git', + 'https://github.com/osmandapp/OsmAnd-core', sdir, sdk_path) + vcs.gotorevision(ref) + return sdir + raise BuildException('Unknown srclib ' + name) From 35dca09929a04e30db8ffdba79f3818e899c6d56 Mon Sep 17 00:00:00 2001 From: David Black Date: Sun, 20 Jan 2013 14:24:45 +0000 Subject: [PATCH 5/5] use root of OsmAnd-tools --- fdroidserver/common.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/fdroidserver/common.py b/fdroidserver/common.py index a77fc11c..0f424631 100644 --- a/fdroidserver/common.py +++ b/fdroidserver/common.py @@ -1480,10 +1480,7 @@ def getsrclib(spec, extlib_dir, sdk_path, basepath=False): vcs = getvcs('git', 'https://github.com/osmandapp/OsmAnd-tools', sdir, sdk_path) vcs.gotorevision(ref) - libdir = os.path.join(sdir, 'OsmAndMapCreator') - if basepath: - return sdir - return libdir + return sdir if name == 'OsmAnd-core': sdir = os.path.join(extlib_dir, 'OsmAnd-core')