mirror of
https://gitlab.com/fdroid/fdroidserver.git
synced 2024-09-17 10:40:12 +02:00
Always store ant/maven apk location output for regex
This commit is contained in:
parent
890a1adb6f
commit
3c7ac336ae
@ -434,6 +434,7 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d
|
|||||||
else:
|
else:
|
||||||
output = ''
|
output = ''
|
||||||
error = ''
|
error = ''
|
||||||
|
output_apk = ''
|
||||||
# Build the release...
|
# Build the release...
|
||||||
if 'maven' in thisbuild:
|
if 'maven' in thisbuild:
|
||||||
print "Building Maven project..."
|
print "Building Maven project..."
|
||||||
@ -459,6 +460,8 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d
|
|||||||
sys.stdout.flush()
|
sys.stdout.flush()
|
||||||
else:
|
else:
|
||||||
output += line
|
output += line
|
||||||
|
if 'apk' in line:
|
||||||
|
output_apk += line
|
||||||
for line in iter(p.stderr.readline, ''):
|
for line in iter(p.stderr.readline, ''):
|
||||||
if verbose:
|
if verbose:
|
||||||
# Output directly to console
|
# Output directly to console
|
||||||
@ -542,6 +545,8 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d
|
|||||||
sys.stdout.flush()
|
sys.stdout.flush()
|
||||||
else:
|
else:
|
||||||
output += line
|
output += line
|
||||||
|
if 'apk' in line:
|
||||||
|
output_apk += line
|
||||||
for line in iter(p.stderr.readline, ''):
|
for line in iter(p.stderr.readline, ''):
|
||||||
if verbose:
|
if verbose:
|
||||||
# Output directly to console
|
# Output directly to console
|
||||||
@ -576,14 +581,14 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d
|
|||||||
src = os.path.join(bindir, src)
|
src = os.path.join(bindir, src)
|
||||||
elif 'maven' in thisbuild:
|
elif 'maven' in thisbuild:
|
||||||
m = re.match(r".*^\[INFO\] .*apkbuilder.*/([^/]*)\.apk",
|
m = re.match(r".*^\[INFO\] .*apkbuilder.*/([^/]*)\.apk",
|
||||||
output, re.S|re.M)
|
output_apk, re.S|re.M)
|
||||||
if not m:
|
if not m:
|
||||||
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_apk, re.S|re.M)
|
||||||
if not m:
|
if not m:
|
||||||
# This format is found in com.github.mobile, com.yubico.yubitotp and com.botbrew.basil 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,[^$]*' + bindir + '/([^/]+)\.ap[_k][,\]]',
|
m = re.match(r'.*^\[INFO\] [^$]*aapt \[package,[^$]*' + bindir + '/([^/]+)\.ap[_k][,\]]',
|
||||||
output, re.S|re.M)
|
output_apk, re.S|re.M)
|
||||||
if not m:
|
if not m:
|
||||||
raise BuildException('Failed to find output')
|
raise BuildException('Failed to find output')
|
||||||
src = m.group(1)
|
src = m.group(1)
|
||||||
@ -597,7 +602,7 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d
|
|||||||
name = '-'.join([os.path.basename(build_dir), flavour, 'release', 'unsigned'])
|
name = '-'.join([os.path.basename(build_dir), flavour, 'release', 'unsigned'])
|
||||||
src = os.path.join(build_dir, 'build', 'apk', name+'.apk')
|
src = os.path.join(build_dir, 'build', 'apk', name+'.apk')
|
||||||
else:
|
else:
|
||||||
src = re.match(r".*^.*Creating (.+) for release.*$.*", output,
|
src = re.match(r".*^.*Creating (.+) for release.*$.*", output_apk,
|
||||||
re.S|re.M).group(1)
|
re.S|re.M).group(1)
|
||||||
src = os.path.join(bindir, src)
|
src = os.path.join(bindir, src)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user