GT-3328 minor revisions to sleigh options processing per review

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

View File

@ -1,14 +1,17 @@
<?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
+ 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">

View File

@ -1,13 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
+ Compile sleigh languages within this distribution language module.
+ Sleigh compiler options are read from the sleighArgs.txt file.
+ Compile sleigh languages within this distribution language module via Eclipse or
+ 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
+ - run ant
+ * From command line (requires ant install)
+ - cd to data directory containing this file
+ - run ant
+
+ Sleigh compiler options are read from sleighArgs.txt.
-->
<project name="privateBuildDistribution" default="sleigh-compile">

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