mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-09-13 22:42:29 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove support for 'bindir'

Browse source
This commit is contained in:
Daniel Martí 2014-01-27 23:43:28 +01:00
parent dfd0ecc740
commit 1b792c78de
2 changed files with 0 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
docs/fdroid.texi
View file

@ -1012,12 +1012,6 @@ to run maven inside that relative subdirectory.
Space-separated list of gradle tasks to be run before the assemble task Space-separated list of gradle tasks to be run before the assemble task
in a gradle project build. 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 @item antcommand=xxx
Specify an alternate ant command (target) instead of the default 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. 'release'. It can't be given any flags, such as the path to a build.xml.

4
fdroidserver/build.py
View file

@ -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) raise BuildException("Build failed for %s:%s" % (app['id'], thisbuild['version']), p.stdout)
print "Successfully built version " + thisbuild['version'] + ' of ' + app['id'] 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': if thisbuild['type'] == 'maven':
stdout_apk = '\n'.join([ stdout_apk = '\n'.join([
line for line in p.stdout.splitlines() if any(a in line for a in ('.apk','.ap_'))]) line for line in p.stdout.splitlines() if any(a in line for a in ('.apk','.ap_'))])