From: David Black <david8black@gmail.com>
Date: Sun, 28 Apr 2013 17:52:27 +0000 (+0100)
Subject: PrettyTime srclib
X-Git-Tag: 0.1~629
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=48670b9e6c1756e3ed33b09ae0319275fe93ca8f;p=fdroidserver.git

PrettyTime srclib
---

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index 3b08154f..18c593d7 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -1434,7 +1434,10 @@ def getsrclib(spec, extlib_dir, sdk_path, basepath=False):
         vcs = getvcs('git',
 	    'git://git.eclipse.org/gitroot/egit/egit-github.git', sdir, sdk_path)
         vcs.gotorevision(ref)
-        return sdir
+        libdir = os.path.join(sdir, 'org.eclipse.egit.github.core')
+        if basepath:
+            return sdir
+        return libdir
 
     if name == 'Busybox':
         sdir = os.path.join(extlib_dir, 'Busybox')
@@ -1710,6 +1713,8 @@ def getsrclib(spec, extlib_dir, sdk_path, basepath=False):
 	    'https://github.com/timmolter/XChart', sdir, sdk_path)
         vcs.gotorevision(ref)
         libdir = os.path.join(sdir, 'xchart')
+        if basepath:
+            return sdir
         return libdir
 
     if name == 'Libxmp':
@@ -1773,6 +1778,13 @@ def getsrclib(spec, extlib_dir, sdk_path, basepath=False):
             raise BuildException('Error updating QuickdicUtils project')
         return sdir
 
+    if name == 'PrettyTime':
+        sdir = os.path.join(extlib_dir, 'PrettyTime')
+        vcs = getvcs('git',
+	    'https://github.com/ocpsoft/prettytime', sdir, sdk_path)
+        vcs.gotorevision(ref)
+        return sdir
+
     raise BuildException('Unknown srclib ' + name)