Remove support for 'bindir'

diff --git a/docs/fdroid.texi b/docs/fdroid.texi
index 0ec5eba5b6360ecf4c659ac064cb5535b1026320..56ec8c1958a206a0abdfa3b328766b81a4bcf23a 100644 (file)
--- a/docs/fdroid.texi
+++ b/docs/fdroid.texi
@@ -1012,12 +1012,6 @@ to run maven inside that relative subdirectory.
 Space-separated list of gradle tasks to be run before the assemble task
 in a gradle project build.
 
-@item bindir=<path>
-Normally the build output (apk) is expected to be in the bin
-subdirectory below the ant build files. If the project is configured
-to put it elsewhere, that can be specified here, relative to the base
-of the checked out repo. Not yet implemented for gradle.
-
 @item antcommand=xxx
 Specify an alternate ant command (target) instead of the default
 'release'. It can't be given any flags, such as the path to a build.xml.

diff --git a/fdroidserver/build.py b/fdroidserver/build.py
index 97e52c481c99324a9aa547c42cb40629314332d3..c2581f9ad6641e45d0895b38982237f3bc44fd64 100644 (file)
--- a/fdroidserver/build.py
+++ b/fdroidserver/build.py
@@ -631,10 +631,6 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d
         raise BuildException("Build failed for %s:%s" % (app['id'], thisbuild['version']), p.stdout)
     print "Successfully built version " + thisbuild['version'] + ' of ' + app['id']
 
-    # Find the apk name in the output...
-    if 'bindir' in thisbuild:
-        bindir = os.path.join(build_dir, thisbuild['bindir'])
-
     if thisbuild['type'] == 'maven':
         stdout_apk = '\n'.join([
             line for line in p.stdout.splitlines() if any(a in line for a in ('.apk','.ap_'))])