Made maven executable configurable

diff --git a/config.buildserver.py b/config.buildserver.py
index 44e5eaacc67b14010d6e23681afed0e83731a9a5..08c5228899f846f17479e6fc7efd618d5afdf37b 100644 (file)
--- a/config.buildserver.py
+++ b/config.buildserver.py
@@ -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"

diff --git a/config.sample.py b/config.sample.py
index 695d337cb47472492a1d2787928375b80f9f7fa6..f0e0369f1207cef0f6da76b6a8dab4175a179459 100644 (file)
--- a/config.sample.py
+++ b/config.sample.py
@@ -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"

diff --git a/fdroidserver/build.py b/fdroidserver/build.py
index 7ebae359bc748a8e6fc0ebd59f9b8067de1ab529..dfe65cade9c41ee621b128c448052bcd1bd1f346 100644 (file)
--- a/fdroidserver/build.py
+++ b/fdroidserver/build.py
@@ -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:

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index 49a8cd2fe7984ca8f5ca24c79f742bc117ec779f..8683783db3718c90934317934adc6ea496f0c5a8 100644 (file)
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -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
 

diff --git a/fdroidserver/scanner.py b/fdroidserver/scanner.py
index 0deccf917f49bbbc3a45c9353b25cf54a631caf4..6d3967da457d4ffcd51dc85a606db10019d9fb2d 100644 (file)
--- a/fdroidserver/scanner.py
+++ b/fdroidserver/scanner.py
@@ -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())