mirror of
https://gitlab.com/fdroid/fdroidserver.git
synced 2024-10-05 10:40:10 +02:00
Made maven executable configurable
This commit is contained in:
parent
6274d071a7
commit
7a0df25525
@ -2,3 +2,4 @@ aapt_path = "/home/vagrant/android-sdk/platform-tools/aapt"
|
||||
sdk_path = "/home/vagrant/android-sdk"
|
||||
ndk_path = "/home/vagrant/android-ndk"
|
||||
javacc_path = "/usr/share/java"
|
||||
mvn3 = "mvn"
|
||||
|
@ -8,6 +8,9 @@ ndk_path = "/path/to/android-ndk-r5"
|
||||
#You probably don't need to change this...
|
||||
javacc_path = "/usr/share/java"
|
||||
|
||||
#Command for running maven 3 (could be mvn, mvn3, or a full path)
|
||||
mvn3 = "mvn3"
|
||||
|
||||
repo_url = "http://f-droid.org/repo"
|
||||
repo_name = "FDroid"
|
||||
repo_icon = "fdroid-icon.png"
|
||||
|
@ -269,7 +269,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(['mvn3', '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)
|
||||
@ -471,8 +471,9 @@ def main():
|
||||
|
||||
global options
|
||||
# Read configuration...
|
||||
global build_server_always
|
||||
global build_server_always, mvn3
|
||||
build_server_always = False
|
||||
mvn3 = "mvn3"
|
||||
execfile('config.py', globals())
|
||||
options, args = parse_commandline()
|
||||
if build_server_always:
|
||||
|
@ -803,7 +803,7 @@ def getsrclib(spec, extlib_dir, sdk_path):
|
||||
vcs = getvcs('git',
|
||||
'https://code.google.com/r/andreasschildbach-bitcoinj/', sdir, sdk_path)
|
||||
vcs.gotorevision(ref)
|
||||
if subprocess.call(['mvn3', 'install'], cwd=sdir) != 0:
|
||||
if subprocess.call([mvn3, 'install'], cwd=sdir) != 0:
|
||||
raise BuildException("Maven build failed for BitcoinJWallet srclib")
|
||||
return sdir
|
||||
|
||||
|
@ -34,6 +34,9 @@ from common import VCSException
|
||||
def main():
|
||||
|
||||
# Read configuration...
|
||||
global build_server_always, mvn3
|
||||
build_server_always = False
|
||||
mvn3 = "mvn3"
|
||||
execfile('config.py', globals())
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user