Merge remote-tracking branch 'origin/ghidravore_gradle_updates'

GPL/CabExtract/build.gradle

@@ -1,4 +1,6 @@
+apply from: "$rootProject.projectDir/gradle/distributableGhidraModule.gradle"
 apply plugin: 'eclipse'
+
 eclipse.project.name = 'GPL CabExtract'
 
 project.ext.cabextract = "cabextract-1.6"

GPL/CabExtract/certification.manifest

@@ -1,8 +1,6 @@
 ##VERSION: 2.0
 ##MODULE IP: GPL 3
 ##MODULE IP: Public Domain
-.classpath||Public Domain||||END|
-.project||Public Domain||||END|
 Module.manifest||Public Domain||||END|
 build.gradle||Public Domain||||END|
 data/cabextract-1.6.tar.gz||GPL 3||||END|

GPL/DMG/build.gradle

@@ -1,4 +1,9 @@
+apply from: "$rootProject.projectDir/gradle/distributableGhidraModule.gradle"
+apply from: "$rootProject.projectDir/gradle/javaProject.gradle"
+apply from: "$rootProject.projectDir/gradle/jacocoProject.gradle"
+apply from: "$rootProject.projectDir/gradle/javaTestProject.gradle"
 apply plugin: 'eclipse'
+
 eclipse.project.name = 'GPL DMG'
 
 /*********************************************************************************

GPL/DMG/certification.manifest

@@ -2,8 +2,6 @@
 ##MODULE IP: GPL 3
 ##MODULE IP: LGPL 2.1
 ##MODULE IP: Public Domain
-.classpath||Public Domain||||END|
-.project||Public Domain||||END|
 Module.manifest||Public Domain||||END|
 build.gradle||Public Domain||||END|
 data/lib/catacombae_csframework.jar||LGPL 2.1||||END|

GPL/DemanglerGnu/build.gradle

@@ -1,4 +1,7 @@
+apply from: "$rootProject.projectDir/gradle/distributableGhidraModule.gradle"
 apply plugin: 'eclipse'
+
+
 eclipse.project.name = 'GPL DemanglerGnu'
 
 apply from: "../nativeBuildProperties.gradle"

GPL/DemanglerGnu/certification.manifest

@@ -4,8 +4,6 @@
 ##MODULE IP: LGPL 2.1
 ##MODULE IP: LGPL 3.0
 ##MODULE IP: Public Domain
-.classpath||GHIDRA||||END|
-.project||Public Domain||||END|
 Module.manifest||Public Domain||||END|
 build.gradle||Public Domain||||END|
 src/demangler_gnu/README.txt||Public Domain||||END|

GPL/nativeBuildProperties.gradle

@@ -110,7 +110,7 @@ def isNativeBinaryMakeTask(Task task, String platform) {
  ******************************************************************************************/
 tasks.addRule("Pattern: buildNatives_<platform name>]: build all natives for given platform") { String taskName ->
 
-	if (taskName.startsWith("buildNatives_") && !project.hasProperty('EXCLUDE_FROM_NATIVE_BUILD')) {
+	if (taskName.startsWith("buildNatives_")) {
 		String platform = taskName - "buildNatives_"
 		
 		task(taskName)  { myTask ->
@@ -180,3 +180,25 @@ tasks.addRule("Pattern: prebuildNatives_<platform name>]: build all natives for
 		}
 	}
 }
+
+/*****************************************************************************************
+ * The following block of code changes the output directory for native builds
+ * to <projectDir>/build/os/<platform>/<executable>  ?? is there a better way to do this?
+ ****************************************************************************************/
+gradle.taskGraph.whenReady {
+		def p = this.project
+		p.tasks.withType(LinkExecutable).each { t ->
+			File f = t.linkedFile.getAsFile().get()
+			String filename = f.getName()
+			NativePlatform platform = t.targetPlatform.get()
+			String osName = platform.getName()
+			t.linkedFile = p.file("build/os/${osName}/$filename")
+		}
+		p.tasks.withType(LinkSharedLibrary).each { t ->
+			File f = t.linkedFile.getAsFile().get()
+			String filename = f.getName()
+			NativePlatform platform = t.targetPlatform.get()
+			String osName = platform.getName()
+			t.linkedFile = p.file("build/os/${osName}/$filename")
+		}
+}

Ghidra/Configurations/Public_Release/build.gradle

@@ -1,2 +1,6 @@
+apply from: "$rootProject.projectDir/gradle/distributableGhidraModule.gradle"
+apply from: "$rootProject.projectDir/gradle/javaProject.gradle"
+apply from: "$rootProject.projectDir/gradle/jacocoProject.gradle"
+apply from: "$rootProject.projectDir/gradle/javaTestProject.gradle"
 apply plugin: 'eclipse'
 eclipse.project.name = 'Z Public Release'

Ghidra/Configurations/Public_Release/certification.manifest

@@ -1,32 +1,10 @@
 ##VERSION: 2.0
-.classpath||GHIDRA||||END|
-.project||GHIDRA||||END|
 Module.manifest||GHIDRA||||END|
 build.gradle||GHIDRA||||END|
 data/PDB_SYMBOL_SERVER_URLS.pdburl||GHIDRA||||END|
 src/global/docs/ChangeHistory.html||GHIDRA||||END|
 src/global/docs/UserAgreement.html||GHIDRA||||END|
 src/global/docs/WhatsNew.html||GHIDRA||||END|
-src/global/docs/languages/html/Diagram1.png||GHIDRA||||END|
-src/global/docs/languages/html/Diagram2.png||GHIDRA||||END|
-src/global/docs/languages/html/Diagram3.png||GHIDRA||||END|
-src/global/docs/languages/html/additionalpcode.html||GHIDRA||||END|
-src/global/docs/languages/html/pcodedescription.html||GHIDRA||||END|
-src/global/docs/languages/html/pcoderef.html||GHIDRA||||END|
-src/global/docs/languages/html/pseudo-ops.html||GHIDRA||||END|
-src/global/docs/languages/html/reference.html||GHIDRA||||END|
-src/global/docs/languages/html/sleigh.html||GHIDRA||||END|
-src/global/docs/languages/html/sleigh_constructors.html||GHIDRA||||END|
-src/global/docs/languages/html/sleigh_context.html||GHIDRA||||END|
-src/global/docs/languages/html/sleigh_definitions.html||GHIDRA||||END|
-src/global/docs/languages/html/sleigh_layout.html||GHIDRA||||END|
-src/global/docs/languages/html/sleigh_preprocessing.html||GHIDRA||||END|
-src/global/docs/languages/html/sleigh_ref.html||GHIDRA||||END|
-src/global/docs/languages/html/sleigh_symbols.html||GHIDRA||||END|
-src/global/docs/languages/html/sleigh_tokens.html||GHIDRA||||END|
-src/global/docs/languages/index.html||GHIDRA||||END|
-src/global/docs/languages/manual_index.txt||GHIDRA||||END|
-src/global/docs/languages/versioning.html||GHIDRA||||END|
 src/main/resources/UserAgreement.html||GHIDRA||||END|
 src/main/resources/defaultTools/CodeBrowser.tool||GHIDRA||||END|
 src/main/resources/splash.txt||GHIDRA||||END|

Ghidra/Extensions/SampleTablePlugin/build.gradle

@@ -1,9 +1,11 @@
+apply from: "$rootProject.projectDir/gradle/distributableGhidraExtension.gradle"
+apply from: "$rootProject.projectDir/gradle/javaProject.gradle"
+apply from: "$rootProject.projectDir/gradle/javaTestProject.gradle"
+apply from: "$rootProject.projectDir/gradle/helpProject.gradle"
 apply plugin: 'eclipse'
 eclipse.project.name = 'Xtra SampleTablePlugin'
 
-apply from: "$rootProject.projectDir/gradleScripts/buildHelp.gradle"
 
-project.ext.includeExtensionInInstallation = true
 
 dependencies {
 	compile project(':Base')

Ghidra/Extensions/SampleTablePlugin/certification.manifest

@@ -1,8 +1,6 @@
 ##VERSION: 2.0
 ##MODULE IP: FAMFAMFAM Icons - CC 2.5
 ##MODULE IP: Oxygen Icons - LGPL 3.0
-.classpath||GHIDRA||||END|
-.project||GHIDRA||||END|
 Module.manifest||GHIDRA||reviewed||END|
 build.gradle||GHIDRA||||END|
 data/ExtensionPoint.manifest||GHIDRA||||END|

Ghidra/Extensions/sample/build.gradle

@@ -1,9 +1,10 @@
+apply from: "$rootProject.projectDir/gradle/distributableGhidraExtension.gradle"
+apply from: "$rootProject.projectDir/gradle/javaProject.gradle"
+apply from: "$rootProject.projectDir/gradle/javaTestProject.gradle"
+apply from: "$rootProject.projectDir/gradle/helpProject.gradle"
 apply plugin: 'eclipse'
 eclipse.project.name = 'Xtra sample'
 
-apply from: "$rootProject.projectDir/gradleScripts/buildHelp.gradle"
-
-project.ext.includeExtensionInInstallation = true
 
 dependencies {
 	compile project(':Base')

Ghidra/Extensions/sample/certification.manifest

@@ -1,8 +1,6 @@
 ##VERSION: 2.0
 ##MODULE IP: FAMFAMFAM Icons - CC 2.5
 ##MODULE IP: Oxygen Icons - LGPL 3.0
-.classpath||GHIDRA||||END|
-.project||GHIDRA||||END|
 Module.manifest||GHIDRA||reviewed||END|
 build.gradle||GHIDRA||||END|
 data/README.txt||GHIDRA||||END|

Ghidra/Features/Base/build.gradle

@@ -1,9 +1,11 @@
+apply from: "$rootProject.projectDir/gradle/distributableGhidraModule.gradle"
+apply from: "$rootProject.projectDir/gradle/javaProject.gradle"
+apply from: "$rootProject.projectDir/gradle/helpProject.gradle"
+apply from: "$rootProject.projectDir/gradle/jacocoProject.gradle"
+apply from: "$rootProject.projectDir/gradle/javaTestProject.gradle"
 apply plugin: 'eclipse'
 eclipse.project.name = 'Features Base'
 
-apply from: "$rootProject.projectDir/gradleScripts/buildHelp.gradle"
-apply from: "$rootProject.projectDir/gradleScripts/ghidraScripts.gradle"
-apply from: "$rootProject.projectDir/gradleScripts/developerScripts.gradle"
 
 /*
 	This build file is a bit different than most project build files, as it initializes
@@ -28,10 +30,10 @@ dependencies {
    	compileOnly "junit:junit:4.12"
 	
 	// These have abstract test classes and stubs needed by this module	
-	testCompile project(':Docking').sourceSets.test.output
-	testCompile project(':Generic').sourceSets.test.output
-	testCompile project(':Project').sourceSets.test.output
-	testCompile project(':SoftwareModeling').sourceSets.test.output
+	testCompile project(path: ':Docking', configuration: 'testArtifacts')
+	testCompile project(path: ':Generic', configuration: 'testArtifacts')
+	testCompile project(path: ':Project', configuration: 'testArtifacts')
+	testCompile project(path: ':SoftwareModeling', configuration: 'testArtifacts')
 	
 	javacc 'net.java.dev.javacc:javacc:5.0'
 }
@@ -147,7 +149,7 @@ def createTipsHelpFile(input, output) {
 	Dependency Setup
 */
 compileJava.dependsOn buildJavacc
-prepDev.dependsOn buildJavacc
+rootProject.prepDev.dependsOn buildJavacc
 
 // 'indexHelp' is defined in the buildHelp.gradle 'script plugin'
 indexHelp.dependsOn generateExtraHelpFiles

Ghidra/Features/Base/certification.manifest

@@ -7,10 +7,8 @@
 ##MODULE IP: Nuvola Icons - LGPL 2.1
 ##MODULE IP: Oxygen Icons - LGPL 3.0
 ##MODULE IP: Tango Icons - Public Domain
-.classpath||GHIDRA||||END|
 .gitignore||GHIDRA||||END|
 .launch/Ghidra.launch||GHIDRA||||END|
-.project||GHIDRA||||END|
 Module.manifest||GHIDRA||||END|
 build.gradle||GHIDRA||||END|
 data/ElfFunctionsThatDoNotReturn||GHIDRA||||END|

Ghidra/Features/BytePatterns/build.gradle

@@ -1,8 +1,11 @@
+apply from: "$rootProject.projectDir/gradle/distributableGhidraModule.gradle"
+apply from: "$rootProject.projectDir/gradle/javaProject.gradle"
+apply from: "$rootProject.projectDir/gradle/helpProject.gradle"
+apply from: "$rootProject.projectDir/gradle/jacocoProject.gradle"
+apply from: "$rootProject.projectDir/gradle/javaTestProject.gradle"
 apply plugin: 'eclipse'
 eclipse.project.name = 'Features BytePatterns'
 
-apply from: "$rootProject.projectDir/gradleScripts/buildHelp.gradle"
-apply from: "$rootProject.projectDir/gradleScripts/ghidraScripts.gradle"
 
 dependencies {
 	compile project(':Base')

Ghidra/Features/BytePatterns/certification.manifest

@@ -1,7 +1,5 @@
 ##VERSION: 2.0
 ##MODULE IP: Oxygen Icons - LGPL 3.0
-.classpath||GHIDRA||||END|
-.project||GHIDRA||||END|
 Module.manifest||GHIDRA||reviewed||END|
 build.gradle||GHIDRA||||END|
 data/test/FileBitPatternInfoReaderTestFile1.xml||GHIDRA||||END|

Ghidra/Features/ByteViewer/build.gradle

@@ -1,8 +1,11 @@
+apply from: "$rootProject.projectDir/gradle/distributableGhidraModule.gradle"
+apply from: "$rootProject.projectDir/gradle/javaProject.gradle"
+apply from: "$rootProject.projectDir/gradle/helpProject.gradle"
+apply from: "$rootProject.projectDir/gradle/jacocoProject.gradle"
+apply from: "$rootProject.projectDir/gradle/javaTestProject.gradle"
 apply plugin: 'eclipse'
 eclipse.project.name = 'Features ByteViewer'
 
-apply from: "$rootProject.projectDir/gradleScripts/buildHelp.gradle"
-
 dependencies {
 
 	compile project(':Base')

Ghidra/Features/ByteViewer/certification.manifest

@@ -1,8 +1,6 @@
 ##VERSION: 2.0
 ##MODULE IP: FAMFAMFAM Icons - CC 2.5
 ##MODULE IP: Oxygen Icons - LGPL 3.0
-.classpath||GHIDRA||||END|
-.project||GHIDRA||||END|
 Module.manifest||GHIDRA||||END|
 build.gradle||GHIDRA||||END|
 data/ExtensionPoint.manifest||GHIDRA||reviewed||END|

Ghidra/Features/DebugUtils/build.gradle

@@ -1,3 +1,7 @@
+apply from: "$rootProject.projectDir/gradle/distributableGhidraModule.gradle"
+apply from: "$rootProject.projectDir/gradle/javaProject.gradle"
+apply from: "$rootProject.projectDir/gradle/jacocoProject.gradle"
+apply from: "$rootProject.projectDir/gradle/javaTestProject.gradle"
 apply plugin: 'eclipse'
 eclipse.project.name = 'Features DebugUtils'
 

Ghidra/Features/DebugUtils/certification.manifest

@@ -1,5 +1,3 @@
 ##VERSION: 2.0
-.classpath||GHIDRA||||END|
-.project||GHIDRA||||END|
 Module.manifest||GHIDRA||reviewed||END|
 build.gradle||GHIDRA||||END|

Ghidra/Features/Decompiler/build.gradle

@@ -1,16 +1,21 @@
+apply from: "$rootProject.projectDir/gradle/javaProject.gradle"
+apply from: "$rootProject.projectDir/gradle/jacocoProject.gradle"
+apply from: "$rootProject.projectDir/gradle/javaTestProject.gradle"
+apply from: "$rootProject.projectDir/gradle/nativeProject.gradle"
+apply from: "$rootProject.projectDir/gradle/helpProject.gradle"
+apply from: "$rootProject.projectDir/gradle/distributableGhidraModule.gradle"
 apply plugin: 'eclipse'
+
 eclipse.project.name = 'Features Decompiler'
 
-apply from: "$rootProject.projectDir/gradleScripts/nativeBuildProperties.gradle"
-apply from: "$rootProject.projectDir/gradleScripts/buildHelp.gradle"
-apply from: "$rootProject.projectDir/gradleScripts/ghidraScripts.gradle"
+
 
 dependencies {
 	compile project(':Base')
 	compile project(':SoftwareModeling')
 	
 	// include Base src/test/resources when running decompiler integration tests (uses defaultTools)
-	integrationTestRuntime project(':Base').sourceSets.test.output
+	integrationTestRuntime project(path: ':Base', configuration: 'testArtifacts')
 	testCompile "org.jmockit:jmockit:1.44"
 	
     helpPath project(path: ":Base", configuration: 'helpPath')
@@ -510,4 +515,24 @@ Task createLexTask(String filename, String binaryName) {
 	}
 }
 
+rootProject.createInstallationZip {
+	dependsOn buildDecompilerDocumentationPdfs
+	
+	
+	def decompilerPdfZipPath = rootProject.ext.ZIP_DIR_PREFIX + "/docs/languages/"
 
+	// Add decompiler pdf files to zip. If the pdf files do not exist during execution time 
+	// (if there was an error or wrong platform), the zip task will move on.
+	buildDecompilerDocumentationPdfs.outputs.each { output ->
+		output.files.each { file ->
+			if (file.name.endsWith("pdf")) {
+				logger.debug("$project.name: Adding Decompiler documentation (if it exists) $file.name to $decompilerPdfZipPath")
+				rootProject.createInstallationZip.from (file) {
+					into {
+						decompilerPdfZipPath
+					}
+				}
+			}
+		}
+	}
+}

Ghidra/Features/Decompiler/certification.manifest

@@ -2,11 +2,8 @@
 ##MODULE IP: FAMFAMFAM Icons - CC 2.5
 ##MODULE IP: Oxygen Icons - LGPL 3.0
 ##MODULE IP: Tango Icons - Public Domain
-.classpath||GHIDRA||||END|
-.project||GHIDRA||||END|
 Module.manifest||GHIDRA||||END|
 build.gradle||GHIDRA||||END|
-src/decompile/.classpath||GHIDRA||||END|
 src/decompile/.cproject||GHIDRA||||END|
 src/decompile/.project||GHIDRA||||END|
 src/decompile/.settings/org.eclipse.jdt.core.prefs||GHIDRA||||END|

Ghidra/Features/DecompilerDependent/build.gradle

@@ -1,4 +1,9 @@
+apply from: "$rootProject.projectDir/gradle/distributableGhidraModule.gradle"
+apply from: "$rootProject.projectDir/gradle/javaProject.gradle"
+apply from: "$rootProject.projectDir/gradle/jacocoProject.gradle"
+apply from: "$rootProject.projectDir/gradle/javaTestProject.gradle"
 apply plugin: 'eclipse'
+
 eclipse.project.name = 'Features DecompilerDependent'
 
 

Ghidra/Features/DecompilerDependent/certification.manifest

@@ -1,6 +1,4 @@
 ##VERSION: 2.0
-.classpath||GHIDRA||||END|
-.project||GHIDRA||||END|
 Module.manifest||GHIDRA||||END|
 build.gradle||GHIDRA||||END|
 data/ExtensionPoint.manifest||GHIDRA||||END|

Ghidra/Features/FileFormats/build.gradle

@@ -1,9 +1,13 @@
+apply from: "$rootProject.projectDir/gradle/distributableGhidraModule.gradle"
+apply from: "$rootProject.projectDir/gradle/javaProject.gradle"
+apply from: "$rootProject.projectDir/gradle/helpProject.gradle"
+apply from: "$rootProject.projectDir/gradle/jacocoProject.gradle"
+apply from: "$rootProject.projectDir/gradle/javaTestProject.gradle"
 apply plugin: 'eclipse'
+
 eclipse.project.name = 'Features FileFormats'
 
-apply from: "$rootProject.projectDir/gradleScripts/buildHelp.gradle"
-apply from: "$rootProject.projectDir/gradleScripts/ghidraScripts.gradle"
-apply from: "$rootProject.projectDir/gradleScripts/developerScripts.gradle"
+
 
 dependencies {
 	compile project(':Base')

Ghidra/Features/FileFormats/certification.manifest

@@ -6,14 +6,11 @@
 ##MODULE IP: Jython License
 ##MODULE IP: LGPL 2.1
 ##MODULE IP: Public Domain
-.classpath||GHIDRA||||END|
-.project||GHIDRA||||END|
 Module.manifest||GHIDRA||||END|
 build.gradle||GHIDRA||||END|
 data/ExtensionPoint.manifest||GHIDRA||||END|
 data/android/eclipse-classpath||GHIDRA||reviewed||END|
 data/android/eclipse-project||GHIDRA||reviewed||END|
-data/build.xml||GHIDRA||||END|
 data/crypto/README.txt||GHIDRA||||END|
 src/main/help/help/TOC_Source.xml||GHIDRA||||END|
 src/main/help/help/topics/FileFormatsPlugin/FileFormats.html||GHIDRA||||END|

Ghidra/Features/FunctionGraph/build.gradle

@@ -1,7 +1,12 @@
+apply from: "$rootProject.projectDir/gradle/distributableGhidraModule.gradle"
+apply from: "$rootProject.projectDir/gradle/javaProject.gradle"
+apply from: "$rootProject.projectDir/gradle/helpProject.gradle"
+apply from: "$rootProject.projectDir/gradle/jacocoProject.gradle"
+apply from: "$rootProject.projectDir/gradle/javaTestProject.gradle"
 apply plugin: 'eclipse'
+
 eclipse.project.name = 'Features Graph FunctionGraph'
 
-apply from: "$rootProject.projectDir/gradleScripts/buildHelp.gradle"
 
 
 dependencies {

Ghidra/Features/FunctionGraph/certification.manifest

@@ -4,8 +4,6 @@
 ##MODULE IP: FAMFAMFAM Icons - CC 2.5
 ##MODULE IP: Oxygen Icons - LGPL 3.0
 ##MODULE IP: Tango Icons - Public Domain
-.classpath||GHIDRA||||END|
-.project||GHIDRA||||END|
 Module.manifest||GHIDRA||||END|
 build.gradle||GHIDRA||||END|
 data/ExtensionPoint.manifest||GHIDRA||||END|

Ghidra/Features/FunctionGraphDecompilerExtension/build.gradle

@@ -1,4 +1,9 @@
+apply from: "$rootProject.projectDir/gradle/distributableGhidraModule.gradle"
+apply from: "$rootProject.projectDir/gradle/javaProject.gradle"
+apply from: "$rootProject.projectDir/gradle/jacocoProject.gradle"
+apply from: "$rootProject.projectDir/gradle/javaTestProject.gradle"
 apply plugin: 'eclipse'
+
 eclipse.project.name = 'Features Graph FunctionGraphDecompilerExt'
 
 dependencies {

Ghidra/Features/FunctionGraphDecompilerExtension/certification.manifest

@@ -1,6 +1,4 @@
 ##VERSION: 2.0
-.classpath||GHIDRA||||END|
-.project||GHIDRA||||END|
 Module.manifest||GHIDRA||||END|
 build.gradle||GHIDRA||||END|
 src/main/resources/images/function_graph_code_flow.png||GHIDRA||reviewed||END|

Ghidra/Features/FunctionID/build.gradle

@@ -1,8 +1,12 @@
+apply from: "$rootProject.projectDir/gradle/distributableGhidraModule.gradle"
+apply from: "$rootProject.projectDir/gradle/javaProject.gradle"
+apply from: "$rootProject.projectDir/gradle/helpProject.gradle"
+apply from: "$rootProject.projectDir/gradle/jacocoProject.gradle"
+apply from: "$rootProject.projectDir/gradle/javaTestProject.gradle"
 apply plugin: 'eclipse'
+
 eclipse.project.name = 'Features FunctionID'
 
-apply from: "$rootProject.projectDir/gradleScripts/buildHelp.gradle"
-apply from: "$rootProject.projectDir/gradleScripts/ghidraScripts.gradle"
 
 dependencies {
 	compile project(":Base")
@@ -172,11 +176,11 @@ task buildFidDocumentationHtml(type: Exec) {
 	}
 }
 
-// Ensure that unpacked Fid Db's are included in common
-rootProject.assembleCommon.dependsOn(unpackFidDatabases)
+// Ensure that unpacked Fid Db's are included
+rootProject.assembleDistribution.dependsOn(unpackFidDatabases)
 
 // Ensure that Fidb's are unpacked in development
-prepDev.dependsOn unpackFidDatabases
+rootProject.prepDev.dependsOn unpackFidDatabases
 
 //********************************
 // Packed Database Unpack Methods

Ghidra/Features/FunctionID/certification.manifest

@@ -1,8 +1,6 @@
 ##VERSION: 2.0
 ##MODULE IP: BSD
 ##MODULE IP: Nuvola Icons - LGPL 2.1
-.classpath||GHIDRA||||END|
-.project||GHIDRA||||END|
 Module.manifest||GHIDRA||||END|
 build.gradle||GHIDRA||||END|
 data/building_fid.txt||GHIDRA|exclude|||END|

Ghidra/Features/GhidraServer/build.gradle

@@ -1,4 +1,9 @@
+apply from: "$rootProject.projectDir/gradle/distributableGhidraModule.gradle"
+apply from: "$rootProject.projectDir/gradle/javaProject.gradle"
+apply from: "$rootProject.projectDir/gradle/jacocoProject.gradle"
+apply from: "$rootProject.projectDir/gradle/javaTestProject.gradle"
 apply plugin: 'eclipse'
+
 eclipse.project.name = 'Features GhidraServer'
 
 def yajswRelease = "yajsw-stable-12.12"
@@ -85,14 +90,14 @@ task generateGhidraServerClasspath {
 }
 
 /**
- * The classpath.frag file created below needs to be placed in the common folder under the root
+ * The classpath.frag file created below needs to be placed in the staging folder under the root
  * path of this project.
  *
  * Note that we use 'this.project' to reference the GhidraServer project - this is because
  * inside the closure, 'project' refers to the root project, while 'this' refers to 
  * GhidraServer.
  */
-rootProject.assembleCommon { 
+rootProject.assembleDistribution { 
 	into (getZipPath(this.project)  + "/data") {
 		with yajswCopySpec
 		from generateGhidraServerClasspath
@@ -145,8 +150,8 @@ task generateDevGhidraServerClasspath {
  * We want the two main tasks in this build file to be run at the appropriate time; the  
  * dev task should be run during prepDev; the other should be run during the build       
  *****************************************************************************************/
-prepDev.dependsOn(generateDevGhidraServerClasspath)
-prepDev.dependsOn(yajswDevUnpack)
+rootProject.prepDev.dependsOn(generateDevGhidraServerClasspath)
+rootProject.prepDev.dependsOn(yajswDevUnpack)
 //compileJava.dependsOn(generateGhidraServerClasspath)
 
 

Ghidra/Features/GhidraServer/certification.manifest

@@ -2,8 +2,6 @@
 ##MODULE IP: Apache License 2.0
 ##MODULE IP: LGPL 2.1
 ##MODULE IP: Tango Icons - Public Domain
-.classpath||GHIDRA||||END|
-.project||GHIDRA||||END|
 Module.manifest||GHIDRA||||END|
 build.gradle||GHIDRA||||END|
 data/jaas-modules-src-1.0.3.zip||LGPL 2.1|||File corresponds to original distribution with all binary product files removed.|END|

Ghidra/Features/GnuDemangler/build.gradle

@@ -1,6 +1,11 @@
+apply from: "$rootProject.projectDir/gradle/distributableGhidraModule.gradle"
+apply from: "$rootProject.projectDir/gradle/javaProject.gradle"
+apply from: "$rootProject.projectDir/gradle/jacocoProject.gradle"
+apply from: "$rootProject.projectDir/gradle/javaTestProject.gradle"
 apply plugin: 'eclipse'
+
 eclipse.project.name = 'Features GnuDemangler'
-apply from: "$rootProject.projectDir/gradleScripts/ghidraScripts.gradle"
+
 
 dependencies {
 	compile project(":Base")

Ghidra/Features/GnuDemangler/certification.manifest

@@ -1,7 +1,5 @@
 ##VERSION: 2.0
 ##MODULE IP: BSD
-.classpath||GHIDRA||||END|
-.project||GHIDRA||||END|
 Module.manifest||GHIDRA||||END|
 build.gradle||GHIDRA||||END|
 src/test/resources/ghidra/app/util/demangler/gnu_mangled_names.txt||GHIDRA||reviewed||END|

Ghidra/Features/GraphFunctionCalls/build.gradle

@@ -1,7 +1,12 @@
+apply from: "$rootProject.projectDir/gradle/distributableGhidraModule.gradle"
+apply from: "$rootProject.projectDir/gradle/javaProject.gradle"
+apply from: "$rootProject.projectDir/gradle/helpProject.gradle"
+apply from: "$rootProject.projectDir/gradle/jacocoProject.gradle"
+apply from: "$rootProject.projectDir/gradle/javaTestProject.gradle"
 apply plugin: 'eclipse'
+
 eclipse.project.name = 'Features Graph FunctionCalls'
 
-apply from: "$rootProject.projectDir/gradleScripts/buildHelp.gradle"
 
 // Note: this module's name is 'GraphFunctionCalls'
 dependencies {
@@ -15,7 +20,7 @@ dependencies {
 	helpPath project(path: ":FunctionGraph", configuration: 'helpPath')
 	
 	// These have abstract test classes and stubs needed by this module	
-	testCompile project(':Project').sourceSets.test.output
-	testCompile project(':SoftwareModeling').sourceSets.test.output
+	testCompile project(path: ':Project', configuration: 'testArtifacts')
+	testCompile project(path: ':SoftwareModeling', configuration: 'testArtifacts')
 
 }

Ghidra/Features/GraphFunctionCalls/certification.manifest

@@ -1,7 +1,5 @@
 ##VERSION: 2.0
 ##MODULE IP: Oxygen Icons - LGPL 3.0
-.classpath||GHIDRA||||END|
-.project||GHIDRA||||END|
 Module.manifest||GHIDRA||||END|
 build.gradle||GHIDRA||||END|
 src/main/help/help/TOC_Source.xml||GHIDRA||||END|

Ghidra/Features/MicrosoftCodeAnalyzer/build.gradle

@@ -1,4 +1,9 @@
+apply from: "$rootProject.projectDir/gradle/distributableGhidraModule.gradle"
+apply from: "$rootProject.projectDir/gradle/javaProject.gradle"
+apply from: "$rootProject.projectDir/gradle/jacocoProject.gradle"
+apply from: "$rootProject.projectDir/gradle/javaTestProject.gradle"
 apply plugin: 'eclipse'
+
 eclipse.project.name = 'Features MicrosoftCodeAnalyzer'
 
 dependencies {

Ghidra/Features/MicrosoftCodeAnalyzer/certification.manifest

@@ -1,5 +1,3 @@
 ##VERSION: 2.0
-.classpath||GHIDRA||||END|
-.project||GHIDRA||||END|
 Module.manifest||GHIDRA||reviewed||END|
 build.gradle||GHIDRA||||END|

Ghidra/Features/MicrosoftDemangler/build.gradle

@@ -1,7 +1,11 @@
+apply from: "$rootProject.projectDir/gradle/distributableGhidraModule.gradle"
+apply from: "$rootProject.projectDir/gradle/javaProject.gradle"
+apply from: "$rootProject.projectDir/gradle/jacocoProject.gradle"
+apply from: "$rootProject.projectDir/gradle/javaTestProject.gradle"
 apply plugin: 'eclipse'
+
 eclipse.project.name = 'Features MicrosoftDemangler'
 
-apply from: "$rootProject.projectDir/gradleScripts/developerScripts.gradle"
 
 dependencies {
 	compile project(":Base")

Ghidra/Features/MicrosoftDemangler/certification.manifest

@@ -1,5 +1,3 @@
 ##VERSION: 2.0
-.classpath||GHIDRA||||END|
-.project||GHIDRA||||END|
 Module.manifest||GHIDRA||reviewed||END|
 build.gradle||GHIDRA||||END|

Ghidra/Features/MicrosoftDmang/build.gradle

@@ -1,4 +1,9 @@
+apply from: "$rootProject.projectDir/gradle/distributableGhidraModule.gradle"
+apply from: "$rootProject.projectDir/gradle/javaProject.gradle"
+apply from: "$rootProject.projectDir/gradle/jacocoProject.gradle"
+apply from: "$rootProject.projectDir/gradle/javaTestProject.gradle"
 apply plugin: 'eclipse'
+
 eclipse.project.name = 'Features MicrosoftDemang'
 
 project.ext.excludeFromParallelTests = true

Ghidra/Features/MicrosoftDmang/certification.manifest

@@ -1,6 +1,4 @@
 ##VERSION: 2.0
-.classpath||GHIDRA||||END|
-.project||GHIDRA||||END|
 Module.manifest||GHIDRA||||END|
 build.gradle||GHIDRA||||END|
 src/main/java/mdemangler/MDMang_README.txt||GHIDRA||||END|

Ghidra/Features/PDB/build.gradle

@@ -1,10 +1,12 @@
+apply from: "$rootProject.projectDir/gradle/distributableGhidraModule.gradle"
+apply from: "$rootProject.projectDir/gradle/javaProject.gradle"
+apply from: "$rootProject.projectDir/gradle/jacocoProject.gradle"
+apply from: "$rootProject.projectDir/gradle/javaTestProject.gradle"
+apply from: "$rootProject.projectDir/gradle/nativeProject.gradle"
 apply plugin: 'eclipse'
+
 eclipse.project.name = 'Features PDB'
 
-/*********************************************************************************
- * Imports
- *********************************************************************************/
-apply from: "$rootProject.projectDir/gradleScripts/nativeBuildProperties.gradle"
 
 /*********************************************************************************
  * Build dependencies
@@ -23,7 +25,7 @@ dependencies {
  * inside the closure, 'project' refers to the root project, while 'this' refers to 
  * PDB.
  */
-rootProject.assembleCommon {
+rootProject.assembleDistribution {
 	into (getZipPath(this.project) + "/src/pdb") {
 		from projectDir.toString() + "/src/pdb"
 	}

Ghidra/Features/PDB/certification.manifest

@@ -1,6 +1,4 @@
 ##VERSION: 2.0
-.classpath||GHIDRA||||END|
-.project||GHIDRA||||END|
 Module.manifest||GHIDRA||||END|
 build.gradle||GHIDRA||||END|
 src/global/docs/README_PDB.html||GHIDRA||||END|

Ghidra/Features/ProgramDiff/build.gradle

@@ -1,7 +1,12 @@
+apply from: "$rootProject.projectDir/gradle/distributableGhidraModule.gradle"
+apply from: "$rootProject.projectDir/gradle/javaProject.gradle"
+apply from: "$rootProject.projectDir/gradle/helpProject.gradle"
+apply from: "$rootProject.projectDir/gradle/jacocoProject.gradle"
+apply from: "$rootProject.projectDir/gradle/javaTestProject.gradle"
 apply plugin: 'eclipse'
+
 eclipse.project.name = 'Features ProgramDiff'
 
-apply from: "$rootProject.projectDir/gradleScripts/buildHelp.gradle"
 
 dependencies {
 	compile project(":Base")

Ghidra/Features/ProgramDiff/certification.manifest

@@ -1,12 +1,10 @@
 ##VERSION: 2.0
-##MODULE IP: Nuvola Icons - LGPL 2.1
-##MODULE IP: Modified Nuvola Icons - LGPL 2.1
-##MODULE IP: Tango Icons - Public Domain
-##MODULE IP: FAMFAMFAM Icons - CC 2.5
-##MODULE IP: Oxygen Icons - LGPL 3.0
 ##MODULE IP: Crystal Clear Icons - LGPL 2.1
-.classpath||GHIDRA||||END|
-.project||GHIDRA||||END|
+##MODULE IP: FAMFAMFAM Icons - CC 2.5
+##MODULE IP: Modified Nuvola Icons - LGPL 2.1
+##MODULE IP: Nuvola Icons - LGPL 2.1
+##MODULE IP: Oxygen Icons - LGPL 3.0
+##MODULE IP: Tango Icons - Public Domain
 Module.manifest||GHIDRA||||END|
 build.gradle||GHIDRA||||END|
 src/main/help/help/TOC_Source.xml||GHIDRA||||END|

Ghidra/Features/Python/build.gradle

@@ -1,7 +1,12 @@
+apply from: "$rootProject.projectDir/gradle/distributableGhidraModule.gradle"
+apply from: "$rootProject.projectDir/gradle/javaProject.gradle"
+apply from: "$rootProject.projectDir/gradle/helpProject.gradle"
+apply from: "$rootProject.projectDir/gradle/jacocoProject.gradle"
+apply from: "$rootProject.projectDir/gradle/javaTestProject.gradle"
 apply plugin: 'eclipse'
+
 eclipse.project.name = 'Features Python'
 
-apply from: "$rootProject.projectDir/gradleScripts/buildHelp.gradle"
 
 def JYTHON = "org.python:jython-standalone:2.7.1"
 def JYTHON_DIR = "jython-2.7.1"
@@ -40,6 +45,6 @@ task pythonSrcCopy(type: Copy) {
 }
 
 // Ensure that Jython is usable in development xx
-prepDev.dependsOn jythonUnpack
+rootProject.prepDev.dependsOn jythonUnpack
 jar.dependsOn jythonUnpack
 jar.dependsOn pythonSrcCopy

Ghidra/Features/Python/certification.manifest

@@ -1,8 +1,6 @@
 ##VERSION: 2.0
 ##MODULE IP: Jython License
 ##MODULE IP: LGPL 2.1
-.classpath||GHIDRA||||END|
-.project||GHIDRA||||END|
 Module.manifest||GHIDRA||||END|
 build.gradle||GHIDRA||||END|
 ghidra_scripts/AddCommentToProgramScriptPy.py||GHIDRA||||END|

Ghidra/Features/Recognizers/build.gradle

@@ -1,4 +1,9 @@
+apply from: "$rootProject.projectDir/gradle/distributableGhidraModule.gradle"
+apply from: "$rootProject.projectDir/gradle/javaProject.gradle"
+apply from: "$rootProject.projectDir/gradle/jacocoProject.gradle"
+apply from: "$rootProject.projectDir/gradle/javaTestProject.gradle"
 apply plugin: 'eclipse'
+
 eclipse.project.name = 'Features Recognizers'
 
 dependencies {

Ghidra/Features/Recognizers/certification.manifest

@@ -1,5 +1,3 @@
 ##VERSION: 2.0
-.classpath||GHIDRA||||END|
-.project||GHIDRA||||END|
 Module.manifest||GHIDRA||||END|
 build.gradle||GHIDRA||||END|

Ghidra/Features/SourceCodeLookup/build.gradle

@@ -1,7 +1,11 @@
+apply from: "$rootProject.projectDir/gradle/distributableGhidraModule.gradle"
+apply from: "$rootProject.projectDir/gradle/javaProject.gradle"
+apply from: "$rootProject.projectDir/gradle/helpProject.gradle"
+apply from: "$rootProject.projectDir/gradle/jacocoProject.gradle"
+apply from: "$rootProject.projectDir/gradle/javaTestProject.gradle"
 apply plugin: 'eclipse'
-eclipse.project.name = 'Features SourceCodeLookup'
 
-apply from: "$rootProject.projectDir/gradleScripts/buildHelp.gradle"
+eclipse.project.name = 'Features SourceCodeLookup'
 
 dependencies {
 	compile project(":Base")

Ghidra/Features/SourceCodeLookup/certification.manifest

@@ -1,7 +1,5 @@
 ##VERSION: 2.0
 ##MODULE IP: Oxygen Icons - LGPL 3.0
-.classpath||GHIDRA||||END|
-.project||GHIDRA||||END|
 Module.manifest||GHIDRA||reviewed||END|
 build.gradle||GHIDRA||||END|
 src/main/help/help/TOC_Source.xml||GHIDRA||||END|

Ghidra/Features/VersionTracking/build.gradle

@@ -1,12 +1,14 @@
+apply from: "$rootProject.projectDir/gradle/distributableGhidraModule.gradle"
+apply from: "$rootProject.projectDir/gradle/javaProject.gradle"
+apply from: "$rootProject.projectDir/gradle/helpProject.gradle"
+apply from: "$rootProject.projectDir/gradle/jacocoProject.gradle"
+apply from: "$rootProject.projectDir/gradle/javaTestProject.gradle"
 apply plugin: 'eclipse'
+
 eclipse.project.name = 'Features VersionTracking'
 
 project.ext.excludeFromParallelIntegrationTests = true
 
-apply from: "$rootProject.projectDir/gradleScripts/buildHelp.gradle"
-apply from: "$rootProject.projectDir/gradleScripts/ghidraScripts.gradle"
-apply from: "$rootProject.projectDir/gradleScripts/developerScripts.gradle"
-
 dependencies {
 	compile project(":Base")
 	

Ghidra/Features/VersionTracking/certification.manifest

@@ -3,8 +3,6 @@
 ##MODULE IP: Nuvola Icons - LGPL 2.1
 ##MODULE IP: Oxygen Icons - LGPL 3.0
 ##MODULE IP: Tango Icons - Public Domain
-.classpath||GHIDRA||||END|
-.project||GHIDRA||||END|
 Module.manifest||GHIDRA||||END|
 build.gradle||GHIDRA||||END|
 data/ExtensionPoint.manifest||GHIDRA||reviewed||END|

Ghidra/Framework/DB/build.gradle

@@ -1,4 +1,9 @@
+apply from: "$rootProject.projectDir/gradle/distributableGhidraModule.gradle"
+apply from: "$rootProject.projectDir/gradle/javaProject.gradle"
+apply from: "$rootProject.projectDir/gradle/jacocoProject.gradle"
+apply from: "$rootProject.projectDir/gradle/javaTestProject.gradle"
 apply plugin: 'eclipse'
+
 eclipse.project.name = 'Framework DB'
 
 dependencies {

Ghidra/Framework/DB/certification.manifest

@@ -1,5 +1,3 @@
 ##VERSION: 2.0
-.classpath||GHIDRA||||END|
-.project||GHIDRA||||END|
 Module.manifest||GHIDRA||reviewed||END|
 build.gradle||GHIDRA||||END|

Ghidra/Framework/Demangler/build.gradle

@@ -1,4 +1,9 @@
+apply from: "$rootProject.projectDir/gradle/distributableGhidraModule.gradle"
+apply from: "$rootProject.projectDir/gradle/javaProject.gradle"
+apply from: "$rootProject.projectDir/gradle/jacocoProject.gradle"
+apply from: "$rootProject.projectDir/gradle/javaTestProject.gradle"
 apply plugin: 'eclipse'
+
 eclipse.project.name = 'Framework Demangler'
 
 dependencies {

Ghidra/Framework/Demangler/certification.manifest

@@ -1,5 +1,3 @@
 ##VERSION: 2.0
-.classpath||GHIDRA||||END|
-.project||GHIDRA||||END|
 Module.manifest||GHIDRA||reviewed||END|
 build.gradle||GHIDRA||||END|

Ghidra/Framework/Docking/build.gradle

@@ -1,4 +1,9 @@
+apply from: "$rootProject.projectDir/gradle/distributableGhidraModule.gradle"
+apply from: "$rootProject.projectDir/gradle/javaProject.gradle"
+apply from: "$rootProject.projectDir/gradle/jacocoProject.gradle"
+apply from: "$rootProject.projectDir/gradle/javaTestProject.gradle"
 apply plugin: 'eclipse'
+
 eclipse.project.name = 'Framework Docking'
 
 dependencies {
@@ -13,8 +18,7 @@ dependencies {
 	
 	
 	// include code from src/test in Generic
-	testCompile project(':Generic').sourceSets.test.output
-	
+	testCompile project(path: ':Generic', configuration: 'testArtifacts')
 	compileOnly "junit:junit:4.12"
 }
 

Ghidra/Framework/Docking/certification.manifest

@@ -1,15 +1,13 @@
 ##VERSION: 2.0
 ##MODULE IP: BSD
-##MODULE IP: GPL 2 With Classpath Exception
-##MODULE IP: Nuvola Icons - LGPL 2.1
-##MODULE IP: Modified Nuvola Icons - LGPL 2.1
-##MODULE IP: Tango Icons - Public Domain
-##MODULE IP: FAMFAMFAM Icons - CC 2.5
-##MODULE IP: Oxygen Icons - LGPL 3.0
 ##MODULE IP: Crystal Clear Icons - LGPL 2.1
+##MODULE IP: FAMFAMFAM Icons - CC 2.5
+##MODULE IP: GPL 2 With Classpath Exception
 ##MODULE IP: LGPL 2.1
-.classpath||GHIDRA||||END|
-.project||GHIDRA||||END|
+##MODULE IP: Modified Nuvola Icons - LGPL 2.1
+##MODULE IP: Nuvola Icons - LGPL 2.1
+##MODULE IP: Oxygen Icons - LGPL 3.0
+##MODULE IP: Tango Icons - Public Domain
 Module.manifest||GHIDRA||||END|
 build.gradle||GHIDRA||||END|
 data/ExtensionPoint.manifest||GHIDRA||||END|
@@ -46,7 +44,6 @@ src/main/resources/images/eatbits4.png||GHIDRA||reviewed||END|
 src/main/resources/images/eatbits5.png||GHIDRA||reviewed||END|
 src/main/resources/images/eatbits6.png||GHIDRA||reviewed||END|
 src/main/resources/images/eatbits7.png||GHIDRA||reviewed||END|
-src/main/resources/images/edit-clear-reverse.png||Oxygen Icons - LGPL 3.0|||mirror image of edit-clear.png|END|
 src/main/resources/images/edit-clear.png||Tango Icons - Public Domain|||tango icon set|END|
 src/main/resources/images/edit-cut22.png||Tango Icons - Public Domain|||original name edit-cut.png in tango 22x22|END|
 src/main/resources/images/edit-delete.png||Oxygen Icons - LGPL 3.0|||Oxygen icon theme (dual license; LGPL or CC-SA-3.0)|END|

Ghidra/Framework/FileSystem/build.gradle

@@ -1,4 +1,9 @@
+apply from: "$rootProject.projectDir/gradle/distributableGhidraModule.gradle"
+apply from: "$rootProject.projectDir/gradle/javaProject.gradle"
+apply from: "$rootProject.projectDir/gradle/jacocoProject.gradle"
+apply from: "$rootProject.projectDir/gradle/javaTestProject.gradle"
 apply plugin: 'eclipse'
+
 eclipse.project.name = 'Framework FileSystem'
 
 dependencies {

Ghidra/Framework/FileSystem/certification.manifest

@@ -1,7 +1,5 @@
 ##VERSION: 2.0
 ##MODULE IP: Christian Plattner
-.classpath||GHIDRA||||END|
-.project||GHIDRA||||END|
 Module.manifest||GHIDRA||||END|
 build.gradle||GHIDRA||||END|
 src/main/java/ghidra/framework/client/package.html||GHIDRA||reviewed||END|

Ghidra/Framework/Generic/build.gradle

@@ -1,6 +1,11 @@
 import org.gradle.plugins.ide.eclipse.model.Container;
 
+apply from: "$rootProject.projectDir/gradle/distributableGhidraModule.gradle"
+apply from: "$rootProject.projectDir/gradle/javaProject.gradle"
+apply from: "$rootProject.projectDir/gradle/jacocoProject.gradle"
+apply from: "$rootProject.projectDir/gradle/javaTestProject.gradle"
 apply plugin: 'eclipse'
+
 eclipse.project.name = 'Framework Generic'
 
 dependencies {

Ghidra/Framework/Generic/certification.manifest

@@ -11,7 +11,6 @@
 ##MODULE IP: Tango Icons - Public Domain
 .classpath||GHIDRA||||END|
 .gitignore||GHIDRA||||END|
-.project||GHIDRA||||END|
 Module.manifest||GHIDRA||||END|
 build.gradle||GHIDRA||||END|
 data/ExtensionPoint.manifest||GHIDRA||||END|

Ghidra/Framework/Graph/build.gradle

@@ -1,4 +1,9 @@
+apply from: "$rootProject.projectDir/gradle/distributableGhidraModule.gradle"
+apply from: "$rootProject.projectDir/gradle/javaProject.gradle"
+apply from: "$rootProject.projectDir/gradle/jacocoProject.gradle"
+apply from: "$rootProject.projectDir/gradle/javaTestProject.gradle"
 apply plugin: 'eclipse'
+
 eclipse.project.name = 'Framework Graph'
 
 dependencies {

Ghidra/Framework/Graph/certification.manifest

@@ -1,9 +1,7 @@
 ##VERSION: 2.0
 ##MODULE IP: BSD
-##MODULE IP: Oxygen Icons - LGPL 3.0
 ##MODULE IP: FAMFAMFAM Icons - CC 2.5
-.classpath||GHIDRA||||END|
-.project||GHIDRA||||END|
+##MODULE IP: Oxygen Icons - LGPL 3.0
 Module.manifest||GHIDRA||||END|
 build.gradle||GHIDRA||||END|
 src/main/docs/README.txt||GHIDRA||||END|

Ghidra/Framework/Help/build.gradle

@@ -1,4 +1,9 @@
+apply from: "$rootProject.projectDir/gradle/distributableGhidraModule.gradle"
+apply from: "$rootProject.projectDir/gradle/javaProject.gradle"
+apply from: "$rootProject.projectDir/gradle/jacocoProject.gradle"
+apply from: "$rootProject.projectDir/gradle/javaTestProject.gradle"
 apply plugin: 'eclipse'
+
 eclipse.project.name = 'Framework Help'
 
 dependencies {
@@ -8,4 +13,3 @@ dependencies {
 //	compile name:'jh' - provided by Docking
 
 }
-

Ghidra/Framework/Help/certification.manifest

@@ -1,6 +1,4 @@
 ##VERSION: 2.0
-.classpath||GHIDRA||||END|
-.project||GHIDRA||||END|
 Module.manifest||GHIDRA||||END|
 build.files/buildLocalHelp.xml||GHIDRA||||END|
 build.gradle||GHIDRA||||END|

Ghidra/Framework/Project/build.gradle

@@ -1,4 +1,9 @@
+apply from: "$rootProject.projectDir/gradle/distributableGhidraModule.gradle"
+apply from: "$rootProject.projectDir/gradle/javaProject.gradle"
+apply from: "$rootProject.projectDir/gradle/jacocoProject.gradle"
+apply from: "$rootProject.projectDir/gradle/javaTestProject.gradle"
 apply plugin: 'eclipse'
+
 eclipse.project.name = 'Framework Project'
 
 dependencies {

Ghidra/Framework/Project/certification.manifest

@@ -1,12 +1,10 @@
 ##VERSION: 2.0
 ##MODULE IP: Apache License 2.0
-##MODULE IP: Modified Nuvola Icons - LGPL 2.1
-##MODULE IP: Tango Icons - Public Domain
-##MODULE IP: FAMFAMFAM Icons - CC 2.5
-##MODULE IP: Oxygen Icons - LGPL 3.0
 ##MODULE IP: Crystal Clear Icons - LGPL 2.1
-.classpath||GHIDRA||||END|
-.project||GHIDRA||||END|
+##MODULE IP: FAMFAMFAM Icons - CC 2.5
+##MODULE IP: Modified Nuvola Icons - LGPL 2.1
+##MODULE IP: Oxygen Icons - LGPL 3.0
+##MODULE IP: Tango Icons - Public Domain
 Module.manifest||GHIDRA||||END|
 build.gradle||GHIDRA||||END|
 data/ExtensionPoint.manifest||GHIDRA||||END|

Ghidra/Framework/SoftwareModeling/build.gradle

@@ -1,8 +1,17 @@
+apply from: "$rootProject.projectDir/gradle/distributableGhidraModule.gradle"
+apply from: "$rootProject.projectDir/gradle/javaProject.gradle"
+apply from: "$rootProject.projectDir/gradle/jacocoProject.gradle"
+apply from: "$rootProject.projectDir/gradle/javaTestProject.gradle"
 apply plugin: 'eclipse'
+
 eclipse.project.name = 'Framework SoftwareModeling'
 
 apply plugin: 'antlr'
 
+// make sure antlr code gets built during prepdev so that the directories are created and 
+// eclipse doesn't complain about missing src directories.
+rootProject.prepDev.dependsOn compileJava
+
 dependencies {
 	compile project(':Generic')
 	compile project(':FileSystem')
@@ -21,11 +30,7 @@ dependencies {
 	// Must specify the specific antlr implementation to use or it will default to trying to find
 	// version 2.7.7 (which we don't have)
 	antlr "org.antlr:antlr:3.5.2"
-}
-
-// Define classpath needed to execute sleigh compiler during development
-// (see gradleScripts/processorUtils.gradle)
-ext.sleighDevClasspath = project.sourceSets.main.runtimeClasspath.collect { it.absolutePath }.join(':')		
+}	
 
 def genSrcDir = 'generated-src/antlr/main'
 generateGrammarSource {

Ghidra/Framework/SoftwareModeling/certification.manifest

@@ -2,8 +2,6 @@
 ##MODULE IP: BSD
 ##MODULE IP: Creative Commons Attribution 2.5
 ##MODULE IP: Tango Icons - Public Domain
-.classpath||GHIDRA||||END|
-.project||GHIDRA||||END|
 Module.manifest||GHIDRA||||END|
 Sleigh.launch||GHIDRA||||END|
 build.gradle||GHIDRA||||END|

Ghidra/Framework/Utility/build.gradle

@@ -1,4 +1,9 @@
+apply from: "$rootProject.projectDir/gradle/distributableGhidraModule.gradle"
+apply from: "$rootProject.projectDir/gradle/javaProject.gradle"
+apply from: "$rootProject.projectDir/gradle/jacocoProject.gradle"
+apply from: "$rootProject.projectDir/gradle/javaTestProject.gradle"
 apply plugin: 'eclipse'
+
 eclipse.project.name = 'Framework Utility'
 
 // Restrict to Java 1.8 for compatibility with the GhidraDev Eclipse plugin.

Ghidra/Framework/Utility/certification.manifest

@@ -1,5 +1,3 @@
 ##VERSION: 2.0
-.classpath||GHIDRA||||END|
-.project||GHIDRA||||END|
 Module.manifest||GHIDRA||reviewed||END|
 build.gradle||GHIDRA||||END|

Ghidra/Processors/6502/build.gradle

@@ -1,8 +1,7 @@
+apply from: "$rootProject.projectDir/gradle/distributableGhidraModule.gradle"
+apply from: "$rootProject.projectDir/gradle/processorProject.gradle"
 apply plugin: 'eclipse'
+
 eclipse.project.name = 'Processors 6502'
 
-/*********************************************************************************
- * Imports
- *********************************************************************************/
-apply from: "$rootProject.projectDir/gradleScripts/processorUtils.gradle"
 

Ghidra/Processors/6502/certification.manifest

@@ -1,9 +1,6 @@
 ##VERSION: 2.0
-.classpath||GHIDRA||||END|
-.project||GHIDRA||||END|
 Module.manifest||GHIDRA||||END|
 build.gradle||GHIDRA||||END|
-data/build.xml||GHIDRA||||END|
 data/languages/6502.cspec||GHIDRA||||END|
 data/languages/6502.ldefs||GHIDRA||||END|
 data/languages/6502.pspec||GHIDRA||||END|

Ghidra/Processors/68000/build.gradle

@@ -1,10 +1,13 @@
+apply from: "$rootProject.projectDir/gradle/distributableGhidraModule.gradle"
+apply from: "$rootProject.projectDir/gradle/javaProject.gradle"
+apply from: "$rootProject.projectDir/gradle/processorProject.gradle"
+apply from: "$rootProject.projectDir/gradle/jacocoProject.gradle"
+apply from: "$rootProject.projectDir/gradle/javaTestProject.gradle"
 apply plugin: 'eclipse'
+
+
 eclipse.project.name = 'Processors 68000'
 
-/*********************************************************************************
- * Imports
- *********************************************************************************/
-apply from: "$rootProject.projectDir/gradleScripts/processorUtils.gradle"
 
 dependencies {
 	compile project(':Base')

Ghidra/Processors/68000/certification.manifest

@@ -1,9 +1,6 @@
 ##VERSION: 2.0
-.classpath||GHIDRA||||END|
-.project||GHIDRA||||END|
 Module.manifest||GHIDRA||||END|
 build.gradle||GHIDRA||||END|
-data/build.xml||GHIDRA||||END|
 data/languages/68000.cspec||GHIDRA||||END|
 data/languages/68000.ldefs||GHIDRA||||END|
 data/languages/68000.opinion||GHIDRA||||END|

Ghidra/Processors/6805/build.gradle

@@ -1,8 +1,6 @@
+apply from: "$rootProject.projectDir/gradle/distributableGhidraModule.gradle"
+apply from: "$rootProject.projectDir/gradle/processorProject.gradle"
 apply plugin: 'eclipse'
+
 eclipse.project.name = 'Processors 6805'
 
-/*********************************************************************************
- * Imports
- *********************************************************************************/
-apply from: "$rootProject.projectDir/gradleScripts/processorUtils.gradle"
-

Ghidra/Processors/6805/certification.manifest

@@ -1,9 +1,6 @@
 ##VERSION: 2.0
-.classpath||GHIDRA||||END|
-.project||GHIDRA||||END|
 Module.manifest||GHIDRA||||END|
 build.gradle||GHIDRA||||END|
-data/build.xml||GHIDRA||||END|
 data/languages/6805.cspec||GHIDRA||||END|
 data/languages/6805.ldefs||GHIDRA||||END|
 data/languages/6805.pspec||GHIDRA||reviewed||END|

Ghidra/Processors/8051/build.gradle

@@ -1,11 +1,10 @@
+apply from: "$rootProject.projectDir/gradle/distributableGhidraModule.gradle"
+apply from: "$rootProject.projectDir/gradle/processorProject.gradle"
 apply plugin: 'eclipse'
+apply plugin: 'java'
+
 eclipse.project.name = 'Processors 8051'
 
-/*********************************************************************************
- * Imports
- *********************************************************************************/
-apply from: "$rootProject.projectDir/gradleScripts/processorUtils.gradle"
-apply from: "$rootProject.projectDir/gradleScripts/ghidraScripts.gradle"
 
 dependencies {
 	compile project(':Base')

Ghidra/Processors/8051/certification.manifest

@@ -1,9 +1,6 @@
 ##VERSION: 2.0
-.classpath||GHIDRA||||END|
-.project||GHIDRA||||END|
 Module.manifest||GHIDRA||||END|
 build.gradle||GHIDRA||||END|
-data/build.xml||GHIDRA||||END|
 data/languages/80251.cspec||GHIDRA||||END|
 data/languages/80251.pspec||GHIDRA||reviewed||END|
 data/languages/80251.sinc||GHIDRA||||END|

Ghidra/Processors/8085/build.gradle

@@ -1,7 +1,5 @@
+apply from: "$rootProject.projectDir/gradle/distributableGhidraModule.gradle"
+apply from: "$rootProject.projectDir/gradle/processorProject.gradle"
 apply plugin: 'eclipse'
 eclipse.project.name = 'Processors 8085'
 
-/*********************************************************************************
- * Imports
- *********************************************************************************/
-apply from: "$rootProject.projectDir/gradleScripts/processorUtils.gradle"

Ghidra/Processors/8085/certification.manifest

@@ -1,9 +1,6 @@
 ##VERSION: 2.0
-.classpath||GHIDRA||||END|
-.project||GHIDRA||||END|
 Module.manifest||GHIDRA||||END|
 build.gradle||GHIDRA||||END|
-data/build.xml||GHIDRA||||END|
 data/languages/8085.cspec||GHIDRA||||END|
 data/languages/8085.ldefs||GHIDRA||reviewed||END|
 data/languages/8085.pspec||GHIDRA||reviewed||END|

Ghidra/Processors/AARCH64/build.gradle

@@ -1,10 +1,11 @@
+apply from: "$rootProject.projectDir/gradle/distributableGhidraModule.gradle"
+apply from: "$rootProject.projectDir/gradle/javaProject.gradle"
+apply from: "$rootProject.projectDir/gradle/jacocoProject.gradle"
+apply from: "$rootProject.projectDir/gradle/javaTestProject.gradle"
+apply from: "$rootProject.projectDir/gradle/processorProject.gradle"
 apply plugin: 'eclipse'
-eclipse.project.name = 'Processors AARCH64'
 
-/*********************************************************************************
- * Imports
- *********************************************************************************/
-apply from: "$rootProject.projectDir/gradleScripts/processorUtils.gradle"
+eclipse.project.name = 'Processors AARCH64'
 
 sleighCompile {
 	args '-l'

Ghidra/Processors/AARCH64/certification.manifest

@@ -1,10 +1,7 @@
 ##VERSION: 2.0
-.classpath||GHIDRA||||END|
-.project||GHIDRA||||END|
 Module.manifest||GHIDRA||||END|
 build.gradle||GHIDRA||||END|
 data/aarch64-pltThunks.xml||GHIDRA||||END|
-data/build.xml||GHIDRA||||END|
 data/languages/AARCH64.cspec||GHIDRA||||END|
 data/languages/AARCH64.dwarf||GHIDRA||||END|
 data/languages/AARCH64.ldefs||GHIDRA||||END|

Ghidra/Processors/ARM/build.gradle

@@ -1,11 +1,11 @@
+apply from: "$rootProject.projectDir/gradle/distributableGhidraModule.gradle"
+apply from: "$rootProject.projectDir/gradle/javaProject.gradle"
+apply from: "$rootProject.projectDir/gradle/processorProject.gradle"
+apply from: "$rootProject.projectDir/gradle/jacocoProject.gradle"
+apply from: "$rootProject.projectDir/gradle/javaTestProject.gradle"
 apply plugin: 'eclipse'
 eclipse.project.name = 'Processors ARM'
 
-/*********************************************************************************
- * Imports
- *********************************************************************************/
-apply from: "$rootProject.projectDir/gradleScripts/processorUtils.gradle"
-
 dependencies {
 	compile project(':Base')
 }

Ghidra/Processors/ARM/certification.manifest

@@ -1,9 +1,6 @@
 ##VERSION: 2.0
-.classpath||GHIDRA||||END|
-.project||GHIDRA||||END|
 Module.manifest||GHIDRA||||END|
 build.gradle||GHIDRA||||END|
-data/build.xml||GHIDRA||||END|
 data/languages/ARM.cspec||GHIDRA||||END|
 data/languages/ARM.dwarf||GHIDRA||||END|
 data/languages/ARM.ldefs||GHIDRA||||END|

Ghidra/Processors/Atmel/build.gradle

@@ -1,11 +1,11 @@
+apply from: "$rootProject.projectDir/gradle/distributableGhidraModule.gradle"
+apply from: "$rootProject.projectDir/gradle/javaProject.gradle"
+apply from: "$rootProject.projectDir/gradle/jacocoProject.gradle"
+apply from: "$rootProject.projectDir/gradle/javaTestProject.gradle"
+apply from: "$rootProject.projectDir/gradle/processorProject.gradle"
 apply plugin: 'eclipse'
 eclipse.project.name = 'Processors Atmel'
 
-/*********************************************************************************
- * Imports
- *********************************************************************************/
-apply from: "$rootProject.projectDir/gradleScripts/processorUtils.gradle"
-
 dependencies {
 	compile project(':Base')
 }

Ghidra/Processors/Atmel/certification.manifest

@@ -1,9 +1,6 @@
 ##VERSION: 2.0
-.classpath||GHIDRA||||END|
-.project||GHIDRA||||END|
 Module.manifest||GHIDRA||||END|
 build.gradle||GHIDRA||||END|
-data/build.xml||GHIDRA||||END|
 data/languages/atmega256.pspec||GHIDRA||||END|
 data/languages/avr32.opinion||GHIDRA||||END|
 data/languages/avr32a.cspec||GHIDRA||||END|

Ghidra/Processors/CR16/build.gradle

@@ -1,12 +1,8 @@
+apply from: "$rootProject.projectDir/gradle/distributableGhidraModule.gradle"
+apply from: "$rootProject.projectDir/gradle/processorProject.gradle"
 apply plugin: 'eclipse'
 eclipse.project.name = 'Processors CR16'
-apply from: "$rootProject.projectDir/gradleScripts/ghidraScripts.gradle"
-/*********************************************************************************
- * Imports
- *********************************************************************************/
-apply from: "$rootProject.projectDir/gradleScripts/processorUtils.gradle"
 
-dependencies {
-	compile project(':Base')
-}
+
+
 

Ghidra/Processors/CR16/certification.manifest

@@ -1,6 +1,4 @@
 ##VERSION: 2.0
-.classpath||GHIDRA||||END|
-.project||GHIDRA||||END|
 Module.manifest||GHIDRA||||END|
 build.gradle||GHIDRA||||END|
 data/build.xml||GHIDRA||||END|

Ghidra/Processors/DATA/build.gradle

@@ -1,12 +1,11 @@
+apply from: "$rootProject.projectDir/gradle/distributableGhidraModule.gradle"
+apply from: "$rootProject.projectDir/gradle/javaProject.gradle"
+apply from: "$rootProject.projectDir/gradle/jacocoProject.gradle"
+apply from: "$rootProject.projectDir/gradle/javaTestProject.gradle"
+apply from: "$rootProject.projectDir/gradle/processorProject.gradle"
 apply plugin: 'eclipse'
 eclipse.project.name = 'Processors DATA'
 
-/*********************************************************************************
- * Imports
- *********************************************************************************/
-apply from: "$rootProject.projectDir/gradleScripts/processorUtils.gradle"
-apply from: "$rootProject.projectDir/gradleScripts/ghidraScripts.gradle"
-
 dependencies {
 	compile project(':Base')
 	compile project(':SoftwareModeling')

Ghidra/Processors/DATA/certification.manifest

@@ -1,9 +1,6 @@
 ##VERSION: 2.0
-.classpath||GHIDRA||||END|
-.project||GHIDRA||||END|
 Module.manifest||GHIDRA||||END|
 build.gradle||GHIDRA||||END|
-data/build.xml||GHIDRA||||END|
 data/languages/data-be-64.slaspec||GHIDRA||||END|
 data/languages/data-le-64.slaspec||GHIDRA||||END|
 data/languages/data-ptr16.cspec||GHIDRA||||END|

Ghidra/Processors/Dalvik/build.gradle

@@ -1,10 +1,11 @@
+apply from: "$rootProject.projectDir/gradle/distributableGhidraModule.gradle"
+apply from: "$rootProject.projectDir/gradle/javaProject.gradle"
+apply from: "$rootProject.projectDir/gradle/jacocoProject.gradle"
+apply from: "$rootProject.projectDir/gradle/javaTestProject.gradle"
+apply from: "$rootProject.projectDir/gradle/processorProject.gradle"
 apply plugin: 'eclipse'
 eclipse.project.name = 'Processors Dalvik'
 
-/*********************************************************************************
- * Imports
- *********************************************************************************/
-apply from: "$rootProject.projectDir/gradleScripts/processorUtils.gradle"
 
 sleighCompile {
 	args '-l'

Ghidra/Processors/JVM/build.gradle

@@ -1,10 +1,14 @@
+apply from: "$rootProject.projectDir/gradle/distributableGhidraModule.gradle"
+apply from: "$rootProject.projectDir/gradle/javaProject.gradle"
+apply from: "$rootProject.projectDir/gradle/jacocoProject.gradle"
+apply from: "$rootProject.projectDir/gradle/javaTestProject.gradle"
 apply plugin: 'eclipse'
 eclipse.project.name = 'Processors JVM'
 
 /*********************************************************************************
  * Imports
  *********************************************************************************/
-apply from: "$rootProject.projectDir/gradleScripts/processorUtils.gradle"
+apply from: "$rootProject.projectDir/gradle/processorProject.gradle"
 
 dependencies {
 	compile project(':Base')

Ghidra/Processors/JVM/certification.manifest

@@ -1,6 +1,4 @@
 ##VERSION: 2.0
-.classpath||GHIDRA||||END|
-.project||GHIDRA||||END|
 Module.manifest||GHIDRA||||END|
 build.gradle||GHIDRA||||END|
 data/ExtensionPoint.manifest||GHIDRA||||END|