Switch all headers to python3

[fdroidserver.git] / makebuildserver

diff --git a/makebuildserver b/makebuildserver
index 77c6063cce22fe792ce22e64ce477b4af79f62ad..52855f8de7528925ee05603d45d651f310176631 100755 (executable)
--- a/makebuildserver
+++ b/makebuildserver
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 
 import os
 import sys
@@ -54,10 +54,11 @@ config = {
         'https://f-droid.org/jessie32.box',
     ],
     'debian_mirror': 'http://http.debian.net/debian/',
+    'apt_package_cache': False,
     'boot_timeout': 600,
     'cachedir': cachedir,
     'cpus': 1,
-    'memory': 3584,
+    'memory': 1024,
 }
 
 # load config file, if present
@@ -268,6 +269,9 @@ cachefiles = [
     ('gradle-2.10-bin.zip',
      'https://services.gradle.org/distributions/gradle-2.10-bin.zip',
      '66406247f745fc6f05ab382d3f8d3e120c339f34ef54b86f6dc5f6efc18fbb13'),
+    ('gradle-2.11-bin.zip',
+     'https://services.gradle.org/distributions/gradle-2.11-bin.zip',
+     '8d7437082356c9fd6309a4479c8db307673965546daea445c6c72759cd6b1ed6'),
     ('Kivy-1.7.2.tar.gz',
      'https://pypi.python.org/packages/source/K/Kivy/Kivy-1.7.2.tar.gz',
      '0485e2ef97b5086df886eb01f8303cb542183d2d71a159466f99ad6c8a1d03f1'),
@@ -374,6 +378,14 @@ if cachedir != 'buildserver/cache':
   config.vm.synced_folder '{0}', '/vagrant/cache'
 """.format(cachedir)
 
+# cache .deb packages on the host via a mount trick
+if config['apt_package_cache']:
+    aptcachedir = cachedir + '/apt/archives'
+    vagrantfile += """
+  config.vm.synced_folder "{0}", "/var/cache/apt/archives",
+    owner: 'root', group: 'root', create: true
+""".format(aptcachedir)
+
 vagrantfile += """
   config.vm.provision :chef_solo do |chef|
     chef.cookbooks_path = "cookbooks"
@@ -383,6 +395,7 @@ vagrantfile += """
         :sdk_loc => "/home/vagrant/android-sdk",
         :ndk_loc => "/home/vagrant/android-ndk",
         :debian_mirror => "%s",
+        :ubuntu_trusty => "%s",
         :user => "vagrant"
       }
     }
@@ -393,7 +406,8 @@ vagrantfile += """
     chef.add_recipe "kivy"
   end
 end
-""" % (config['debian_mirror'])
+""" % (config['debian_mirror'],
+       str('14.04' in os.uname()[3]).lower())
 
 # Check against the existing Vagrantfile, and if they differ, we need to
 # create a new box: