From: bdemsky <bdemsky>
Date: Thu, 12 Apr 2007 14:58:35 +0000 (+0000)
Subject: Fix non-threaded Java support.
X-Git-Tag: preEdgeChange~630
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=f35db6bc976b523b04c50064429a03e24933abc5;p=IRC.git

Fix non-threaded Java support.
---

diff --git a/Robust/src/Main/Main.java b/Robust/src/Main/Main.java
index 2b63b41c..bb23c8d9 100644
--- a/Robust/src/Main/Main.java
+++ b/Robust/src/Main/Main.java
@@ -70,21 +70,22 @@ public class Main {
       readSourceFile(state, ClassLibraryPrefix+"FileOutputStream.java");
       readSourceFile(state, ClassLibraryPrefix+"File.java");
       readSourceFile(state, ClassLibraryPrefix+"InetAddress.java");
-      if (state.TASK) {
+
+      if (state.THREAD) {
+	  readSourceFile(state, ClassLibraryPrefix+"Thread.java");
+	  readSourceFile(state, ClassLibraryPrefix+"ObjectJava.java");
+      } else
 	  readSourceFile(state, ClassLibraryPrefix+"Object.java");
+
+      if (state.TASK) {
 	  readSourceFile(state, ClassLibraryPrefix+"StartupObject.java");
 	  readSourceFile(state, ClassLibraryPrefix+"Socket.java");
 	  readSourceFile(state, ClassLibraryPrefix+"ServerSocket.java");
       } else {
-	  readSourceFile(state, ClassLibraryPrefix+"ObjectJava.java");
 	  readSourceFile(state, ClassLibraryPrefix+"SocketJava.java");
 	  readSourceFile(state, ClassLibraryPrefix+"ServerSocketJava.java");
       }
 
-      if (state.THREAD) {
-	  readSourceFile(state, ClassLibraryPrefix+"Thread.java");
-      }
-
       BuildIR bir=new BuildIR(state);
       bir.buildtree();
       
diff --git a/Robust/src/buildscript b/Robust/src/buildscript
index cb7a0f11..01306398 100755
--- a/Robust/src/buildscript
+++ b/Robust/src/buildscript
@@ -23,6 +23,7 @@ CURDIR=`pwd`
 CHECKFLAG=false
 RECOVERFLAG=false
 USEDMALLOC=false
+THREADFLAG=false
 SPECDIR=`pwd`
 SRCFILES=''
 EXTRAOPTIONS=''
@@ -85,6 +86,7 @@ elif [[ $1 = '-thread' ]]
 then
 JAVAOPTS="$JAVAOPTS -thread"
 EXTRAOPTIONS="$EXTRAOPTIONS -DTHREADS -lpthread"
+THREADFLAG=true
 elif [[ $1 = '-curdir' ]]
 then
 CURDIR=$2
@@ -167,7 +169,10 @@ if $RECOVERFLAG
 then
 EXTRAOPTIONS="$EXTRAOPTIONS -DTASK"
 FILES="$FILES tmpbuilddirectory/taskdefs.c $ROBUSTROOT/Runtime/checkpoint.c"
-else
+fi
+
+if $THREADFLAG
+then
 FILES="$FILES $ROBUSTROOT/Runtime/thread.c"
 fi