From 4cab9f439720ff9fd914f8bfcbf6b72b04a50d6b Mon Sep 17 00:00:00 2001
From: Xavier Ducrohet <xav@google.com>
Date: Thu, 12 Feb 2015 13:14:37 -0800
Subject: Revert "Add targetPlatform for executable binaries"

This reverts commit 7f3cb91779907c12d02e8e5c5f4a6a7c510d210e.
---
 sdklauncher/build.gradle | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

(limited to 'sdklauncher')

diff --git a/sdklauncher/build.gradle b/sdklauncher/build.gradle
index b04ee05..6c64f6d 100644
--- a/sdklauncher/build.gradle
+++ b/sdklauncher/build.gradle
@@ -2,33 +2,35 @@ apply plugin: 'c'
 apply plugin: 'sdk-files'
 apply plugin: 'windows-setup'
 
-model {
-    components {
-        sdkLauncher(NativeExecutableSpec) {
-            sources {
-                c {
-                    source {
-                        srcDir "src/source"
-                        include "**/*.c"
-                    }
-                }
+executables {
+    sdkLauncher {}
+}
+
+sources {
+    sdkLauncher {
+        c {
+            source {
+                srcDir "src/source"
+                include "**/*.c"
             }
-            targetPlatform "windows32"
         }
     }
 }
 
 sdk {
     windows {
-        item( { getExeName("sdkLauncherExecutable") } ) {
+        item( { getExeName("windows32SdkLauncherExecutable") } ) {
             into 'lib'
             name 'SDK Manager.exe'
-            builtBy 'sdkLauncherExecutable'
+            builtBy 'windows32SdkLauncherExecutable'
         }
     }
 }
 
 def getExeName(String name) {
-    return binaries.getByName(name).executableFile
+    // binaries will return a set of binaries
+    def binaries = executables.sdkLauncher.binaries.matching { it.name == name }
+    // calling .exeFile on the set returns an array with the result from each item in the set...
+    return binaries.executableFile.get(0)
 }
 
-- 
cgit v1.1