From cdd994cad09e060972c3cd0e491c8b1d38a9cc26 Mon Sep 17 00:00:00 2001 From: Galder Zamarreño Date: Thu, 17 Oct 2013 19:26:05 +0200 Subject: Magic --- build.gradle | 2 +- buildSrc/build.gradle | 1 + .../main/groovy/org/gradle/frege/FregeTask.groovy | 1 + .../org/gradle/frege/FregeWorkerManager.java | 41 ++++++++++ gradle/wrapper/gradle-wrapper.properties | 4 +- gradlew.bat | 90 ++++++++++++++++++++++ 6 files changed, 136 insertions(+), 3 deletions(-) create mode 100644 buildSrc/src/main/groovy/org/gradle/frege/FregeWorkerManager.java create mode 100644 gradlew.bat diff --git a/build.gradle b/build.gradle index 011a41f..bd0f21f 100644 --- a/build.gradle +++ b/build.gradle @@ -7,4 +7,4 @@ buildscript { } apply plugin: FregePlugin -apply plugin: "idea" \ No newline at end of file +apply plugin: "idea" diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index 1b520fb..bbe4c7d 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -10,5 +10,6 @@ dependencies { compile ":frege:3.21.232-g7b05453" compile gradleApi() + compile localGroovy() } \ No newline at end of file diff --git a/buildSrc/src/main/groovy/org/gradle/frege/FregeTask.groovy b/buildSrc/src/main/groovy/org/gradle/frege/FregeTask.groovy index cdd089a..3e7d572 100644 --- a/buildSrc/src/main/groovy/org/gradle/frege/FregeTask.groovy +++ b/buildSrc/src/main/groovy/org/gradle/frege/FregeTask.groovy @@ -26,6 +26,7 @@ class FregeTask extends DefaultTask { + } } \ 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 new file mode 100644 index 0000000..6583534 --- /dev/null +++ b/buildSrc/src/main/groovy/org/gradle/frege/FregeWorkerManager.java @@ -0,0 +1,41 @@ +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 +// } + +} diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 5ffbc39..365f80f 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Thu Jun 27 23:00:11 BST 2013 +#Thu Oct 17 19:25:07 CEST 2013 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=http\://services.gradle.org/distributions/gradle-1.6-bin.zip +distributionUrl=http\://services.gradle.org/distributions/gradle-1.8-bin.zip diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..aec9973 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,90 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windowz variants + +if not "%OS%" == "Windows_NT" goto win9xME_args +if "%@eval[2+2]" == "4" goto 4NT_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* +goto execute + +:4NT_args +@rem Get arguments from the 4NT Shell from JP Software +set CMD_LINE_ARGS=%$ + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega -- cgit