mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-09-14 06:52:39 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

More maven build output recognition

Browse source
This commit is contained in:
Ciaran Gultnieks 2012-06-28 12:52:35 +01:00
parent 92befc2171
commit 712531ba37
1 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
fdroidserver/build.py
View file

@ -201,12 +201,15 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, extlib_dir, tmp_dir,
thisbuild['version'] + "-unsigned.apk") thisbuild['version'] + "-unsigned.apk")
src = os.path.join(bindir, src) src = os.path.join(bindir, src)
elif thisbuild.has_key('maven'): elif thisbuild.has_key('maven'):
try: m = re.match(r".*^\[INFO\] .*apkbuilder.*/([^/]*)\.apk",
src = re.match(r".*^\[INFO\] .*apkbuilder.*/([^/]*)\.apk", output, re.S|re.M)
output, re.S|re.M).group(1) if not m:
except: m = re.match(r".*^\[INFO\] Creating additional unsigned apk file .*/([^/]+)\.apk",
output, re.S|re.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 = 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 #[INFO] Installing /home/ciaran/fdroidserver/tmp/mainline/application/target/callerid-1.0-SNAPSHOT.apk
else: else:
@ -217,6 +220,8 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, extlib_dir, tmp_dir,
# 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...
print "Checking " + src print "Checking " + src
if not os.path.exists(src):
raise BuildException("Unsigned apk is not at expected location of " + src)
p = subprocess.Popen([os.path.join(sdk_path, 'platform-tools', p = subprocess.Popen([os.path.join(sdk_path, 'platform-tools',
'aapt'), 'aapt'),
'dump', 'badging', src], 'dump', 'badging', src],