github/ghidra
1
1
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-01-09 22:17:55 -05:00
Code Issues Packages Projects Releases Wiki Activity

GT-3328 minor revisions to sleigh options processing per review

Browse Source
This commit is contained in:
ghidra1
2019-11-25 17:34:41 -05:00
parent 1b1240a41b
commit b05c409a9f
3 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
gradle/processorProject.gradle
View File

@@ -57,7 +57,8 @@ dependencies {
*****************************************************************************************/
def checkSleighCompileOptions() {
sleighCompileOptions.each { a ->
assert !(a.startsWith("-a") || a.startsWith("-i")) : "Invalid sleighCompileOption: ${a}"
def arg = a.trim()
assert !(arg.startsWith("-a") || arg.startsWith("-i")) : "Invalid sleighCompileOption: ${arg}"
}
}
@@ -215,10 +216,7 @@ saveSleighArgs.inputs.files (taskInputs)
*
*****************************************************************************************/
def getProjectReposRootPath() {
def rootPath = rootProject.projectDir.absolutePath
int index = rootPath.lastIndexOf(File.separator)
rootPath = rootPath.substring(0, index+1)
return rootPath
return rootProject.projectDir.getParent() + File.separator
}
/*****************************************************************************************
@@ -235,6 +233,7 @@ def getProjectReposRootPath() {
*
*****************************************************************************************/
def resolveSleighArg(String arg, boolean useDevPath) {
arg = arg.trim()
int index = arg.indexOf("%%")
if (index < 0) {
return arg