GP-0: Moving JsonDoclet

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'
 

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

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'
 			}
 		} 
 	}

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|

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)
 	}

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)