Merge branch 'master' into engine-release

Author: compiler64

build.gradle

@@ -40,6 +40,14 @@ dependencies {
     bots project(":example-bots")
 }
 
+task installPythonPackage(type: Exec) {
+  if (project.findProperty('forceInstallPythonPackage') ?: false) {
+    commandLine 'python', '-m', 'pip', 'install', '-e', 'engine/src/crossplay_python'
+  } else {
+    commandLine 'python', '-c', "import importlib.util,subprocess,sys; pkg='battlecode26'; importlib.util.find_spec(pkg) or subprocess.check_call([sys.executable,'-m','pip','install','-e',pkg])"
+  }
+}
+
 def serverJar = configurations.engine.singleFile
 
 task buildMap(type: JavaExec, dependsOn: [':engine:build']) {
@@ -91,28 +99,24 @@ task headless(type: JavaExec, dependsOn: [':engine:build', ':example-bots:build'
   ]
 }
 
-task crossPlayPy(type: Exec, dependsOn: [':engine:build']) {
-  commandLine 'python', 'engine/src/crossplay_python/main.py',
+task crossPlayPy(type: Exec, dependsOn: ['installPythonPackage']) {
+  commandLine 'python', '-m', 'battlecode26',
   '--teamA', (project.findProperty('languageA') == 'java' ? '/' : project.property('teamA')),
   '--teamB', (project.findProperty('languageB') == 'java' ? '/' : project.property('teamB')),
   '--dirA', 'example-bots/src/crossplay_python',
   '--dirB', 'example-bots/src/crossplay_python',
   '--new-process'
 }
 
-task headlessPy(dependsOn: ['headless']) {}
-headlessPy.mustRunAfter crossPlayPy
-
 // keep the client happy because it references this step
 task unpackClient() {}
 
-task run(dependsOn: ['unpackClient']) {}
+task run(dependsOn: ['unpackClient', 'headless']) {}
 
 if (project.hasProperty('languageA') && project.property('languageA') == 'python' ||
     project.hasProperty('languageB') && project.property('languageB') == 'python') {
-  run.dependsOn crossPlayPy, headlessPy
-} else {
-  run.dependsOn headless
+  run.dependsOn crossPlayPy
+  headless.mustRunAfter crossPlayPy
 }
 
 task runClient {

engine/src/crossplay_python/battlecode26/__main__.py

@@ -261,7 +261,8 @@ def main(args=None):
     if parsed_args.new_process:
         new_args = [
             sys.executable,
-            __file__,
+            "-m",
+            "battlecode26",
             "--teamA",
             team_a,
             "--teamB",