From 7f3cb91779907c12d02e8e5c5f4a6a7c510d210e Mon Sep 17 00:00:00 2001 From: Raymond Chiu Date: Fri, 6 Feb 2015 13:49:12 -0800 Subject: Add targetPlatform for executable binaries Make dsl changes due to gradle update. Change-Id: I65729783f5c8f985ed31a231e7dd9a0b9e50f7b3 --- sdklauncher/build.gradle | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) (limited to 'sdklauncher') diff --git a/sdklauncher/build.gradle b/sdklauncher/build.gradle index 6c64f6d..b04ee05 100644 --- a/sdklauncher/build.gradle +++ b/sdklauncher/build.gradle @@ -2,35 +2,33 @@ apply plugin: 'c' apply plugin: 'sdk-files' apply plugin: 'windows-setup' -executables { - sdkLauncher {} -} - -sources { - sdkLauncher { - c { - source { - srcDir "src/source" - include "**/*.c" +model { + components { + sdkLauncher(NativeExecutableSpec) { + sources { + c { + source { + srcDir "src/source" + include "**/*.c" + } + } } + targetPlatform "windows32" } } } sdk { windows { - item( { getExeName("windows32SdkLauncherExecutable") } ) { + item( { getExeName("sdkLauncherExecutable") } ) { into 'lib' name 'SDK Manager.exe' - builtBy 'windows32SdkLauncherExecutable' + builtBy 'sdkLauncherExecutable' } } } def getExeName(String name) { - // 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) + return binaries.getByName(name).executableFile } -- cgit v1.1