diff -r be27ed110b50 -r d8ac696cc51f buildframework/helium/tools/compile/compile.antlib.xml
--- a/buildframework/helium/tools/compile/compile.antlib.xml Wed Oct 28 14:39:48 2009 +0000
+++ b/buildframework/helium/tools/compile/compile.antlib.xml Wed Dec 23 19:29:07 2009 +0200
@@ -26,7 +26,7 @@
-
+
@@ -48,7 +48,7 @@
+ outputfile="${diamonds.build.output.dir}/compile-main.xml">
dbPath: ${metadata.dbfile}
logpath: @{logfile}
@@ -63,6 +63,7 @@
+
errorsTotal = project.getProperty("build.errors.total")
-errorsLimit = project.getProperty("build.errors.limit")
-if int(errorsLimit) > -1:
- if int(errorsTotal) > int(errorsLimit):
+if int(r'@{error.limit}') > -1:
+ if int(errorsTotal) > int(r'@{error.limit}'):
self.setValue(1)
@@ -88,7 +88,8 @@
@@ -148,11 +149,16 @@
+
+
+
+
+
-
+
@@ -165,22 +171,24 @@
+
-
-
-
-
-
+
-
-
+
+
+
+
+
+
+
@@ -233,7 +241,8 @@
-
+
+
self.setTaskName("emake");
// check attributes
if (attributes.get("name") == null)
@@ -244,6 +253,7 @@
self.log("Makefile: " + attributes.get("makefile"));
String target = "all";
String custom = "";
+ String annofileDir = "";
if (attributes.get("target") != null)
target = attributes.get("target");
self.log("Target: " + target);
@@ -253,10 +263,12 @@
root = attributes.get("root");
else
root = "";
+
self.log("Custom: " + custom);
// Create and configure exec target
org.apache.tools.ant.taskdefs.ExecTask task = new org.apache.tools.ant.taskdefs.ExecTask();
+ task.setProject(self.getProject());
task.setTaskName(self.getTaskName());
String emake = com.nokia.ant.util.Helper.getProperty(project, "ec.emake");
task.setExecutable(emake);
@@ -285,9 +297,15 @@
self.log("--emake-root=" + eroot + ";" + heliumDir + ";" + root);
}
task.createArg().setValue("--emake-root=" + eroot + ";" + heliumDir + ";" + root);
+ if (attributes.get("phase") != null) {
+ annofileDir = com.nokia.ant.util.Helper.getProperty(project, "build.log.dir") + "/" + attributes.get("phase");
+ }
+ else {
+ annofileDir = com.nokia.ant.util.Helper.getProperty(project, "build.log.dir");
+ }
if (attributes.get("annodetail") != null) {
task.createArg().setValue("--emake-annodetail=" + attributes.get("annodetail"));
- task.createArg().setValue("--emake-annofile=" + com.nokia.ant.util.Helper.getProperty(project, "build.log.dir") + "/" + buildId + "-" + attributes.get("name") + ".anno.xml");
+ task.createArg().setValue("--emake-annofile=" + annofileDir + "/" + buildId + "-" + attributes.get("name") + ".emake.anno.xml");
}
task.createArg().setLine(custom);
task.createArg().setLine("-f " + attributes.get("makefile"));