Set correct build target when generating export methods

wooga · Jun 8, 2018 · d87ff6e · d87ff6e
1 parent 23bd8ff
commit d87ff6e
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/...tionTest/groovy/wooga/gradle/unity/build/tasks/UnityBuildPlayerTaskIntegrationSpec.groovy b/...tionTest/groovy/wooga/gradle/unity/build/tasks/UnityBuildPlayerTaskIntegrationSpec.groovy
@@ -54,6 +54,7 @@ class UnityBuildPlayerTaskIntegrationSpec extends UnityIntegrationSpec {
 
         result.standardOutput.contains("-executeMethod ${expectedExportMethod}")
         result.standardOutput.contains("platform=${expectedPlatform}")
+        result.standardOutput.contains("-buildTarget ${expectedPlatform}")
         result.standardOutput.contains("environment=${expectedEnvironment}")
 
         where:

diff --git a/src/main/groovy/wooga/gradle/unity/build/tasks/UnityBuildPlayerTask.groovy b/src/main/groovy/wooga/gradle/unity/build/tasks/UnityBuildPlayerTask.groovy
@@ -20,6 +20,8 @@ package wooga.gradle.unity.build.tasks
 import org.gradle.api.tasks.Input
 import org.gradle.api.tasks.InputDirectory
 import org.gradle.api.tasks.OutputDirectory
+import wooga.gradle.unity.batchMode.BatchModeFlags
+import wooga.gradle.unity.batchMode.BuildTarget
 import wooga.gradle.unity.tasks.internal.AbstractUnityProjectTask
 
 class UnityBuildPlayerTask extends AbstractUnityProjectTask {
@@ -49,6 +51,14 @@ class UnityBuildPlayerTask extends AbstractUnityProjectTask {
 
     void setBuildPlatform(String platform) {
         buildPlatform = platform
+        try {
+            buildTarget = platform as BuildTarget
+        }
+        catch(IllegalArgumentException ignored) {
+            logger.warn("build target ${platform} unknown")
+            buildTarget = BuildTarget.undefined
+        }
+
     }
 
     void buildPlatform(String platform) {
@@ -84,6 +94,10 @@ class UnityBuildPlayerTask extends AbstractUnityProjectTask {
     protected void exec() {
         args "-executeMethod", getExportMethodName()
         args "-CustomArgs:platform=${getBuildPlatform()};environment=${getBuildEnvironment()};outputPath=${getOutputDirectory().getPath()}"
+
+        if (buildTarget == BuildTarget.undefined) {
+            args BatchModeFlags.BUILD_TARGET, getBuildPlatform()
+        }
         super.exec()
     }
 }