This is an automated email from the ASF dual-hosted git repository. emilles pushed a commit to branch GROOVY_4_0_X in repository https://gitbox.apache.org/repos/asf/groovy.git
commit a6a854434fb36257905ab846181ec62c96f9b10e Author: Eric Milles <[email protected]> AuthorDate: Sat Apr 12 11:05:54 2025 -0500 GROOVY-11607: `groovyc`: fileset lists files 4_0_X backport --- .../main/java/org/codehaus/groovy/ant/Groovyc.java | 24 ++++++++++++---------- .../org/codehaus/groovy/ant/GroovycTest.xml | 14 +++++++++++++ .../org/codehaus/groovy/ant/GroovycTest.java | 6 ++++++ 3 files changed, 33 insertions(+), 11 deletions(-) diff --git a/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovyc.java b/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovyc.java index 1254b7e6da..92edea2b60 100644 --- a/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovyc.java +++ b/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovyc.java @@ -37,7 +37,6 @@ import org.codehaus.groovy.GroovyBugError; import org.codehaus.groovy.control.CompilationUnit; import org.codehaus.groovy.control.CompilerConfiguration; import org.codehaus.groovy.control.SourceExtensionHandler; -import org.codehaus.groovy.runtime.DefaultGroovyMethods; import org.codehaus.groovy.runtime.DefaultGroovyStaticMethods; import org.codehaus.groovy.tools.ErrorReporter; import org.codehaus.groovy.tools.FileSystemCompiler; @@ -870,17 +869,19 @@ public class Groovyc extends MatchingTask { if (javac != null) jointCompilation = true; - // scan source directories and dest directory to build up - // compile lists - String[] list = src.list(); - for (String filename : list) { + // scan source directories and dest directory to build up compile lists + for (String filename : src.list()) { File file = getProject().resolveFile(filename); if (!file.exists()) { throw new BuildException("srcdir \"" + file.getPath() + "\" does not exist!", getLocation()); } - DirectoryScanner ds = this.getDirectoryScanner(file); - String[] files = ds.getIncludedFiles(); - scanDir(file, destDir != null ? destDir : file, files); + if (file.isDirectory()) { + DirectoryScanner ds = getDirectoryScanner(file); + scanDir(file, destDir != null ? destDir : file, ds.getIncludedFiles()); + } else { // GROOVY-11607: fileset lists files + compileList = Arrays.copyOf(compileList, compileList.length + 1); + compileList[compileList.length - 1] = file; + } } compile(); @@ -892,7 +893,7 @@ public class Groovyc extends MatchingTask { } /** - * Clear the list of files to be compiled and copied. + * Clears the list of files to be compiled and copied. */ protected void resetFileLists() { compileList = EMPTY_FILE_ARRAY; @@ -1257,8 +1258,9 @@ public class Groovyc extends MatchingTask { } private String[] makeCommandLine(List<String> commandLineList) { - log.info("Compilation arguments:\n" + DefaultGroovyMethods.join((Iterable<String>) commandLineList, "\n")); - return commandLineList.toArray(EMPTY_STRING_ARRAY); + String[] commandLine = commandLineList.toArray(EMPTY_STRING_ARRAY); + log.info("Compilation arguments:\n" + String.join("\n", commandLine)); + return commandLine; } private void runForked(String[] commandLine) { diff --git a/subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/GroovycTest.xml b/subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/GroovycTest.xml index d70cb5ab0e..b5fb7011f8 100644 --- a/subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/GroovycTest.xml +++ b/subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/GroovycTest.xml @@ -186,6 +186,20 @@ <java classname="org.codehaus.groovy.ant.ParameterMetadataCheck"/> </target> + <!-- GROOVY-11607 --> + <target name="plainForkedCompilation_NestingSrcElementCheck"> + <groovyc destdir="${destPath}" fork="true"> + <src> + <fileset dir="${srcPath}"> + <include name="GroovycTest*.*"/> + <exclude name="GroovycTest.xml"/> + <exclude name="GroovycTest2.java"/> + </fileset> + </src> + </groovyc> + <java classname="org.codehaus.groovy.ant.GroovycTest1"/> + </target> + <target name="clean"> <delete quiet="true"> <fileset dir="${destPath}/org/codehaus/groovy/ant"> diff --git a/subprojects/groovy-ant/src/test/groovy/org/codehaus/groovy/ant/GroovycTest.java b/subprojects/groovy-ant/src/test/groovy/org/codehaus/groovy/ant/GroovycTest.java index 8e0afd00cd..5714c711d9 100644 --- a/subprojects/groovy-ant/src/test/groovy/org/codehaus/groovy/ant/GroovycTest.java +++ b/subprojects/groovy-ant/src/test/groovy/org/codehaus/groovy/ant/GroovycTest.java @@ -322,4 +322,10 @@ public class GroovycTest extends GroovyTestCase { Method m = c.getDeclaredMethod("main", String[].class); assertEquals("args", m.getParameters()[0].getName()); } + + // GROOVY-11607 + public void testPlainForkedCompilation_NestingSrcElementCheck() { + ensureExecutes("plainForkedCompilation_NestingSrcElementCheck"); + ensureNotPresent("GroovycTest2"); // excluded from src > fileset + } }
