name makebuildserver config the same as the script

This keeps the numbers of names down to a minimum, and since the config
is placed right next to the script, this keeps tab completion working
nicely when the config file is in place.

The old file name is still supported.

diff --git a/MANIFEST.in b/MANIFEST.in
index 92ddb75de5352d6f2fc12e69b6a20bfab71c8d29..ca8eea6e64c2faeddac84bfd8f92430eeb8a2259 100644 (file)
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -21,7 +21,7 @@ include docs/index_versions.md
 include docs/update.sh
 include examples/config.py
 include examples/fdroid-icon.png
-include examples/makebs.config.py
+include examples/makebuildserver.config.py
 include examples/opensc-fdroid.cfg
 include tests/getsig/run.sh
 include tests/getsig/make.sh

diff --git a/examples/makebs.config.py b/examples/makebuildserver.config.py
similarity index 100%
rename from examples/makebs.config.py
rename to examples/makebuildserver.config.py

diff --git a/makebuildserver b/makebuildserver
index 38b776f1a536e6acfe51c23f1a2b4e1557f04a7a..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'),

diff --git a/setup.py b/setup.py
index 7834799b036ff8ec3f77c0b6bedd6439010ae570..4a266e7cb6d661bc44f4b009f290f6217a5555b9 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -22,7 +22,7 @@ setup(name='fdroidserver',
           (data_prefix + '/share/doc/fdroidserver/examples',
               ['buildserver/config.buildserver.py',
                   'examples/config.py',
-                  'examples/makebs.config.py',
+                  'examples/makebuildserver.config.py',
                   'examples/opensc-fdroid.cfg',
                   'examples/fdroid-icon.png']),
       ],