mirror of
https://github.com/NationalSecurityAgency/ghidra
synced 2024-08-27 21:10:26 +00:00
Corrected CabExtract build issues
This commit is contained in:
parent
7e80e70465
commit
8dfffdd5db
|
@ -13,7 +13,6 @@ eclipse.project.name = 'GPL CabExtract'
|
|||
|
||||
project.ext.cabextract = "cabextract-1.6"
|
||||
|
||||
|
||||
/*********************************************************************************
|
||||
* CabExtract extraction task
|
||||
*
|
||||
|
@ -24,7 +23,7 @@ project.ext.cabextract = "cabextract-1.6"
|
|||
* 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) {
|
||||
task unpackCabExtract (type: Copy) {
|
||||
|
||||
doFirst {
|
||||
delete file("build/${cabextract}")
|
||||
|
@ -43,18 +42,19 @@ project.ext.cabextract = "cabextract-1.6"
|
|||
// Force the task to be executed every time by setting to false.
|
||||
// This is done since configure changes the contents for a platform
|
||||
outputs.upToDateWhen { false }
|
||||
}
|
||||
}
|
||||
|
||||
/*********************************************************************************
|
||||
* CabExtract platform specific tasks
|
||||
*
|
||||
* The cabextract tool requires that its 'configure' script is called before make.
|
||||
*********************************************************************************/
|
||||
['linux64', 'osx64'].each { platform ->
|
||||
def currentPlatform = getCurrentPlatformName()
|
||||
if (['linux64', 'osx64'].contains(currentPlatform)) {
|
||||
|
||||
def configureName = "${platform}CabExtractConfigure"
|
||||
def makeName = "${platform}CabExtractMake" // native Make task found automatically
|
||||
|
||||
def configureName = "${currentPlatform}CabExtractConfigure"
|
||||
def makeName = "${currentPlatform}CabExtractMake" // native Make task found automatically
|
||||
|
||||
task (configureName, type: Exec) {
|
||||
group "private"
|
||||
workingDir "build/${cabextract}"
|
||||
|
@ -70,10 +70,8 @@ project.ext.cabextract = "cabextract-1.6"
|
|||
doLast {
|
||||
copy {
|
||||
from "build/${cabextract}/cabextract"
|
||||
into "build/os/${platform}"
|
||||
into "build/os/${currentPlatform}"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
|
@ -71,7 +71,3 @@ String getGhidraRelativePath(Project p) {
|
|||
|
||||
return path
|
||||
}
|
||||
|
||||
subprojects {
|
||||
apply plugin: 'java'
|
||||
}
|
||||
|
|
|
@ -60,10 +60,12 @@ task zipExtensions (type: Zip) {
|
|||
// EXTERNAL LIBS
|
||||
/////////////////
|
||||
gradle.taskGraph.whenReady { taskGraph ->
|
||||
List<String> externalPaths = getExternalDependencies(p)
|
||||
externalPaths.each { path ->
|
||||
from (path) {
|
||||
into { getBaseProjectName(p) + "/lib" }
|
||||
if (project.plugins.withType(JavaPlugin)) {
|
||||
List<String> externalPaths = getExternalDependencies(p)
|
||||
externalPaths.each { path ->
|
||||
from (path) {
|
||||
into { getBaseProjectName(p) + "/lib" }
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue