Skip to content

Commit

Permalink
Support standard doclet flags, so that this is usable under Gradle (#84)
Browse files Browse the repository at this point in the history
Fixes #83

(cherry picked from commit 13a1359)
  • Loading branch information
niloc132 authored and vegegoku committed Oct 29, 2023
1 parent 5bd2fc2 commit 6b10ba6
Show file tree
Hide file tree
Showing 2 changed files with 79 additions and 42 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public class TsDoclet implements Doclet, HasProcessorEnv {
private Messager messager;
private DocletLogWrapper logWrapper;

public static final String TSOUT_DIR = "-tsoutput";
public static final String TSOUT_DIR = "-d";

private String outputDir;

Expand All @@ -76,47 +76,22 @@ public SourceVersion getSupportedSourceVersion() {

@Override
public Set<? extends Option> getSupportedOptions() {
Option[] options = {
new Option() {

@Override
public int getArgumentCount() {
return 1;
}

@Override
public String getDescription() {
return "Type script generated definition file location";
}

@Override
public Kind getKind() {
return Kind.STANDARD;
}

@Override
public List<String> getNames() {
return List.of(TSOUT_DIR);
}

@Override
public String getParameters() {
return "file";
}

@Override
public boolean process(String opt, List<String> arguments) {
if (arguments.isEmpty()) {
reporter.print(
Diagnostic.Kind.ERROR, "You must specify an output filepath with " + TSOUT_DIR);
return false;
}
outputDir = arguments.get(0);
return true;
}
}
};
return new HashSet<>(Arrays.asList(options));
return Set.of(
TsDocletOption.of(
"-d",
"Type script generated definition file location",
(opt, arguments) -> {
if (arguments.isEmpty()) {
reporter.print(
Diagnostic.Kind.ERROR, "You must specify an output filepath with " + TSOUT_DIR);
return false;
}
outputDir = arguments.get(0);
return true;
}),
TsDocletOption.ignored("-doctitle"),
TsDocletOption.ignored("-windowtitle"),
TsDocletOption.ignored("-notimestamp"));
}

@Override
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
/*
* Copyright © 2023 Vertispan
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.vertispan.tsdefs.doclet;

import java.util.List;
import java.util.function.BiPredicate;
import jdk.javadoc.doclet.Doclet;

public abstract class TsDocletOption implements Doclet.Option {
public static TsDocletOption of(
String name, String description, BiPredicate<String, List<String>> process) {
return new TsDocletOption() {

@Override
public String getDescription() {
return description;
}

@Override
public List<String> getNames() {
return List.of(name);
}

@Override
public boolean process(String s, List<String> list) {
return process.test(s, list);
}
};
}

public static TsDocletOption ignored(String name) {
return of(name, "ignored, only supported to appease Gradle", (opt, args) -> true);
}

@Override
public int getArgumentCount() {
return 1;
}

@Override
public Kind getKind() {
return Kind.STANDARD;
}

@Override
public String getParameters() {
return "value";
}
}

0 comments on commit 6b10ba6

Please sign in to comment.