From 21d771595ea4fcfc0c723c0cf7e30ea88e87ce0f Mon Sep 17 00:00:00 2001 From: David Black Date: Sat, 15 Dec 2012 15:05:43 +0000 Subject: [PATCH 1/5] three srclibs numberpicker, libpagekite, openssl (guardianproj) --- fdroidserver/common.py | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/fdroidserver/common.py b/fdroidserver/common.py index 0f6803a7..ad281248 100644 --- a/fdroidserver/common.py +++ b/fdroidserver/common.py @@ -1321,6 +1321,33 @@ def getsrclib(spec, extlib_dir, sdk_path, basepath=False): return sdir return libdir + if name == 'LibPageKite': + sdir = os.path.join(extlib_dir, 'LibPageKite') + vcs = getvcs('git', + 'https://github.com/pagekite/libpagekite.git', sdir, sdk_path) + vcs.gotorevision(ref) + return sdir + + if name == 'OpenSSL-GP': + sdir = os.path.join(extlib_dir, 'OpenSSL-GP') + vcs = getvcs('git', + 'https://github.com/guardianproject/openssl-android.git', sdir, sdk_path) + vcs.gotorevision(ref) + return sdir + + if name == 'NumberPicker-SimonVT': + sdir = os.path.join(extlib_dir, 'NumberPicker-SimonVT') + vcs = getvcs('git', + 'https://github.com/SimonVT/android-numberpicker.git', sdir, sdk_path) + vcs.gotorevision(ref) + libdir = os.path.join(sdir, 'library') + if subprocess.call([os.path.join(sdk_path, 'tools', 'android'), + 'update', 'project', '-p', + libdir]) != 0: + raise BuildException('Error updating NumberPicker-SimonVT project') + if basepath: + return sdir + raise BuildException('Unknown srclib ' + name) From 95f3c3c72cba08fa756933377b2c0e216ab43d68 Mon Sep 17 00:00:00 2001 From: David Black Date: Sat, 15 Dec 2012 15:29:37 +0000 Subject: [PATCH 2/5] fix numberpicker srlib --- fdroidserver/common.py | 1 + 1 file changed, 1 insertion(+) diff --git a/fdroidserver/common.py b/fdroidserver/common.py index ad281248..2dc70271 100644 --- a/fdroidserver/common.py +++ b/fdroidserver/common.py @@ -1347,6 +1347,7 @@ def getsrclib(spec, extlib_dir, sdk_path, basepath=False): raise BuildException('Error updating NumberPicker-SimonVT project') if basepath: return sdir + return libdir raise BuildException('Unknown srclib ' + name) From da7162f5aa3a5022b2be75e25330a8de74eaa0e1 Mon Sep 17 00:00:00 2001 From: David Black Date: Sat, 22 Dec 2012 16:27:50 +0000 Subject: [PATCH 3/5] two srclibs: github api and comic viewer --- fdroidserver/common.py | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/fdroidserver/common.py b/fdroidserver/common.py index 2dc70271..f63d97c5 100644 --- a/fdroidserver/common.py +++ b/fdroidserver/common.py @@ -1349,6 +1349,24 @@ def getsrclib(spec, extlib_dir, sdk_path, basepath=False): return sdir return libdir + if name == 'ComicViewer': + sdir = os.path.join(extlib_dir, 'ComicViewer') + vcs = getvcs('git', + 'https://github.com/tcoxon/ComicViewer.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 ComicViewer project') + return sdir + + if name == 'GitHubAPI': + sdir = os.path.join(extlib_dir, 'GitHubAPI') + vcs = getvcs('git', + 'git://git.eclipse.org/gitroot/egit/egit-github.git', sdir, sdk_path) + vcs.gotorevision(ref) + return sdir + raise BuildException('Unknown srclib ' + name) From 01d3b321262a01095ddf32b07119c47ab09e1d47 Mon Sep 17 00:00:00 2001 From: David Black Date: Wed, 26 Dec 2012 17:41:57 +0000 Subject: [PATCH 4/5] two srclibs: busybox and busybox configs --- fdroidserver/common.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/fdroidserver/common.py b/fdroidserver/common.py index f63d97c5..8c41f292 100644 --- a/fdroidserver/common.py +++ b/fdroidserver/common.py @@ -1367,6 +1367,20 @@ def getsrclib(spec, extlib_dir, sdk_path, basepath=False): vcs.gotorevision(ref) return sdir + if name == 'Busybox': + sdir = os.path.join(extlib_dir, 'Busybox') + vcs = getvcs('git', + 'git://busybox.net/busybox.git', sdir, sdk_path) + vcs.gotorevision(ref) + return sdir + + if name == 'BusyboxConfigs': + sdir = os.path.join(extlib_dir, 'BusyboxConfigs') + vcs = getvcs('git', + 'https://github.com/tias/android-busybox-ndk.git', sdir, sdk_path) + vcs.gotorevision(ref) + return sdir + raise BuildException('Unknown srclib ' + name) From 36276925644794d66f8938844f81b80902ac9582 Mon Sep 17 00:00:00 2001 From: David Black Date: Thu, 3 Jan 2013 17:48:00 +0000 Subject: [PATCH 5/5] new srclib AppMsg --- fdroidserver/common.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/fdroidserver/common.py b/fdroidserver/common.py index 8c41f292..84d15fc0 100644 --- a/fdroidserver/common.py +++ b/fdroidserver/common.py @@ -1381,6 +1381,20 @@ def getsrclib(spec, extlib_dir, sdk_path, basepath=False): vcs.gotorevision(ref) return sdir + if name == 'AppMsg': + sdir = os.path.join(extlib_dir, 'AppMsg') + vcs = getvcs('git', + 'https://github.com/johnkil/Android-AppMsg.git', sdir, sdk_path) + vcs.gotorevision(ref) + libdir = os.path.join(sdir, 'library') + if subprocess.call([os.path.join(sdk_path, 'tools', 'android'), + 'update', 'project', '-p', + libdir]) != 0: + raise BuildException('Error updating AppMsg project') + if basepath: + return sdir + return libdir + raise BuildException('Unknown srclib ' + name)