Merge branch 'master' of git://gitorious.org/f-droid/fdroidserver

docs/fdroid.texi

@@ -436,6 +436,7 @@ The following sections describe the fields recognised within the file.
 * Disabled::
 * Requires Root::
 * Update Check Mode::
+* Auto Update Mode::
 * Current Version::
 * Current Version Code::
 @end menu
@@ -908,6 +909,36 @@ it's appropriate. (Also, it currently only works for git repositories).
 @code{Market} - This is being phased out and should not be used!
 @end itemize
 
+@node Auto Update Mode
+@section Auto Update Mode
+
+@cindex Auto Update Mode
+
+This determines the method using for auto-generating new builds new releases are
+available - in other words, adding a new Build Version line to the metadata.
+This happens in conjunction with the 'Update Check Mode' functionality - i.e.
+when an update is detected by that, it is also processed by this.
+
+Valid modes are:
+
+@itemize
+@item
+@code{None} - No auto-updating is done
+@item
+@code{Version} - Identifies the target commit (i.e. tag) for the new build based
+on the given version specification, which is simply text in which %v and %c are
+replaced with the required version name and version code respectively.
+
+For example, if an app always has a tag "2.7.2" corresponding to version 2.7.2,
+you would simply specify "Version %v". If an app always has a tag "ver_1234"
+for a version with version code 1234, you would specify "Version ver_%c".
+
+Additionally, a suffix can be added to the version name at this stage, to
+differentiate F-Droid's build from the original. Continuing the first example
+above, you would specify that as "Version +-fdroid %v" - "-fdroid" is the suffix.
+@end itemize
+
+
 @node Current Version
 @section Current Version
 

fdroidserver/build.py

@@ -233,7 +233,8 @@ def build_server(app, thisbuild, vcs, build_dir, output_dir, sdk_path, force):
             raise BuildException("Build.py failed on server for %s:%s" % (app['id'], thisbuild['version']), output.strip(), error.strip())
 
         # Retrieve the built files...
-        if(force):
+        print "Retrieving build output..."
+        if force:
             ftp.chdir('/home/vagrant/tmp')
         else:
             ftp.chdir('/home/vagrant/unsigned')

fdroidserver/common.py

@@ -1170,6 +1170,17 @@ def getsrclib(spec, extlib_dir, sdk_path, basepath=False):
         vcs.gotorevision(ref)
         return sdir
 
+    if name == 'FinfAgent':
+        sdir = os.path.join(extlib_dir, 'FinfAgent')
+        vcs = getvcs('git',
+	    'https://github.com/uniqdom/FinfAgent.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 FinfAgent project')
+        return sdir
+
     if name == 'MobAdMob':
         sdir = os.path.join(extlib_dir, 'MobAdMob')
         vcs = getvcs('git',