mirror of
https://github.com/NationalSecurityAgency/ghidra
synced 2024-08-27 21:10:26 +00:00
Additional GPL build fixes
This commit is contained in:
parent
8dfffdd5db
commit
8843a70947
|
@ -1,4 +1,3 @@
|
|||
|
||||
if (findProject(':Generic') != null) {
|
||||
apply from: "$rootProject.projectDir/gradle/nativeProject.gradle"
|
||||
apply from: "$rootProject.projectDir/gradle/distributableGPLModule.gradle"
|
||||
|
@ -19,31 +18,31 @@ project.ext.cabextract = "cabextract-1.6"
|
|||
* Unpacks the cabextract tar file that's needed for the symbol server. This
|
||||
* is only unpacked for building the tool; once it's built, this unzipped
|
||||
* archive is removed.
|
||||
*
|
||||
* NOTE: Ant is used so that timestamps are properly preserved, failure to
|
||||
* do so can cause the aclocal utility to be required which may be missing!
|
||||
*********************************************************************************/
|
||||
task unpackCabExtract (type: Copy) {
|
||||
|
||||
doFirst {
|
||||
delete file("build/${cabextract}")
|
||||
}
|
||||
|
||||
doLast {
|
||||
// Force all unpacked files to have the same timestamp
|
||||
ant.touch() {
|
||||
fileset(dir: file("build/${cabextract}"))
|
||||
}
|
||||
}
|
||||
|
||||
from tarTree(file("data/${cabextract}.tar.gz"))
|
||||
into 'build'
|
||||
into 'build/unpack'
|
||||
|
||||
// Force the task to be executed every time by setting to false.
|
||||
// This is done since configure changes the contents for a platform
|
||||
// NOTE: this can cause the 'build/unpack' to be deleted prior to an unpack
|
||||
outputs.upToDateWhen { false }
|
||||
}
|
||||
|
||||
/*********************************************************************************
|
||||
* CabExtract configure task
|
||||
*
|
||||
* Performs configure on a newly unpacked cabextract tar file prior to
|
||||
* performing make.
|
||||
*********************************************************************************/
|
||||
task configureCabExtract (type: Exec) {
|
||||
group "private"
|
||||
workingDir "build/unpack/${cabextract}"
|
||||
executable "./configure"
|
||||
dependsOn unpackCabExtract
|
||||
}
|
||||
|
||||
/*********************************************************************************
|
||||
* CabExtract platform specific tasks
|
||||
*
|
||||
|
@ -52,26 +51,19 @@ task unpackCabExtract (type: Copy) {
|
|||
def currentPlatform = getCurrentPlatformName()
|
||||
if (['linux64', 'osx64'].contains(currentPlatform)) {
|
||||
|
||||
def configureName = "${currentPlatform}CabExtractConfigure"
|
||||
def makeName = "${currentPlatform}CabExtractMake" // native Make task found automatically
|
||||
|
||||
task (configureName, type: Exec) {
|
||||
group "private"
|
||||
workingDir "build/${cabextract}"
|
||||
executable "./configure"
|
||||
dependsOn unpackCabExtract
|
||||
}
|
||||
|
||||
task (makeName, type: Exec) {
|
||||
group "private"
|
||||
workingDir "build/${cabextract}"
|
||||
workingDir "build/unpack/${cabextract}"
|
||||
executable "make"
|
||||
dependsOn configureName
|
||||
dependsOn configureCabExtract
|
||||
doLast {
|
||||
copy {
|
||||
from "build/${cabextract}/cabextract"
|
||||
from "build/unpack/${cabextract}/cabextract"
|
||||
into "build/os/${currentPlatform}"
|
||||
}
|
||||
delete file("build/unpack/${cabextract}")
|
||||
}
|
||||
}
|
||||
}
|
|
@ -43,7 +43,6 @@ dependencies {
|
|||
dmgCompile ':hfsx_dmglib@jar'
|
||||
}
|
||||
|
||||
|
||||
/***************************************************************************************
|
||||
*
|
||||
* Task to create the dmg.jar file
|
||||
|
@ -61,12 +60,3 @@ jar {
|
|||
delete "build/libs"
|
||||
}
|
||||
}
|
||||
|
||||
/***************************************************************************************
|
||||
*
|
||||
* plugin the jar task into global task for building and zipping contribs
|
||||
*
|
||||
***************************************************************************************/
|
||||
//assemble.dependsOn dmgJar
|
||||
|
||||
|
||||
|
|
Loading…
Reference in a new issue