Corrected GPL build issues

GPL/CabExtract/build.gradle

@@ -1,3 +1,12 @@
+
+if (findProject(':Generic') != null) {
+	apply from: "$rootProject.projectDir/gradle/nativeProject.gradle"
+	apply from: "$rootProject.projectDir/gradle/distributableGPLModule.gradle"
+}
+else {
+	apply from: "../nativeBuildProperties.gradle"
+}
+
 apply plugin: 'eclipse'
 
 eclipse.project.name = 'GPL CabExtract'

GPL/DMG/build.gradle

@@ -1,4 +1,20 @@
-apply plugin: 'java'
+if (findProject(':Generic') != null) {
+	apply from: "$rootProject.projectDir/gradle/javaProject.gradle"
+	apply from: "$rootProject.projectDir/gradle/distributableGPLModule.gradle"
+	
+	rootProject.assembleDistribution {
+		
+		doLast {
+			// eliminate standard module lib directory
+			def assemblePath = destinationDir.path + "/" + getZipPath(this.project)
+			println "DELETE: ${assemblePath}/lib"
+			delete assemblePath + "/lib"
+		}
+	}
+}
+else {
+	apply plugin: 'java'
+}
 apply plugin: 'eclipse'
 
 eclipse.project.name = 'GPL DMG'
@@ -33,15 +49,15 @@ dependencies {
  * Task to create the dmg.jar file
  *
  ***************************************************************************************/
-task dmgJar(type: Jar) {
-	from sourceSets.dmg.output
-	destinationDir = file("build/data/lib")
-	baseName = 'dmg'
-}
+//task dmgJar(type: Jar) {
+//	from sourceSets.dmg.output
+//	destinationDir = file("build/data/lib")
+//	baseName = 'dmg'
+//}
 
 jar {
+	destinationDir = file("build/data/lib")
 	doLast {
-		File f = file("build/libs/DMG.jar")
 		delete "build/libs"
 	}
 }
@@ -51,6 +67,6 @@ jar {
  * plugin the jar task into global task for building and zipping contribs
  *
  ***************************************************************************************/
-assemble.dependsOn dmgJar
+//assemble.dependsOn dmgJar
 
 

GPL/DemanglerGnu/build.gradle

@@ -1,10 +1,16 @@
+
+if (findProject(':Generic') != null) {
+	apply from: "$rootProject.projectDir/gradle/nativeProject.gradle"
+	apply from: "$rootProject.projectDir/gradle/distributableGPLModule.gradle"
+}
+else {
+	apply from: "../nativeBuildProperties.gradle"
+}
+
 apply plugin: 'eclipse'
 
 eclipse.project.name = 'GPL DemanglerGnu'
 
-apply from: "../nativeBuildProperties.gradle"
-
-
 /****************************************************************************
  * Defines the platforms we have to support in Ghidra.  This model is used 
  * for all native builds and should be extended by each module as-needed.

GPL/build.gradle

@@ -1,4 +1,5 @@
 project.ext.BIN_REPO = file("${projectDir}/../../ghidra.bin").absolutePath
+
 project.ext.set("OS_NAMES", ["osx64", "win32", "win64", "linux64"])
 
 /*********************************************************************************

gradle/certification.manifest

@@ -1,5 +1,6 @@
 ##VERSION: 2.0
 README.txt||GHIDRA||||END|
+distributableGPLModule.gradle||GHIDRA||||END|
 distributableGhidraExtension.gradle||GHIDRA||||END|
 distributableGhidraModule.gradle||GHIDRA||||END|
 externalGhidraExtension.gradle||GHIDRA||||END|

gradle/distributableGPLModule.gradle

@@ -0,0 +1,13 @@
+apply from: "$rootProject.projectDir/gradle/distributableGhidraModule.gradle"
+
+rootProject.assembleDistribution {
+	def p = this.project
+
+	def zipPath = getZipPath(p)
+	
+	from (p.projectDir.toString()) {
+		exclude "bin"
+		exclude "build"
+		into  { zipPath }
+	}
+}

gradle/root/distribution.gradle

@@ -172,14 +172,16 @@ task assembleDistribution (type: Copy) {
 	exclude "**/.settings/**"
 	
 	/////////////////////////////
-	// COPY all GPL code
+	// COPY all GPL support files
+	// (modules with build.gradle handled separately)
 	/////////////////////////////
 	from (ROOT_PROJECT_DIR + "/GPL") {
-		exclude "*/bin"
-		exclude "*/build"
+		include "*.*"
+		include "Icons/**"
+		include "licenses/**"
 		into "GPL"
 	}	
-	
+		
 	//////////////////////////////
 	// LGPL SOURCE INCLUSION
 	//////////////////////////////
@@ -420,9 +422,9 @@ task createInstallationZip(type: Zip) { t ->
 		updateSlaFilesTimestamp(DISTRIBUTION_DIR.getPath(), 2)
 	}
 	
-	doLast {
-		delete file(DISTRIBUTION_DIR.getPath() + "/" + ZIP_DIR_PREFIX)
-	}
+//	doLast {
+//		delete file(DISTRIBUTION_DIR.getPath() + "/" + ZIP_DIR_PREFIX)
+//	}
 }