Fixing build issues.

This commit is contained in:
ghidravore 2019-04-26 18:17:11 -04:00
parent 5fa4e7a225
commit a50c6e0843
6 changed files with 31 additions and 29 deletions

View File

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

View File

@ -1,7 +1,4 @@
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: 'java'
apply plugin: 'eclipse'
eclipse.project.name = 'GPL DMG'

View File

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

View File

@ -82,6 +82,30 @@ rootProject.assembleDistribution {
}
}
// copy os specific files for each platform
rootProject.OS_NAMES.each { platform ->
rootProject.tasks.findAll {it.name == "assembleDistribution_$platform"}.each { t ->
def p = this.project
// the getZipPath calls here are not in closures because we are already in a taskGraph.whenReady closure
t.from (p.projectDir.toString() + "/build/os/$platform") {
exclude '*.lib'
exclude '*.exp'
into getZipPath(p) + "/os/$platform"
}
t.from (p.projectDir.toString() + "/os/$platform") {
into getZipPath(p) + "/os/$platform"
}
}
}
// For Win64 build, we have to also include any Win32 binaries in the final zip.
rootProject.assembleDistribution_win64 {
from (this.project.projectDir.toString() + "/build/os/win32") {
into getZipPath(this.project) + "/os/win32"
}
}
/*********************************************************************************
* Takes the given file and returns a string representing the file path with everything

View File

@ -8,29 +8,7 @@ tasks.withType(Test).all {
it.dependsOn ":allSleighCompile"
}
rootProject.OS_NAMES.each { platform ->
rootProject.tasks.findAll {it.name == "assembleDistribution_$platform"}.each { t ->
def p = this.project
// the getZipPath calls here are not in closures because we are already in a taskGraph.whenReady closure
t.from (p.projectDir.toString() + "/build/os/$platform") {
exclude '*.lib'
exclude '*.exp'
into getZipPath(p) + "/os/$platform"
}
t.from (p.projectDir.toString() + "/os/$platform") {
into getZipPath(p) + "/os/$platform"
}
}
}
// For Win64 build, we have to also include any Win32 binaries in the final zip.
rootProject.assembleDistribution_win64 {
from (this.project.projectDir.toString() + "/build/os/win32") {
into getZipPath(this.project) + "/os/win32"
}
}
plugins.withType(JavaPlugin) {
task zipSourceSubproject (type: Zip) { t ->

View File

@ -50,6 +50,12 @@ task zipExtensions (type: Zip) {
into { getBaseProjectName(p) }
}
from (p.file('build/os')) {
into { getBaseProjectName(p) + "/os" }
exclude "**/*.exp"
exclude "**/*.lib"
}
/////////////////
// EXTERNAL LIBS
/////////////////