Skip to content

Adding support for --limit-modules, --module-path and similar options. #44

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lahodaj wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Adding support for --limit-modules, --module-path and similar options. #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8bfea76
Adding support for --limit-modules, --module-path and similar options.
lahodaj May 11, 2026
c4f857a
Fixing tests.
lahodaj May 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
91 changes: 87 additions & 4 deletions cmdline/tool/src/org/netbeans/modules/jackpot30/cmdline/Main.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@
import joptsimple.OptionSet;
import org.netbeans.api.actions.Savable;
import org.netbeans.api.java.classpath.ClassPath;
import org.netbeans.api.java.classpath.JavaClassPathConstants;
import org.netbeans.api.java.source.CompilationController;
import org.netbeans.api.java.source.ModificationResult;
import org.netbeans.modules.editor.tools.storage.api.ToolPreferences;
Expand Down Expand Up @@ -108,6 +109,7 @@
import org.netbeans.spi.java.classpath.support.ClassPathSupport;
import org.netbeans.spi.java.hints.Hint.Kind;
import org.netbeans.spi.java.hints.HintContext;
import org.netbeans.spi.java.queries.CompilerOptionsQueryImplementation;
import org.netbeans.spi.java.queries.SourceLevelQueryImplementation2;
import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileUtil;
Expand Down Expand Up @@ -408,20 +410,43 @@ private static GroupOptions setupGroupParser(OptionParser parser) {
return new GroupOptions(parser.accepts("classpath", "classpath").withRequiredArg().withValuesSeparatedBy(File.pathSeparatorChar).ofType(File.class),
parser.accepts("bootclasspath", "bootclasspath").withRequiredArg().withValuesSeparatedBy(File.pathSeparatorChar).ofType(File.class),
parser.accepts("sourcepath", "sourcepath").withRequiredArg().withValuesSeparatedBy(File.pathSeparatorChar).ofType(File.class),
parser.accepts("source", "source level").withRequiredArg().ofType(String.class).defaultsTo(SOURCE_LEVEL_DEFAULT));
parser.accepts("add-exports", "javac's addd-exports option").withRequiredArg().ofType(String.class),
parser.accepts("add-modules", "javac's add-modules option").withRequiredArg().ofType(String.class),
parser.accepts("limit-modules", "javac's limit-modules option").withRequiredArg().ofType(String.class),
parser.accepts("module-path", "module path").withRequiredArg().withValuesSeparatedBy(File.pathSeparatorChar).ofType(File.class),
parser.accepts("source", "source level").withRequiredArg().ofType(String.class).defaultsTo(SOURCE_LEVEL_DEFAULT),
parser.accepts("system", "system modules").withRequiredArg().ofType(File.class));
}

private static final class GroupOptions {
private final ArgumentAcceptingOptionSpec<File> classpath;
private final ArgumentAcceptingOptionSpec<File> bootclasspath;
private final ArgumentAcceptingOptionSpec<File> sourcepath;
private final ArgumentAcceptingOptionSpec<String> addExports;
private final ArgumentAcceptingOptionSpec<String> addModules;
private final ArgumentAcceptingOptionSpec<String> limitModules;
private final ArgumentAcceptingOptionSpec<File> modulePath;
private final ArgumentAcceptingOptionSpec<String> source;

public GroupOptions(ArgumentAcceptingOptionSpec<File> classpath, ArgumentAcceptingOptionSpec<File> bootclasspath, ArgumentAcceptingOptionSpec<File> sourcepath, ArgumentAcceptingOptionSpec<String> source) {
private final ArgumentAcceptingOptionSpec<File> system;

public GroupOptions(ArgumentAcceptingOptionSpec<File> classpath,
ArgumentAcceptingOptionSpec<File> bootclasspath,
ArgumentAcceptingOptionSpec<File> sourcepath,
ArgumentAcceptingOptionSpec<String> addExports,
ArgumentAcceptingOptionSpec<String> addModules,
ArgumentAcceptingOptionSpec<String> limitModules,
ArgumentAcceptingOptionSpec<File> modulePath,
ArgumentAcceptingOptionSpec<String> source,
ArgumentAcceptingOptionSpec<File> system) {
this.classpath = classpath;
this.bootclasspath = bootclasspath;
this.sourcepath = sourcepath;
this.limitModules = limitModules;
this.modulePath = modulePath;
this.source = source;
this.addExports = addExports;
this.addModules = addModules;
this.system = system;
}

}
Expand Down Expand Up @@ -1008,9 +1033,14 @@ private static final class WarningsAndErrors {
private static final class RootConfiguration {
private final List<Folder> rootFolders;
private final ClassPath bootCP;
private final ClassPath systemCP;
private final ClassPath compileCP;
private final ClassPath modulePathCP;
private final ClassPath sourceCP;
private final ClassPath binaryCP;
private final String addExports;
private final String addModules;
private final String limitModules;
private final String sourceLevel;

public RootConfiguration(OptionSet parsed, GroupOptions groupOptions) throws IOException {
Expand All @@ -1029,9 +1059,14 @@ public RootConfiguration(OptionSet parsed, GroupOptions groupOptions) throws IOE
}

this.bootCP = createClassPath(parsed.has(groupOptions.bootclasspath) ? parsed.valuesOf(groupOptions.bootclasspath) : null, Utils.createDefaultBootClassPath());
this.systemCP = createClassPath(parsed.has(groupOptions.system) ? parsed.valuesOf(groupOptions.bootclasspath) : null, null); //XXX: this needs to be a JRTFS!
this.compileCP = createClassPath(parsed.has(groupOptions.classpath) ? parsed.valuesOf(groupOptions.classpath) : null, ClassPath.EMPTY);
this.modulePathCP = createClassPath(parsed.has(groupOptions.modulePath) ? parsed.valuesOf(groupOptions.modulePath) : null, ClassPath.EMPTY); //XXX: expand directories(?)
this.sourceCP = createClassPath(parsed.has(groupOptions.sourcepath) ? parsed.valuesOf(groupOptions.sourcepath) : null, ClassPathSupport.createClassPath(roots.toArray(new FileObject[0])));
this.binaryCP = ClassPathSupport.createProxyClassPath(bootCP, compileCP);
this.binaryCP = ClassPathSupport.createProxyClassPath(bootCP, compileCP, systemCP, modulePathCP);
this.addExports = parsed.has(groupOptions.addExports) ? parsed.valueOf(groupOptions.addExports) : null;
this.addModules = parsed.has(groupOptions.addModules) ? parsed.valueOf(groupOptions.addModules) : null;;
this.limitModules = parsed.has(groupOptions.limitModules) ? parsed.valueOf(groupOptions.limitModules) : null;;
this.sourceLevel = parsed.valueOf(groupOptions.source);
}

Expand Down Expand Up @@ -1088,8 +1123,12 @@ public ClassPath findClassPath(FileObject file, String type) {
if (rootConfiguration.sourceCP.findOwnerRoot(file) != null) {
if (ClassPath.BOOT.equals(type)) {
return rootConfiguration.bootCP;
} else if (JavaClassPathConstants.MODULE_BOOT_PATH.equals(type)) {
return rootConfiguration.systemCP;
} else if (ClassPath.COMPILE.equals(type)) {
return rootConfiguration.compileCP;
} else if (JavaClassPathConstants.MODULE_COMPILE_PATH.equals(type)) {
return rootConfiguration.modulePathCP;
} else if (ClassPath.SOURCE.equals(type)) {
return rootConfiguration.sourceCP;
}
Expand All @@ -1099,6 +1138,50 @@ public ClassPath findClassPath(FileObject file, String type) {
}
}

@ServiceProvider(service=CompilerOptionsQueryImplementation.class, position=100)
public static final class CompilerOptionsQueryImpl implements CompilerOptionsQueryImplementation {
private final Result result = new Result() {
@Override
public List<? extends String> getArguments() {
RootConfiguration rootConfiguration = currentRootConfiguration.get();

if (rootConfiguration == null) {
return List.of();
}

List<String> result = new ArrayList<>();

if (rootConfiguration.addModules != null) {
result.add("--add-modules");
result.add(rootConfiguration.addModules);
}

if (rootConfiguration.limitModules != null) {
result.add("--limit-modules");
result.add(rootConfiguration.limitModules);
}

if (rootConfiguration.addExports != null) {
result.add("--add-exports");
result.add(rootConfiguration.addExports);
}

return result;
}
@Override
public void addChangeListener(ChangeListener cl) {
}
@Override
public void removeChangeListener(ChangeListener cl) {
}
};

@Override
public Result getOptions(FileObject fo) {
return result;
}
}

@ServiceProvider(service=SourceLevelQueryImplementation2.class, position=100)
public static final class SourceLevelQueryImpl implements SourceLevelQueryImplementation2 {

Expand Down
5 changes: 4 additions & 1 deletion cmdline/tool/test/unit/src/org/netbeans/modules/jackpot30/cmdline/CreateTool.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import java.util.regex.Pattern;
import javax.annotation.processing.Processor;
import org.netbeans.modules.jackpot30.cmdline.Main.BCPFallBack;
import org.netbeans.modules.jackpot30.cmdline.Main.CompilerOptionsQueryImpl;
import org.netbeans.modules.jackpot30.cmdline.Main.SourceLevelQueryImpl;
import org.netbeans.modules.jackpot30.cmdline.lib.CreateStandaloneJar;
import org.netbeans.modules.jackpot30.cmdline.lib.CreateStandaloneJar.Info;
Expand All @@ -31,6 +32,7 @@
import org.netbeans.modules.java.platform.DefaultJavaPlatformProvider;
import org.netbeans.modules.project.ui.OpenProjectsTrampolineImpl;
import org.netbeans.spi.java.classpath.ClassPathProvider;
import org.netbeans.spi.java.queries.CompilerOptionsQueryImplementation;
import org.netbeans.spi.java.queries.SourceLevelQueryImplementation2;

/**
Expand All @@ -45,13 +47,14 @@ public CreateTool(String name) {

@Override
protected Info computeInfo() {
return new Info().addAdditionalRoots(Main.class.getName(), DeclarativeHintsTestBase.class.getName(), OpenProjectsTrampolineImpl.class.getName(), J2SEProject.class.getName(), DefaultJavaPlatformProvider.class.getName(), PatternConvertorImpl.class.getName(), BCPFallBack.class.getName(), "org.slf4j.impl.StaticLoggerBinder")
return new Info().addAdditionalRoots(Main.class.getName(), DeclarativeHintsTestBase.class.getName(), OpenProjectsTrampolineImpl.class.getName(), J2SEProject.class.getName(), DefaultJavaPlatformProvider.class.getName(), PatternConvertorImpl.class.getName(), BCPFallBack.class.getName(), "org.slf4j.impl.StaticLoggerBinder", CompilerOptionsQueryImpl.class.getName())
.addAdditionalResources("org/netbeans/modules/java/hints/resources/Bundle.properties", "org/netbeans/modules/java/hints/declarative/resources/Bundle.properties")
.addAdditionalLayers("org/netbeans/modules/java/hints/resources/layer.xml", "org/netbeans/modules/java/hints/declarative/resources/layer.xml")
.addMetaInfRegistrations(new MetaInfRegistration(org.netbeans.modules.project.uiapi.OpenProjectsTrampoline.class, OpenProjectsTrampolineImpl.class))
.addMetaInfRegistrations(new MetaInfRegistration(ClassPathProvider.class.getName(), BCPFallBack.class.getName(), 9999))
.addMetaInfRegistrations(new MetaInfRegistration(ClassPathProvider.class.getName(), Main.ClassPathProviderImpl.class.getName(), 100))
.addMetaInfRegistrations(new MetaInfRegistration(SourceLevelQueryImplementation2.class.getName(), SourceLevelQueryImpl.class.getName(), 100))
.addMetaInfRegistrations(new MetaInfRegistration(CompilerOptionsQueryImplementation.class.getName(), CompilerOptionsQueryImpl.class.getName(), 100))
.addMetaInfRegistrationToCopy(PatternConvertor.class.getName())
.addExcludePattern(Pattern.compile("junit\\.framework\\..*"))
.setEscapeJavaxLang();
Expand Down
7 changes: 5 additions & 2 deletions cmdline/tool/test/unit/src/org/netbeans/modules/jackpot30/cmdline/CreateToolTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,14 @@ protected void reallyRunCompiler(File workingDir, int exitcode, String[] output,

int actualExitCode = p.waitFor();

assertEquals(exitcode, actualExitCode);

outCopy.doJoin();
errCopy.doJoin();

assertEquals(exitcode, actualExitCode);
} catch (Throwable t) {
System.err.println(output[0]);
System.err.println(output[1]);

throw new IOException(t);
}
}
Expand Down
Loading
Loading