mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-09-13 22:42:29 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Maven 3 is required, not 2

Browse source
This commit is contained in:
Ciaran Gultnieks 2012-06-25 09:22:11 +01:00
parent 388f997d37
commit 6aa8f61acd
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
fdroidserver/build.py
View file

@ -168,7 +168,7 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, extlib_dir, tmp_dir,
# Build the release... # Build the release...
if thisbuild.has_key('maven'): if thisbuild.has_key('maven'):
p = subprocess.Popen(['mvn', 'clean', 'package', p = subprocess.Popen(['mvn3', 'clean', 'package',
'-Dandroid.sdk.path=' + sdk_path, '-Dandroid.sdk.path=' + sdk_path,
'-Dandroid.sign.debug=false'], '-Dandroid.sign.debug=false'],
cwd=root_dir, stdout=subprocess.PIPE, stderr=subprocess.PIPE) 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") 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'):
src = re.match(r".*^\[INFO\] .*apkbuilder.*/([^/]*)\.apk", try:
src = re.match(r".*^\[INFO\] .*apkbuilder.*/([^/]*)\.apk",
output, re.S|re.M).group(1) output, re.S|re.M).group(1)
except:
print output
raise BuildException('Failed to find output')
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: