small changes...

diff --git a/Robust/src/IR/TypeUtil.java b/Robust/src/IR/TypeUtil.java
index 05f93f5029bbafff321389e0b121364dfcbd131f..4fa3412c63b2dd5d67f029387cb05315a7277f17 100644 (file)
--- a/Robust/src/IR/TypeUtil.java
+++ b/Robust/src/IR/TypeUtil.java
@@ -7,12 +7,12 @@ import java.io.File;
 import Main.Main;
 
 public class TypeUtil {
-  public static final String StringClass="String";
-  public static final String ObjectClass="Object";
-  public static final String StartupClass="StartupObject";
-  public static final String TagClass="TagDescriptor";
-  public static final String ThreadClass="Thread";
-  public static final String TaskClass="Task";
+  public static String StringClass;
+  public static String ObjectClass;
+  public static String StartupClass;
+  public static String TagClass;
+  public static String ThreadClass;
+  public static String TaskClass;
   State state;
   Hashtable supertable;
   Hashtable subclasstable;
@@ -24,6 +24,21 @@ public class TypeUtil {
   public TypeUtil(State state, BuildIR bir) {
     this.state=state;
     this.bir=bir;
+    if (state.JNI) {
+      StringClass="java.lang.String";
+      ObjectClass="java.lang.Object";
+      StartupClass="StartupObject";
+      TagClass="TagDescriptor";
+      ThreadClass="java.lang.Thread";
+      TaskClass="Task";
+    } else {
+      StringClass="String";
+      ObjectClass="Object";
+      StartupClass="StartupObject";
+      TagClass="TagDescriptor";
+      ThreadClass="Thread";
+      TaskClass="Task";
+    }
     createTables();
   }
 

diff --git a/Robust/src/Main/Main.java b/Robust/src/Main/Main.java
index 37a243c930683eb119761f9a00441ee9f0b70de6..33747ca3c88da20f2eac74850e72cea12b7c630c 100644 (file)
--- a/Robust/src/Main/Main.java
+++ b/Robust/src/Main/Main.java
@@ -418,7 +418,7 @@ public class Main {
     BuildFlat bf;
     JavaBuilder jb=null;
 
-    if (true) {
+    if (state.JNI) {
       BuildIR bir=new BuildIR(state);
       tu=new TypeUtil(state, bir);
       SemanticCheck sc=new SemanticCheck(state,tu);

diff --git a/Robust/src/buildscript b/Robust/src/buildscript
index 7a8fff12e87a8955afc1aa22768844775cead62e..25d2a99e962b126c1b9d7e644864d89b3ff7a159 100755 (executable)
--- a/Robust/src/buildscript
+++ b/Robust/src/buildscript
@@ -767,7 +767,7 @@ fi
 # Setup class path
 if $JNI
 then
-JAVAOPTS="$JAVAOPTS -classlibrary $ROBUSTROOT/classpath/java/lang/ -classlibrary $ROBUSTROOT/classpath/java/io/ -classlibrary $ROBUSTROOT/classpath/java/lang/reflect/ -classlibrary $ROBUSTROOT/classpath/java/text/ -classlibrary $ROBUSTROOT/classpath/java/security/ -classlibrary $ROBUSTROOT/classpath/java/net/"
+JAVAOPTS="$JAVAOPTS -classlibrary $ROBUSTROOT/classpath/"
 elif $MGCINTELFLAG
 then
 JAVAOPTS="$JAVAOPTS -classlibrary $ROBUSTROOT/ClassLibrary/MGC/ -classlibrary $ROBUSTROOT/ClassLibrary/MGC/gnu/"