name makebuildserver config the same as the script

[fdroidserver.git] / makebuildserver

diff --git a/makebuildserver b/makebuildserver
index 5a8aa6e4ab870cdcbd4060b5162ad5fad0a435ed..9695ba2c0e6b7a8c2d23236646dc50592522d856 100755 (executable)
--- a/makebuildserver
+++ b/makebuildserver
@@ -46,7 +46,13 @@ parser.add_option("--debian-mirror", default="http://ftp.uk.debian.org/debian/",
 options, args = parser.parse_args()
 
 config = {}
-execfile('makebs.config.py', config)
+
+# load config file, if present
+if os.path.exists('makebuildserver.config.py'):
+    execfile('makebuildserver.config.py', config)
+elif os.path.exists('makebs.config.py'):
+    # this is the old name for the config file
+    execfile('makebs.config.py', config)
 
 if not os.path.exists('makebuildserver') or not os.path.exists(serverdir):
     print 'This must be run from the correct directory!'
@@ -193,6 +199,8 @@ cachefiles = [
     ('build-tools-23.0.2.zip',
      'https://dl.google.com/android/repository/build-tools_r23.0.2-linux.zip',
      '82754f551a6e36eaf516fbdd00c95ff0ccd19f81d1e134125b6ac4916f7ed9b6'),
+    # the binaries that Google uses are here:
+    # https://android.googlesource.com/platform/tools/external/gradle/+/studio-1.5/
     ('gradle-1.4-bin.zip',
      'https://services.gradle.org/distributions/gradle-1.4-bin.zip',
      'cd99e85fbcd0ae8b99e81c9992a2f10cceb7b5f009c3720ef3a0078f4f92e94e'),
@@ -241,6 +249,12 @@ cachefiles = [
     ('gradle-2.8-bin.zip',
      'https://services.gradle.org/distributions/gradle-2.8-bin.zip',
      'a88db9c2f104defdaa8011c58cf6cda6c114298ae3695ecfb8beb30da3a903cb'),
+    ('gradle-2.9-bin.zip',
+     'https://services.gradle.org/distributions/gradle-2.9-bin.zip',
+     'c9159ec4362284c0a38d73237e224deae6139cbde0db4f0f44e1c7691dd3de2f'),
+    ('gradle-2.10-bin.zip',
+     'https://services.gradle.org/distributions/gradle-2.10-bin.zip',
+     '66406247f745fc6f05ab382d3f8d3e120c339f34ef54b86f6dc5f6efc18fbb13'),
     ('Kivy-1.7.2.tar.gz',
      'https://pypi.python.org/packages/source/K/Kivy/Kivy-1.7.2.tar.gz',
      '0485e2ef97b5086df886eb01f8303cb542183d2d71a159466f99ad6c8a1d03f1'),