mirror of
https://gitlab.com/fdroid/fdroidserver.git
synced 2024-10-04 02:00:11 +02:00
Added the ability to expect build output in a different place
This commit is contained in:
parent
d5cc9e2523
commit
f863c2225c
4
README
4
README
@ -102,6 +102,10 @@ configuration to the build. These are:
|
|||||||
building, but there is a special case for SVN repositories
|
building, but there is a special case for SVN repositories
|
||||||
where the URL is specified with a * at the end. See the
|
where the URL is specified with a * at the end. See the
|
||||||
documentation for the Repo field for more information.
|
documentation for the Repo field for more information.
|
||||||
|
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..
|
||||||
oldsdkloc=yes - The sdk location in the repo is in an old format
|
oldsdkloc=yes - The sdk location in the repo is in an old format
|
||||||
target=<target> - Specifies a particular SDK target, when the source doesn't
|
target=<target> - Specifies a particular SDK target, when the source doesn't
|
||||||
rm=<relpath> - Specifies the relative path of file to delete before the
|
rm=<relpath> - Specifies the relative path of file to delete before the
|
||||||
|
6
build.py
6
build.py
@ -163,9 +163,13 @@ for app in apps:
|
|||||||
sys.exit(1)
|
sys.exit(1)
|
||||||
|
|
||||||
# Find the apk name in the output...
|
# Find the apk name in the output...
|
||||||
|
if thisbuild.has_key('bindir'):
|
||||||
|
bindir = os.path.join(build_dir, thisbuild['bindir'])
|
||||||
|
else:
|
||||||
|
bindir = os.path.join(root_dir, 'bin')
|
||||||
src = re.match(r".*^.*Creating (\S+) for release.*$.*", output,
|
src = re.match(r".*^.*Creating (\S+) for release.*$.*", output,
|
||||||
re.S|re.M).group(1)
|
re.S|re.M).group(1)
|
||||||
src = os.path.join(os.path.join(root_dir, 'bin'), src)
|
src = os.path.join(bindir, src)
|
||||||
|
|
||||||
# By way of a sanity check, make sure the version and version
|
# By way of a sanity check, make sure the version and version
|
||||||
# code in our new apk match what we expect...
|
# code in our new apk match what we expect...
|
||||||
|
Loading…
Reference in New Issue
Block a user