From 1b792c78dea67dcff05b67ec25685efc1906e026 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Daniel=20Mart=C3=AD?= Date: Mon, 27 Jan 2014 23:43:28 +0100 Subject: [PATCH] Remove support for 'bindir' --- docs/fdroid.texi | 6 ------ fdroidserver/build.py | 4 ---- 2 files changed, 10 deletions(-) diff --git a/docs/fdroid.texi b/docs/fdroid.texi index 0ec5eba5..56ec8c19 100644 --- 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= -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 97e52c48..c2581f9a 100644 --- 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_'))]) -- 2.30.2