From bfc74d6f328bf2114c65341f81c48a987cf4cd3a Mon Sep 17 00:00:00 2001
From: bdemsky <bdemsky>
Date: Thu, 21 Apr 2011 22:25:39 +0000
Subject: [PATCH] small changes...

---
 Robust/src/IR/TypeUtil.java | 27 +++++++++++++++++++++------
 Robust/src/Main/Main.java   |  2 +-
 Robust/src/buildscript      |  2 +-
 3 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/Robust/src/IR/TypeUtil.java b/Robust/src/IR/TypeUtil.java
index 05f93f50..4fa3412c 100644
--- 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 37a243c9..33747ca3 100644
--- 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 7a8fff12..25d2a99e 100755
--- 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/"
-- 
2.34.1