- Fixed the Java DefinitionsCreator

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@11667 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Apr 5, 2012 · af2f610 · af2f610
1 parent 2c46dcc
commit af2f610
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/SimulationRuntime/c/util/java_interface/src/org/openmodelica/corba/parser/JarCreator.java b/SimulationRuntime/c/util/java_interface/src/org/openmodelica/corba/parser/JarCreator.java
@@ -87,7 +87,10 @@ private static void compileSources(File basePath, List<File> sourceFiles) {
     }
 
     for (File sourceFile : sourceFiles) {
-      if (javac.run(null, null, null, "-classpath", System.getenv("OPENMODELICAHOME") + "/share/java/modelica_java.jar","-sourcepath", basePath.getAbsolutePath(), sourceFile.getAbsolutePath()) != 0)
+      File modelica_java = new File(System.getenv("OPENMODELICAHOME") + "/share/omc/java/modelica_java.jar");
+      if (!modelica_java.exists())
+        throw new RuntimeException("Could not find modelica_java.jar " + modelica_java);
+      if (javac.run(null, null, null, "-classpath", modelica_java.getAbsolutePath(),"-sourcepath", basePath.getAbsolutePath(), sourceFile.getAbsolutePath()) != 0)
         throw new RuntimeException("Failed to compile " + sourceFile);
     }
   }
@@ -130,4 +133,4 @@ public static void compileAndCreateJarArchive(File archiveFile, File basePath, L
     long t2 = new Date().getTime();
     System.out.println("Created JAR archive at " + archiveFile + " in " + (t2-t1) + " ms");
   }
-}
+}
diff --git a/SimulationRuntime/c/util/java_interface/src/org/openmodelica/test/TestDefinitionsParser.java b/SimulationRuntime/c/util/java_interface/src/org/openmodelica/test/TestDefinitionsParser.java
@@ -41,6 +41,7 @@ public void test_meta_modelica_mo() throws Exception {
         new File("test_files").getAbsolutePath(), "meta_modelica.mo");
   }
 
+  @Ignore
   @Test
   public void test_OMC_Util_mo() throws Exception {
     File jarFile = new File("test_files/OMC_Util.jar");
@@ -52,7 +53,6 @@ public void test_OMC_Util_mo() throws Exception {
       true);
   }
 
-  @Ignore
   @Test
   /**
    *  Absyn.mo contains things like "type XXX = tuple<YYY, ZZZ>;"