From ed508e414383337c1101bd9a5436e117edeb5fa0 Mon Sep 17 00:00:00 2001 From: peter Date: Sun, 15 Nov 2009 20:11:52 +0000 Subject: [PATCH] relax check --- .../jetbrains/groovy/compiler/rt/GroovycRunner.java | 11 +++++++---- .../plugins/groovy/compiler/GroovyCompilerBase.java | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/plugins/groovy/rt/src/org/jetbrains/groovy/compiler/rt/GroovycRunner.java b/plugins/groovy/rt/src/org/jetbrains/groovy/compiler/rt/GroovycRunner.java index 72a1cd1d3d42..7a9e61af0618 100644 --- a/plugins/groovy/rt/src/org/jetbrains/groovy/compiler/rt/GroovycRunner.java +++ b/plugins/groovy/rt/src/org/jetbrains/groovy/compiler/rt/GroovycRunner.java @@ -329,20 +329,23 @@ public class GroovycRunner { compilerMessages.add(new CompilerMessage(CompilerMessage.WARNING, message + ":\n" + writer, "", -1, -1)); } - private static CompilationUnit createCompilationUnit(final boolean forStubs, final CompilerConfiguration config, String finalOutput) { + private static CompilationUnit createCompilationUnit(final boolean forStubs, final CompilerConfiguration config, final String finalOutput) { config.setClasspathList(Collections.EMPTY_LIST); final GroovyClassLoader classLoader = buildClassLoaderFor(config); - final String localGlobalTransforms = finalOutput + "META-INF/services/org.codehaus.groovy.transform.ASTTransformation"; - final GroovyClassLoader transformLoader = new GroovyClassLoader(classLoader) { public Enumeration getResources(String name) throws IOException { + if (forStubs) { + //return Collections.enumeration(Collections.EMPTY_LIST); + } + if (name.endsWith("org.codehaus.groovy.transform.ASTTransformation")) { final Enumeration resources = super.getResources(name); final ArrayList list = Collections.list(resources); for (Iterator iterator = list.iterator(); iterator.hasNext();) { - if (localGlobalTransforms.equals(((URL)iterator.next()).getFile())) { + final String file = ((URL)iterator.next()).getFile(); + if (file.contains(finalOutput)) { iterator.remove(); } } diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/compiler/GroovyCompilerBase.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/compiler/GroovyCompilerBase.java index 71a80a55cc9d..bc213555900b 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/compiler/GroovyCompilerBase.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/compiler/GroovyCompilerBase.java @@ -272,7 +272,7 @@ public abstract class GroovyCompilerBase implements TranslatingCompiler { printer.println(PathUtil.getLocalPath(outputDir)); printer.println(GroovycRunner.FINAL_OUTPUTPATH); - printer.println(finalOutputDir.getPath() + "/"); + printer.println(finalOutputDir.getPath()); printer.close();