Adding more directory structure to generated files by compiler, also script to copy...

[iot2.git] / iotjava / iotpolicy / IoTCompiler.java

diff --git a/iotjava/iotpolicy/IoTCompiler.java b/iotjava/iotpolicy/IoTCompiler.java
index 79e838cb97b0a59f78e1bf318beac6100355c881..027ea07670c77433c6e030ff6f984f26893de84c 100644 (file)
--- a/iotjava/iotpolicy/IoTCompiler.java
+++ b/iotjava/iotpolicy/IoTCompiler.java
@@ -73,6 +73,8 @@ public class IoTCompiler {
        private final static String OUTPUT_DIRECTORY = "output_files";
        private final static String INTERFACES_DIRECTORY = "interfaces";
        private final static String VIRTUALS_DIRECTORY = "virtuals";
+       private final static String DRIVERS_DIRECTORY = "drivers";
+       private final static String CONTROLLER_DIRECTORY = "controller";
        private final static String CODE_PREFIX = "iotcode";
        private final static String INTERFACE_PACKAGE = "iotcode.interfaces";
 
@@ -1174,10 +1176,10 @@ public class IoTCompiler {
                                        // Check if this interface is a callback class
                                        if(isCallbackClass(intface)) {
                                                packageClass = CODE_PREFIX + "." + driverClass;
-                                               path = createDirectories(dir + "/" + subdir, driverClass);
+                                               path = createDirectories(dir + "/" + subdir + "/" + DRIVERS_DIRECTORY, driverClass);
                                        } else {
                                                packageClass = controllerClass;
-                                               path = createDirectories(dir + "/" + subdir, controllerClass);
+                                               path = createDirectories(dir + "/" + subdir + "/" + CONTROLLER_DIRECTORY, controllerClass);
                                        }
                                        FileWriter fw = new FileWriter(path + "/" + newStubClass + ".java");
                                        pw = new PrintWriter(new BufferedWriter(fw));
@@ -2304,10 +2306,10 @@ public class IoTCompiler {
                                // Check if this interface is a callback class
                                if(isCallbackClass(intface)) {
                                        packageClass = controllerClass;
-                                       path = createDirectories(dir + "/" + subdir, controllerClass);
+                                       path = createDirectories(dir + "/" + subdir + "/" + CONTROLLER_DIRECTORY, controllerClass);
                                } else {
                                        packageClass = CODE_PREFIX + "." + driverClass;
-                                       path = createDirectories(dir + "/" + subdir, driverClass);
+                                       path = createDirectories(dir + "/" + subdir + "/" + DRIVERS_DIRECTORY, driverClass);
                                }
                                FileWriter fw = new FileWriter(path + "/" + newSkelClass + ".java");
                                pw = new PrintWriter(new BufferedWriter(fw));
@@ -3217,9 +3219,9 @@ public class IoTCompiler {
                                        String newStubClass = newIntface + "_Stub";
                                        // Check if this interface is a callback class
                                        if(isCallbackClass(intface))
-                                               path = createDirectories(dir + "/" + subdir, driverClass);
+                                               path = createDirectories(dir + "/" + subdir + "/" + DRIVERS_DIRECTORY, driverClass);
                                        else
-                                               path = createDirectories(dir + "/" + subdir, controllerClass);
+                                               path = createDirectories(dir + "/" + subdir + "/" + CONTROLLER_DIRECTORY, controllerClass);
                                        FileWriter fw = new FileWriter(path + "/" + newStubClass + ".hpp");
                                        pw = new PrintWriter(new BufferedWriter(fw));
                                        // Write file headers
@@ -3300,9 +3302,9 @@ public class IoTCompiler {
                                        String newStubClass = newIntface + "_Stub";
                                        // Check if this interface is a callback class
                                        if(isCallbackClass(intface))
-                                               path = createDirectories(dir + "/" + subdir, driverClass);
+                                               path = createDirectories(dir + "/" + subdir + "/" + DRIVERS_DIRECTORY, driverClass);
                                        else
-                                               path = createDirectories(dir + "/" + subdir, controllerClass);
+                                               path = createDirectories(dir + "/" + subdir + "/" + CONTROLLER_DIRECTORY, controllerClass);
                                        FileWriter fw = new FileWriter(path + "/" + newStubClass + ".cpp");
                                        pw = new PrintWriter(new BufferedWriter(fw));
                                        // Write file headers
@@ -4323,9 +4325,9 @@ public class IoTCompiler {
                                String driverClass = drvList.get(i);
                                // Check if this interface is a callback class
                                if(isCallbackClass(intface))
-                                       path = createDirectories(dir + "/" + subdir, controllerClass);
+                                       path = createDirectories(dir + "/" + subdir + "/" + CONTROLLER_DIRECTORY, controllerClass);
                                else
-                                       path = createDirectories(dir + "/" + subdir, driverClass);
+                                       path = createDirectories(dir + "/" + subdir + "/" + DRIVERS_DIRECTORY, driverClass);
                                FileWriter fw = new FileWriter(path + "/" + newSkelClass + ".hpp");
                                pw = new PrintWriter(new BufferedWriter(fw));
                                // Write file headers
@@ -4419,9 +4421,9 @@ public class IoTCompiler {
                                String driverClass = drvList.get(i);
                                // Check if this interface is a callback class
                                if(isCallbackClass(intface))
-                                       path = createDirectories(dir + "/" + subdir, controllerClass);
+                                       path = createDirectories(dir + "/" + subdir + "/" + CONTROLLER_DIRECTORY, controllerClass);
                                else
-                                       path = createDirectories(dir + "/" + subdir, driverClass);
+                                       path = createDirectories(dir + "/" + subdir + "/" + DRIVERS_DIRECTORY, driverClass);
                                FileWriter fw = new FileWriter(path + "/" + newSkelClass + ".cpp");
                                pw = new PrintWriter(new BufferedWriter(fw));
                                // Write file headers