mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-11-05 15:00:30 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Changed maven target to 'package' and disabled signing

Browse source
This commit is contained in:
Ciaran Gultnieks 2012-04-08 09:08:24 +01:00
parent 2da03a3940
commit de75211adc
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
fdroidserver/build.py
View file

@ -168,8 +168,9 @@ 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', 'install', p = subprocess.Popen(['mvn', 'clean', 'package',
'-Dandroid.sdk.path=' + sdk_path], '-Dandroid.sdk.path=' + sdk_path,
'-Dandroid.sign.debug=false'],
cwd=root_dir, stdout=subprocess.PIPE, stderr=subprocess.PIPE) cwd=root_dir, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
else: else:
if install: if install:
@ -200,7 +201,7 @@ 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\] Installing /.*/([^/]*)\.apk", src = re.match(r".*^\[INFO\] .*apkbuilder.*/([^/]*)\.apk",
output, re.S|re.M).group(1) output, re.S|re.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