Changeset 836

Timestamp:

06/23/11 16:49:16 (13 years ago)

Author:

vasaie_p

Message:

fix: starting model.exe without the *.dll in executable folder

Location:

trunk/modelicaml/org.openmodelica.simulation.environment/src/org/openmodelica/simulation/environment/filehandling

Files:

• RunInteractiveSimulationRuntimeEnvironment.java (modified) (3 diffs)
• RunNonInteractiveSimulationRuntimeEnvironment.java (modified) (4 diffs)

trunk/modelicaml/org.openmodelica.simulation.environment/src/org/openmodelica/simulation/environment/filehandling/RunInteractiveSimulationRuntimeEnvironment.java

@@ -5 +5 @@
 
 import java.io.File;
-import java.io.IOException;
+import java.util.Map;
 import java.util.Scanner;
 
@@ -53 +53 @@
         try {
             ProcessBuilder builder = new ProcessBuilder(command);
+            
+            Map<String, String> env = builder.environment();
+            String pathFromEnv = "";
+            
+            if(env.get("Path") != null){
+                pathFromEnv = "Path";
+            } else if(env.get("PATH") != null){
+                pathFromEnv = "PATH";
+            } else if(env.get("path") != null){
+                pathFromEnv = "path";
+            } else
+                throw new Exception("path variable not available");
+            
+            env.put(pathFromEnv, env.get(pathFromEnv) + ";" + env.get("OPENMODELICAHOME") + "/bin/");
+            
             builder.directory(new File(pathToExecutable + "/"));
             p = builder.start();
@@ -60 +75 @@
             }
 //          p.waitFor();
-        } catch (IOException e) {
-            System.err.println("IOException starting process!");
+        } catch (Exception e) {
+//          System.err.println("IOException starting process!");
+            e.getStackTrace();
         }
     }

trunk/modelicaml/org.openmodelica.simulation.environment/src/org/openmodelica/simulation/environment/filehandling/RunNonInteractiveSimulationRuntimeEnvironment.java

@@ -1 @@
-/*
- * 
- */
 package org.openmodelica.simulation.environment.filehandling;
 
 import java.io.File;
-import java.io.IOException;
+import java.util.Map;
 
-// TODO: Auto-generated Javadoc
 /**
- * The Class RunNonInteractiveSimulationRuntimeEnvironment.
+ * 
+ * @author EADS Innovation Works, Parham Vasaiely, Parham.Vasaiely@gmx.de
  *
- * @author EADS Innovation Works, Parham Vasaiely, Parham.Vasaiely@gmx.de
  */
 public class RunNonInteractiveSimulationRuntimeEnvironment implements Runnable{
 
-    /** The path to executable. */
     String pathToExecutable;
-    
-    /** The runtime name. */
     String runtimeName;
     
-    /**
-     * Instantiates a new run non interactive simulation runtime environment.
-     */
     public RunNonInteractiveSimulationRuntimeEnvironment(){
         super();
@@ -29 +19 @@
     
     /**
-     * A Runnable thread to execute the simulation runtime.
-     *
-     * @param pathToExecutable The folder path to the executable runtime NOTE: complete the
-     * string without a last slash
-     * @param runtimeName name of the runtime
+     * A Runnable thread to execute the simulation runtime
+     * 
+     * @param pathToExecutable
+     *            The folder path to the executable runtime NOTE: complete the
+     *            string without a last slash
+     * @param runtimeName
+     *            name of the runtime
+
      */
     public RunNonInteractiveSimulationRuntimeEnvironment(String pathToExecutable,
@@ -42 +35 @@
     }
     
-    /* (non-Javadoc)
-     * @see java.lang.Runnable#run()
-     */
     public void run() {
 
@@ -50 +40 @@
         try 
         {
-           ProcessBuilder builder = new ProcessBuilder(command); 
+           ProcessBuilder builder = new ProcessBuilder(command);
+           
+          Map<String, String> env = builder.environment();
+            String pathFromEnv = "";
+            
+            if(env.get("Path") != null){
+                pathFromEnv = "Path";
+            } else if(env.get("PATH") != null){
+                pathFromEnv = "PATH";
+            } else if(env.get("path") != null){
+                pathFromEnv = "path";
+            } else
+                throw new Exception("path variable not available");
+            
+           env.put(pathFromEnv, env.get(pathFromEnv) + ";" + env.get("OPENMODELICAHOME") + "/bin/");
+           
            builder.directory(new File(pathToExecutable + "/")); 
            Process p = builder.start();
            p.waitFor();
         }
-        catch(IOException e) 
-        {
-            System.err.println("IOException starting process!");
-        }
-        catch(InterruptedException e) 
-        {
-            System.err.println("Interrupted waiting for process!");
-        }
+        catch (Exception e) {
+//          System.err.println("IOException starting process!");
+            e.getStackTrace();
+        }
     }
     
     /**
-     * The main method.
-     *
-     * @param args the arguments
+     * @param args
      */
     public static void main(String[] args) {