kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-11-09 17:00:12 +01:00
Code Activity

Merge branch 'master' of git://gitorious.org/f-droid/fdroidserver

Browse Source
This commit is contained in:
David Black 2013-03-07 16:12:51 +00:00
commit 9fa32fe244
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
fdroidserver/build.py
View File

@ -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", m = re.match(r".*^\[INFO\] Creating additional unsigned apk file .*/([^/]+)\.apk",
output, re.S|re.M) output, re.S|re.M)
if not m: if not m:
# This format is found in com.github.mobile for example... # 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'] + "/app/target/([^$]+)\.ap_\]", m = re.match(r".*^\[INFO\] [^$]*aapt \[package,[^$]*" + app['id'] + "/" + thisbuild['bindir'] + "/([^/]+)\.ap[_k][,\]]",
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_,",
output, re.S|re.M) output, re.S|re.M)
if not m: if not m:
print output print output
raise BuildException('Failed to find output') raise BuildException('Failed to find output')
src = m.group(1) src = m.group(1)
src = os.path.join(bindir, src) + '.apk' src = os.path.join(bindir, src) + '.apk'
#[INFO] Installing /home/ciaran/fdroidserver/tmp/mainline/application/target/callerid-1.0-SNAPSHOT.apk
else: else:
src = re.match(r".*^.*Creating (.+) for release.*$.*", output, src = re.match(r".*^.*Creating (.+) for release.*$.*", output,
re.S|re.M).group(1) re.S|re.M).group(1)