buildframework/helium/sf/java/sysdef/src/com/nokia/helium/sysdef/ant/taskdefs/MergeTask.java
--- a/buildframework/helium/sf/java/sysdef/src/com/nokia/helium/sysdef/ant/taskdefs/MergeTask.java Wed Jun 16 16:51:40 2010 +0300
+++ b/buildframework/helium/sf/java/sysdef/src/com/nokia/helium/sysdef/ant/taskdefs/MergeTask.java Fri Aug 13 14:59:05 2010 +0300
@@ -50,11 +50,17 @@
* For more information about system definition file v3.0 please check
* <a href="http://developer.symbian.org/wiki/index.php/System_Definition">http://developer.symbian.org/wiki/index.php/System_Definition</a>.
*
+ * <br>
+ * This task relies on externals tools. Their location can be configured the following ways:
+ * <li>by configuring the sysdef.tools.home property, fails if the location is incorrect.
+ * <li>The parent folder of the joinsysdef tool from the PATH, fallback on SDK location.
+ * <li>Default SDK location.
+
* @ant.task name="mergeSysdef" category="Sysdef"
*/
public class MergeTask extends AbstractSydefTask {
- private static final String XSLT = "sf/os/buildtools/bldsystemtools/sysdeftools/mergesysdef.xsl";
+ private static final String XSLT = "mergesysdef.xsl";
private File downstreamFile;
private List<ResourceCollection> resourceCollections = new ArrayList<ResourceCollection>();
@@ -156,6 +162,6 @@
*/
@Override
protected File getXsl() {
- return new File(this.getEpocroot(), XSLT);
+ return new File(SysdefUtils.getSysdefHome(getProject(), this.getEpocroot()), XSLT);
}
}