buildframework/helium/sf/java/quality/src/com/nokia/helium/quality/ant/taskdefs/Coverity.java
equal
deleted
inserted
replaced
16 */ |
16 */ |
17 package com.nokia.helium.quality.ant.taskdefs; |
17 package com.nokia.helium.quality.ant.taskdefs; |
18 |
18 |
19 import java.io.File; |
19 import java.io.File; |
20 import java.util.Vector; |
20 import java.util.Vector; |
21 import java.util.Map.Entry; |
|
22 |
|
23 import org.apache.tools.ant.BuildException; |
21 import org.apache.tools.ant.BuildException; |
24 import org.apache.tools.ant.Task; |
22 import org.apache.tools.ant.Task; |
25 import org.apache.tools.ant.taskdefs.ExecTask; |
23 import org.apache.tools.ant.taskdefs.ExecTask; |
26 |
24 |
27 import com.nokia.helium.core.ant.types.Variable; |
25 import com.nokia.helium.core.ant.types.Variable; |
83 task.setFailonerror(failOnError); |
81 task.setFailonerror(failOnError); |
84 task.setExecutable(command); |
82 task.setExecutable(command); |
85 task.setDir(new File(this.dir)); |
83 task.setDir(new File(this.dir)); |
86 |
84 |
87 for (VariableSet coverityArg : coverityOptions) { |
85 for (VariableSet coverityArg : coverityOptions) { |
88 for (Entry<String, Variable> entry : coverityArg.getVariablesMap().entrySet() ) { |
86 for (Variable var : coverityArg.getVariables()) { |
89 task.createArg().setValue(entry.getKey()); |
87 if (var.getValue().startsWith(var.getName())) { |
90 task.createArg().setValue(entry.getValue().getValue()); |
88 task.createArg().setLine(var.getValue()); |
91 commandString = commandString + " " + entry.getKey() + " " + entry.getValue().getValue(); |
89 commandString = commandString + " " + var.getValue() ; |
|
90 } else { |
|
91 task.createArg().setValue(var.getName()); |
|
92 task.createArg().setValue(var.getValue()); |
|
93 commandString = commandString + " " + var.getName() + " " |
|
94 + var.getValue(); |
|
95 } |
92 } |
96 } |
93 } |
97 } |
94 |
98 |
95 for (Variable coverityArg : coverityArgs) { |
99 for (Variable coverityArg : coverityArgs) { |
96 task.createArg().setValue(coverityArg.getName()); |
100 task.createArg().setValue(coverityArg.getName()); |