mirror of
https://github.com/NationalSecurityAgency/ghidra.git
synced 2026-06-02 00:16:36 +08:00
GT-3328 minor revisions to sleigh options processing per review
This commit is contained in:
@@ -1,14 +1,17 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
|
||||||
<!--
|
<!--
|
||||||
+ Compile sleigh languages within this source language module.
|
+ Compile sleigh languages within this source language module via Eclipse or
|
||||||
|
+ a command shell.
|
||||||
|
+
|
||||||
|
+ * Eclipse: right-click on this file and choose menu item "Run As->Ant Build"
|
||||||
|
+
|
||||||
|
+ * From command line (requires ant install)
|
||||||
|
+ - cd to data directory containing this file
|
||||||
|
+ - run ant
|
||||||
|
+
|
||||||
+ Sleigh compiler options are read from build/data/sleighArgs.txt which is
|
+ Sleigh compiler options are read from build/data/sleighArgs.txt which is
|
||||||
+ updated by "gradle prepdev" based upon specification within module's build.gradle.
|
+ updated by "gradle prepdev" based upon specification within module's build.gradle.
|
||||||
+
|
|
||||||
+ Eclipse: right-click on this file and choose menu item "Run As->Ant Build"
|
|
||||||
+ From command line (requires ant install)
|
|
||||||
+ - cd to data directory containing this file
|
|
||||||
+ - run ant
|
|
||||||
-->
|
-->
|
||||||
|
|
||||||
<project name="privateBuildDeveloper" default="sleigh-compile">
|
<project name="privateBuildDeveloper" default="sleigh-compile">
|
||||||
|
|||||||
@@ -1,13 +1,16 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
|
||||||
<!--
|
<!--
|
||||||
+ Compile sleigh languages within this distribution language module.
|
+ Compile sleigh languages within this distribution language module via Eclipse or
|
||||||
+ Sleigh compiler options are read from the sleighArgs.txt file.
|
+ a command shell.
|
||||||
+
|
+
|
||||||
+ Eclipse: right-click on this file and choose menu item "Run As->Ant Build"
|
+ * Eclipse: right-click on this file and choose menu item "Run As->Ant Build"
|
||||||
+ From command line (requires ant install)
|
+
|
||||||
+ - cd to data directory containing this file
|
+ * From command line (requires ant install)
|
||||||
+ - run ant
|
+ - cd to data directory containing this file
|
||||||
|
+ - run ant
|
||||||
|
+
|
||||||
|
+ Sleigh compiler options are read from sleighArgs.txt.
|
||||||
-->
|
-->
|
||||||
|
|
||||||
<project name="privateBuildDistribution" default="sleigh-compile">
|
<project name="privateBuildDistribution" default="sleigh-compile">
|
||||||
|
|||||||
@@ -57,7 +57,8 @@ dependencies {
|
|||||||
*****************************************************************************************/
|
*****************************************************************************************/
|
||||||
def checkSleighCompileOptions() {
|
def checkSleighCompileOptions() {
|
||||||
sleighCompileOptions.each { a ->
|
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 getProjectReposRootPath() {
|
||||||
def rootPath = rootProject.projectDir.absolutePath
|
return rootProject.projectDir.getParent() + File.separator
|
||||||
int index = rootPath.lastIndexOf(File.separator)
|
|
||||||
rootPath = rootPath.substring(0, index+1)
|
|
||||||
return rootPath
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*****************************************************************************************
|
/*****************************************************************************************
|
||||||
@@ -235,6 +233,7 @@ def getProjectReposRootPath() {
|
|||||||
*
|
*
|
||||||
*****************************************************************************************/
|
*****************************************************************************************/
|
||||||
def resolveSleighArg(String arg, boolean useDevPath) {
|
def resolveSleighArg(String arg, boolean useDevPath) {
|
||||||
|
arg = arg.trim()
|
||||||
int index = arg.indexOf("%%")
|
int index = arg.indexOf("%%")
|
||||||
if (index < 0) {
|
if (index < 0) {
|
||||||
return arg
|
return arg
|
||||||
|
|||||||
Reference in New Issue
Block a user