diff --git a/GhidraBuild/BuildFiles/JsonDoclet/Module.manifest b/GhidraBuild/BuildFiles/Doclets/Module.manifest similarity index 100% rename from GhidraBuild/BuildFiles/JsonDoclet/Module.manifest rename to GhidraBuild/BuildFiles/Doclets/Module.manifest diff --git a/GhidraBuild/BuildFiles/JsonDoclet/build.gradle b/GhidraBuild/BuildFiles/Doclets/build.gradle similarity index 94% rename from GhidraBuild/BuildFiles/JsonDoclet/build.gradle rename to GhidraBuild/BuildFiles/Doclets/build.gradle index 707bc040f8..7f5cc31b4a 100644 --- a/GhidraBuild/BuildFiles/JsonDoclet/build.gradle +++ b/GhidraBuild/BuildFiles/Doclets/build.gradle @@ -4,9 +4,9 @@ * 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. @@ -14,7 +14,7 @@ * limitations under the License. */ apply plugin: 'eclipse' -eclipse.project.name = '_JsonDoclet' +eclipse.project.name = '_Doclets' apply plugin: 'java-library' diff --git a/GhidraBuild/BuildFiles/JsonDoclet/src/main/java/JsonDoclet.java b/GhidraBuild/BuildFiles/Doclets/src/main/java/ghidra/doclets/json/JsonDoclet.java similarity index 99% rename from GhidraBuild/BuildFiles/JsonDoclet/src/main/java/JsonDoclet.java rename to GhidraBuild/BuildFiles/Doclets/src/main/java/ghidra/doclets/json/JsonDoclet.java index 7f58362fee..2392b39f41 100644 --- a/GhidraBuild/BuildFiles/JsonDoclet/src/main/java/JsonDoclet.java +++ b/GhidraBuild/BuildFiles/Doclets/src/main/java/ghidra/doclets/json/JsonDoclet.java @@ -4,15 +4,17 @@ * 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 ghidra.doclets.json; + import java.io.*; import java.util.*; import java.util.stream.Collectors; @@ -61,7 +63,7 @@ public class JsonDoclet implements Doclet { @Override public SourceVersion getSupportedSourceVersion() { - return SourceVersion.RELEASE_11; + return SourceVersion.RELEASE_21; } @Override diff --git a/GhidraBuild/BuildFiles/build.gradle b/GhidraBuild/BuildFiles/build.gradle index 292c0e7986..ae9cd18492 100644 --- a/GhidraBuild/BuildFiles/build.gradle +++ b/GhidraBuild/BuildFiles/build.gradle @@ -4,9 +4,9 @@ * 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. @@ -23,7 +23,7 @@ eclipse { type = 'EXCLUDE_ALL' matcher { id = 'org.eclipse.ui.ide.multiFilter' - arguments = '1.0-name-matches-true-false-JsonDoclet' + arguments = '1.0-name-matches-true-false-Doclets' } } } diff --git a/GhidraBuild/BuildFiles/certification.manifest b/GhidraBuild/BuildFiles/certification.manifest index c3dd2b2844..f6ea90fba1 100644 --- a/GhidraBuild/BuildFiles/certification.manifest +++ b/GhidraBuild/BuildFiles/certification.manifest @@ -1,4 +1,4 @@ ##VERSION: 2.0 -JsonDoclet/Module.manifest||GHIDRA||||END| +Doclets/Module.manifest||GHIDRA||||END| sleighDevBuild.template||GHIDRA||||END| sleighDistBuild.template||GHIDRA||||END| diff --git a/gradle/root/distribution.gradle b/gradle/root/distribution.gradle index 06c8ecfe11..ab7876cc94 100644 --- a/gradle/root/distribution.gradle +++ b/gradle/root/distribution.gradle @@ -4,9 +4,9 @@ * 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. @@ -152,7 +152,7 @@ configurations { } dependencies { - jsondoc project('JsonDoclet') + jsondoc project('Doclets') } @@ -165,8 +165,7 @@ task createJsondocs(type: Javadoc, description: 'Generate JSON docs for all proj destinationDir file(ROOT_PROJECT_DIR + "/build/tmp/jsondoc") failOnError false - - + // Must add classpath for main and test source sets. Javadoc will fail if it cannot // find referenced classes. classpath = rootProject.ext.ghidraPath @@ -178,7 +177,6 @@ task createJsondocs(type: Javadoc, description: 'Generate JSON docs for all proj // apply from: "$rootProject.projectDir/gradle/javadoc.gradle" // - // Generate at package level because user may try to get help directly on an object they have // rather than its public interface. options.addBooleanOption("package", true) @@ -190,7 +188,7 @@ task createJsondocs(type: Javadoc, description: 'Generate JSON docs for all proj // Some internal packages are not public and need to be exported. options.addMultilineStringsOption("-add-exports").setValue(["java.desktop/sun.awt=ALL-UNNAMED"]) - options.doclet = "JsonDoclet" + options.doclet = "ghidra.doclets.json.JsonDoclet" doFirst { options.docletpath = new ArrayList(configurations.jsondoc.files) } diff --git a/settings.gradle b/settings.gradle index 30ca74693b..599e2c7c34 100644 --- a/settings.gradle +++ b/settings.gradle @@ -4,9 +4,9 @@ * 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. @@ -33,7 +33,7 @@ includeProjects('GPL') /******************************************************************************************* * Include miscellaneous support modules *******************************************************************************************/ -includeProject('JsonDoclet', 'GhidraBuild/BuildFiles', true) +includeProject('Doclets', 'GhidraBuild/BuildFiles', true) includeProject('LaunchSupport', 'GhidraBuild', true) includeProject('Skeleton', 'GhidraBuild', true) includeProject('BuildFiles', 'GhidraBuild', true)