mirror of
https://github.com/NationalSecurityAgency/ghidra
synced 2024-08-28 05:20:21 +00:00
Merge remote-tracking branch 'origin/GP-1912_ryanmkurtz_yajsw'
(Closes #4092)
This commit is contained in:
commit
89392d4eaf
|
@ -21,7 +21,7 @@ apply plugin: 'eclipse'
|
|||
|
||||
eclipse.project.name = 'Features GhidraServer'
|
||||
|
||||
def yajswRelease = "yajsw-beta-13.01"
|
||||
def yajswRelease = "yajsw-stable-13.04"
|
||||
|
||||
configurations {
|
||||
runGhidraServer
|
||||
|
@ -42,20 +42,15 @@ CopySpec yajswCopySpec = copySpec {
|
|||
// First check if the file is in the dependencies repo. If not, check in the bin repo.
|
||||
def yajswZipTree = depsFile.exists() ? zipTree(depsFile) : zipTree(binRepoFile)
|
||||
|
||||
// In yajsw-beta-13.01.zip there is not a top level directory like there was in previous
|
||||
// versions, so we need the "into". This is a bug which will be fixed in a future version,
|
||||
// of yajsw, so for the next upgrade we'll likely need to get rid of the into and preface each
|
||||
// include with a ${yajswRelease} like we used to do.
|
||||
from(yajswZipTree) {
|
||||
include "lib/core/**"
|
||||
include "lib/extended/**"
|
||||
include "templates/**"
|
||||
include "*.jar"
|
||||
include "doc/**"
|
||||
include "LICENSE.txt"
|
||||
include "yajsw.policy.txt"
|
||||
include "${yajswRelease}/lib/core/**"
|
||||
include "${yajswRelease}/lib/extended/**"
|
||||
include "${yajswRelease}/templates/**"
|
||||
include "${yajswRelease}/*.jar"
|
||||
include "${yajswRelease}/doc/**"
|
||||
include "${yajswRelease}/LICENSE.txt"
|
||||
include "${yajswRelease}/yajsw.policy.txt"
|
||||
}
|
||||
into "${yajswRelease}"
|
||||
}
|
||||
// Unpack YAJSW archive into build/data for development use
|
||||
task yajswDevUnpack(type:Copy) {
|
||||
|
|
|
@ -74,9 +74,9 @@ ext.deps = [
|
|||
destination: FLAT_REPO_DIR
|
||||
],
|
||||
[
|
||||
name: "yajsw-beta-13.01.zip",
|
||||
url: "https://sourceforge.net/projects/yajsw/files/yajsw/yajsw-beta-13.01/yajsw-beta-13.01.zip",
|
||||
sha256: "430fb7901bd0fd52a5b90bd0cbd89e9d334077eb72a9b26896f465de1e593a99",
|
||||
name: "yajsw-stable-13.04.zip",
|
||||
url: "https://sourceforge.net/projects/yajsw/files/yajsw/yajsw-stable-13.04/yajsw-stable-13.04.zip",
|
||||
sha256: "9dd2f713e808be84acccc28ca83129d0ee8d5859d3f33c522baf5185a0fd1253",
|
||||
destination: file("${DEPS_DIR}/GhidraServer")
|
||||
],
|
||||
[
|
||||
|
|
Loading…
Reference in a new issue