From 3b7e827c961130168bcdbf30830e00e98c51f378 Mon Sep 17 00:00:00 2001 From: Galder Zamarreño Date: Thu, 17 Oct 2013 19:52:14 +0200 Subject: Magic 2 --- .../main/groovy/org/gradle/frege/FregeResult.java | 45 ++++++++++++++++++++++ .../main/groovy/org/gradle/frege/FregeTask.groovy | 11 ++++-- .../org/gradle/frege/FregeWorkerManager.java | 41 -------------------- 3 files changed, 52 insertions(+), 45 deletions(-) create mode 100644 buildSrc/src/main/groovy/org/gradle/frege/FregeResult.java delete mode 100644 buildSrc/src/main/groovy/org/gradle/frege/FregeWorkerManager.java diff --git a/buildSrc/src/main/groovy/org/gradle/frege/FregeResult.java b/buildSrc/src/main/groovy/org/gradle/frege/FregeResult.java new file mode 100644 index 0000000..85e6348 --- /dev/null +++ b/buildSrc/src/main/groovy/org/gradle/frege/FregeResult.java @@ -0,0 +1,45 @@ +package org.gradle.frege; + +import java.io.Serializable; + +/** + * // TODO: Document this + * + * @author Galder Zamarreño + * @since // TODO + */ +public class FregeResult implements Serializable { + + private final int bugCount; + private final int missingClassCount; + private final int errorCount; + private final Exception exception; + + public FregeResult(int bugCount, int missingClassCount, int errorCount) { + this(bugCount, missingClassCount, errorCount, null); + } + + public FregeResult(int bugCount, int missingClassCount, int errorCount, Exception exception) { + this.bugCount = bugCount; + this.missingClassCount = missingClassCount; + this.errorCount = errorCount; + this.exception = exception; + } + + public int getBugCount() { + return bugCount; + } + + public int getMissingClassCount() { + return missingClassCount; + } + + public int getErrorCount() { + return errorCount; + } + + public Exception getException() { + return exception; + } + +} diff --git a/buildSrc/src/main/groovy/org/gradle/frege/FregeTask.groovy b/buildSrc/src/main/groovy/org/gradle/frege/FregeTask.groovy index 3e7d572..25452f3 100644 --- a/buildSrc/src/main/groovy/org/gradle/frege/FregeTask.groovy +++ b/buildSrc/src/main/groovy/org/gradle/frege/FregeTask.groovy @@ -4,6 +4,9 @@ import org.gradle.api.DefaultTask import org.gradle.api.GradleException import org.gradle.api.InvalidUserDataException import org.gradle.api.tasks.* +import org.gradle.process.internal.DefaultJavaExecAction +import org.gradle.process.internal.JavaExecAction +import org.gradle.api.internal.file.FileResolver class FregeTask extends DefaultTask { @@ -23,10 +26,10 @@ class FregeTask extends DefaultTask { void executeCompile() { println "Compiling Frege" - - - - + FileResolver fileResolver = getServices().get(FileResolver.class) + JavaExecAction action = new DefaultJavaExecAction(fileResolver) + action.setMain("frege.compiler.Main") + action.execute } } \ No newline at end of file diff --git a/buildSrc/src/main/groovy/org/gradle/frege/FregeWorkerManager.java b/buildSrc/src/main/groovy/org/gradle/frege/FregeWorkerManager.java deleted file mode 100644 index 6583534..0000000 --- a/buildSrc/src/main/groovy/org/gradle/frege/FregeWorkerManager.java +++ /dev/null @@ -1,41 +0,0 @@ -package org.gradle.frege; - -//import org.gradle.api.file.FileCollection -//import org.gradle.internal.Factory -//import org.gradle.process.internal.JavaExecHandleBuilder -//import org.gradle.process.internal.WorkerProcess -//import org.gradle.process.internal.WorkerProcessBuilder - -/** - * // TODO: Document this - * - * @author Galder Zamarreño - * @since // TODO - */ -public class FregeWorkerManager { - -// public FindBugsResult runWorker(File workingDir, Factory workerFactory, FileCollection findBugsClasspath, FindBugsSpec spec) { -// WorkerProcess process = createWorkerProcess(workingDir, workerFactory, findBugsClasspath, spec); -// process.start(); -// -// FindBugsWorkerClient clientCallBack = new FindBugsWorkerClient() -// process.connection.addIncoming(FindBugsWorkerClientProtocol.class, clientCallBack); -// FindBugsResult result = clientCallBack.getResult(); -// -// process.waitForStop(); -// return result; -// } -// -// private WorkerProcess createWorkerProcess(File workingDir, Factory workerFactory, FileCollection findBugsClasspath, FindBugsSpec spec) { -// WorkerProcessBuilder builder = workerFactory.create(); -// builder.applicationClasspath(findBugsClasspath); -// builder.sharedPackages(Arrays.asList("edu.umd.cs.findbugs")); -// JavaExecHandleBuilder javaCommand = builder.getJavaCommand(); -// javaCommand.setWorkingDir(workingDir); -// javaCommand.setMaxHeapSize(spec.getMaxHeapSize()); -// -// WorkerProcess process = builder.worker(new FindBugsWorkerServer(spec)).build() -// return process -// } - -} -- cgit