m2compile - now uses Ant OS to detect wheter 'wine' is need or not

diff --git a/com/quemaster/ant/m2/m2compile.java b/com/quemaster/ant/m2/m2compile.java
index 6d43534b6e8c996d4873e1969f6d438195ce2a91..5ba7a9eb0c84544db735fc7db9f48de13d90ff56 100644 (file)
--- a/com/quemaster/ant/m2/m2compile.java
+++ b/com/quemaster/ant/m2/m2compile.java
@@ -2,6 +2,8 @@ package com.quemaster.ant.m2;
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Task;
+import org.apache.tools.ant.taskdefs.condition.Os;
+import java.util.ArrayList;
 
 import java.io.*;
 
@@ -10,7 +12,6 @@ public class m2compile extends Task {
     private File dir=null;
 
     
-    // needs to recognize whether it's linux or not
     
     // needs to check wheter the compilation is needed
     // based on the timestamps of the exe and mod
@@ -18,9 +19,15 @@ public class m2compile extends Task {
     // The method executing the task
     public void execute() throws BuildException {
        int exit = -1;
+       ArrayList<String> list = new ArrayList<String>();
+       if (!Os.isFamily(Os.FAMILY_WINDOWS)) 
+           list.add("wine");
+        list.add("xc");
+        list.add("=make");
+        list.add("=all");
+        list.add(module);
        try{
-               ProcessBuilder pb = new ProcessBuilder(
-                               "wine", "xc", "=make", "=all", module);
+               ProcessBuilder pb = new ProcessBuilder(list);
                pb.directory(dir);
                pb.inheritIO();