buildframework/helium/sf/java/quality/src/com/nokia/helium/quality/ant/taskdefs/CMTToolTask.java
changeset 628 7c4a911dc066
parent 588 c7c26511138f
child 645 b8d81fa19e7d
--- a/buildframework/helium/sf/java/quality/src/com/nokia/helium/quality/ant/taskdefs/CMTToolTask.java	Wed Jun 16 16:51:40 2010 +0300
+++ b/buildframework/helium/sf/java/quality/src/com/nokia/helium/quality/ant/taskdefs/CMTToolTask.java	Fri Aug 13 14:59:05 2010 +0300
@@ -183,8 +183,8 @@
      */
     private ExecTask getExecTask(String taskName, String cmd, File outDir) {
         ExecTask task = new ExecTask();
+        task.bindToOwner(this);
         task.setDir(outDir);
-        task.setTaskName(this.getTaskName());
         task.setExecutable(cmd);
         return task;
     }
@@ -211,19 +211,22 @@
             dirScanner.scan();
             String[] filelist = dirScanner.getIncludedFiles();
             String lineSeparator = System.getProperty("line.separator");
+            String fileSeparator = System.getProperty("file.separator");
+            
             BufferedWriter outputFile = null;
             try {
                 outputFile = new BufferedWriter(new FileWriter(input));
                 for (String file : filelist) {
-                    outputFile.write(dirScanner.getBasedir().toString() + file
+                    outputFile.write(dirScanner.getBasedir().toString() + fileSeparator + file
                             + lineSeparator);
                 }
             } catch (IOException e) {
                 throw new BuildException("Not able to generate file list for 'cmt'. ", e);
             } finally {
                 try {
-                    if (outputFile != null)
+                    if (outputFile != null) {
                         outputFile.close();
+                    }
                 } catch (IOException ex) {
                     // ignore exception
                     ex = null;