Fix non-threaded Java support.

diff --git a/Robust/src/Main/Main.java b/Robust/src/Main/Main.java
index 2b63b41c0b035fc4bbf8632af5845ac34cfce603..bb23c8d9324036f531816cc3cb372db27fa13710 100644 (file)
--- 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 cb7a0f115174d1ba4672ea2757b83e088224659e..01306398acb81a10e09b8ebd26dbd2b9f79cce24 100755 (executable)
--- 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