Nixyri/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2024-09-20 09:31:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

GP-0: Moving JsonDoclet

Browse Source
This commit is contained in:
Ryan Kurtz 2024-08-19 13:19:16 -04:00
parent 3588ecdab7
commit 90f712fc00
7 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
GhidraBuild/BuildFiles/JsonDoclet/Module.manifest → GhidraBuild/BuildFiles/Doclets/Module.manifest
View File

2
GhidraBuild/BuildFiles/JsonDoclet/build.gradle → GhidraBuild/BuildFiles/Doclets/build.gradle
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
apply plugin: 'eclipse'
eclipse.project.name = '_JsonDoclet'
eclipse.project.name = '_Doclets'
apply plugin: 'java-library'

4
GhidraBuild/BuildFiles/JsonDoclet/src/main/java/JsonDoclet.java → GhidraBuild/BuildFiles/Doclets/src/main/java/ghidra/doclets/json/JsonDoclet.java
View File

@ -13,6 +13,8 @@
* 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

2
GhidraBuild/BuildFiles/build.gradle
View File

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

2
GhidraBuild/BuildFiles/certification.manifest
View File

@ -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|

6
gradle/root/distribution.gradle
View File

@ -152,7 +152,7 @@ configurations {
}
dependencies {
jsondoc project('JsonDoclet')
jsondoc project('Doclets')
}
@ -166,7 +166,6 @@ task createJsondocs(type: Javadoc, description: 'Generate JSON docs for all proj
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)
}

2
settings.gradle
View File

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