yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-03 01:39:21 +02:00
Code Issues Releases Wiki Activity

Merge branch 'GT-3362_ryanmkurtz_PR-1287_astrelsky_DocumentationFixes'

Browse source 
Conflicts:
	Ghidra/Framework/Docking/src/main/java/docking/action/DockingAction.java
This commit is contained in:
Ryan Kurtz 2019-12-02 13:22:08 -05:00
commit 6e6bdffe86
659 changed files with 1740 additions and 4136 deletions
Download patch file Download diff file Expand all files Collapse all files

10
gradle/root/distribution.gradle
View file

@ -56,8 +56,10 @@ task createJavadocs(type: Javadoc, description: 'Generate javadocs for all proje
classpath = rootProject.ext.ghidraPath
// If we don't exclude module directories, the javascript search feature doesn't work
options.addBooleanOption("-no-module-directories", true)
if (JavaVersion.current().isJava11()) {
options.addBooleanOption("-no-module-directories", true)
}
// Some internal packages are not public and need to be exported.
options.addMultilineStringsOption("-add-exports").setValue(["java.desktop/sun.awt.image=ALL-UNNAMED",
"java.desktop/sun.awt=ALL-UNNAMED",
@ -108,6 +110,10 @@ task createJsondocs(type: Javadoc, description: 'Generate JSON docs for all proj
// 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)
// Newer versions of gradle set this to true by default.
// The JsonDoclet doesn't have the -notimestamp option so ensure it isn't set.
options.setNoTimestamp(false)
// Some internal packages are not public and need to be exported.
options.addMultilineStringsOption("-add-exports").setValue(["java.desktop/sun.awt.image=ALL-UNNAMED",