mirror of
https://gitlab.com/fdroid/fdroidserver.git
synced 2024-09-19 03:30:12 +02:00
Merge branch 'master' of git://gitorious.org/f-droid/fdroidserver
This commit is contained in:
commit
9fa32fe244
@ -350,19 +350,14 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, extlib_dir, tmp_dir,
|
||||
m = re.match(r".*^\[INFO\] Creating additional unsigned apk file .*/([^/]+)\.apk",
|
||||
output, re.S|re.M)
|
||||
if not m:
|
||||
# This format is found in com.github.mobile for example...
|
||||
m = re.match(r".*^\[INFO\] [^$]*aapt \[package,[^$]*" + app['id'] + "/app/target/([^$]+)\.ap_\]",
|
||||
output, re.S|re.M)
|
||||
if not m:
|
||||
# This format is found in com.yubico.yubitotp and com.botbrew.basil for example...
|
||||
m = re.match(r".*^\[INFO\] [^$]*aapt \[package,[^$]*" + app['id'] + "/" + thisbuild['bindir'] + "/([^$]+)\.ap_,",
|
||||
# This format is found in com.github.mobile, com.yubico.yubitotp and com.botbrew.basil for example...
|
||||
m = re.match(r".*^\[INFO\] [^$]*aapt \[package,[^$]*" + app['id'] + "/" + thisbuild['bindir'] + "/([^/]+)\.ap[_k][,\]]",
|
||||
output, re.S|re.M)
|
||||
if not m:
|
||||
print output
|
||||
raise BuildException('Failed to find output')
|
||||
src = m.group(1)
|
||||
src = os.path.join(bindir, src) + '.apk'
|
||||
#[INFO] Installing /home/ciaran/fdroidserver/tmp/mainline/application/target/callerid-1.0-SNAPSHOT.apk
|
||||
else:
|
||||
src = re.match(r".*^.*Creating (.+) for release.*$.*", output,
|
||||
re.S|re.M).group(1)
|
||||
|
Loading…
Reference in New Issue
Block a user