From 6aa8f61acde34b5a060e4a3adb9838c5b186f11f Mon Sep 17 00:00:00 2001 From: Ciaran Gultnieks Date: Mon, 25 Jun 2012 09:22:11 +0100 Subject: [PATCH] Maven 3 is required, not 2 --- fdroidserver/build.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/fdroidserver/build.py b/fdroidserver/build.py index 719fb8a6..d6d7e398 100644 --- a/fdroidserver/build.py +++ b/fdroidserver/build.py @@ -168,7 +168,7 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, extlib_dir, tmp_dir, # Build the release... if thisbuild.has_key('maven'): - p = subprocess.Popen(['mvn', 'clean', 'package', + p = subprocess.Popen(['mvn3', 'clean', 'package', '-Dandroid.sdk.path=' + sdk_path, '-Dandroid.sign.debug=false'], cwd=root_dir, stdout=subprocess.PIPE, stderr=subprocess.PIPE) @@ -201,8 +201,12 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, extlib_dir, tmp_dir, thisbuild['version'] + "-unsigned.apk") src = os.path.join(bindir, src) elif thisbuild.has_key('maven'): - src = re.match(r".*^\[INFO\] .*apkbuilder.*/([^/]*)\.apk", + try: + src = re.match(r".*^\[INFO\] .*apkbuilder.*/([^/]*)\.apk", output, re.S|re.M).group(1) + except: + print output + raise BuildException('Failed to find output') src = os.path.join(bindir, src) + '.apk' #[INFO] Installing /home/ciaran/fdroidserver/tmp/mainline/application/target/callerid-1.0-SNAPSHOT.apk else: -- 2.30.2