Bug fixed in BuildCode.

[IRC.git] / Robust / src / buildscript

diff --git a/Robust/src/buildscript b/Robust/src/buildscript
index 69ba9461057203947ee15cedc16e0f2965f2d4d0..1c73bf726b4b30bd08df3a1123ae3bfd015b1ccc 100755 (executable)
--- a/Robust/src/buildscript
+++ b/Robust/src/buildscript
@@ -1,10 +1,15 @@
 #!/bin/bash
 
 printhelp() {
+echo -dsm distributed shared memory
 echo -check generate check code
+echo -dmalloc link in dmalloc
 echo -recover compile task code
 echo -specdir directory
+echo -taskstate do task state analysis
+echo -optional enable optional
 echo -debug generate debug symbols
+echo -webinterface enable web interface
 echo -runtimedebug printout runtime debug messages
 echo "-thread use support for multiple threads"
 echo "-optimize call gcc with -O9 (optimize)"
@@ -21,11 +26,14 @@ REPAIRROOT=~/research/Repair/RepairCompiler/
 CURDIR=`pwd`
 CHECKFLAG=false
 RECOVERFLAG=false
+USEDMALLOC=false
+THREADFLAG=false
 SPECDIR=`pwd`
 SRCFILES=''
 EXTRAOPTIONS=''
 MAINFILE='a'
 JAVAOPTS=''
+OPTIONALFLAG=false
 
 if [[ -z $1 ]]
 then
@@ -47,10 +55,26 @@ elif [[ $1 = '-mainclass' ]]
 then
 JAVAOPTS="$JAVAOPTS -mainclass $2"
 shift
+elif [[ $1 = '-dsm' ]]
+then
+JAVAOPTS="$JAVAOPTS -dsm"
+elif [[ $1 = '-taskstate' ]]
+then
+JAVAOPTS="$JAVAOPTS -taskstate"
+elif [[ $1 = '-optional' ]]
+then
+JAVAOPTS="$JAVAOPTS -optional"
+OPTIONALFLAG=true
+elif [[ $1 = '-dmalloc' ]]
+then
+USEDMALLOC=true
 elif [[ $1 = '-recover' ]]
 then
 RECOVERFLAG=true
 JAVAOPTS="$JAVAOPTS -task"
+elif [[ $1 = '-webinterface' ]]
+then
+JAVAOPTS="$JAVAOPTS -webinterface"
 elif [[ $1 = '-instructionfailures' ]]
 then
 JAVAOPTS="$JAVAOPTS -instructionfailures"
@@ -79,7 +103,8 @@ EXTRAOPTIONS="$EXTRAOPTIONS -O9"
 elif [[ $1 = '-thread' ]]
 then
 JAVAOPTS="$JAVAOPTS -thread"
-EXTRAOPTIONS="$EXTRAOPTIONS -DTHREADS"
+EXTRAOPTIONS="$EXTRAOPTIONS -DTHREADS -lpthread"
+THREADFLAG=true
 elif [[ $1 = '-curdir' ]]
 then
 CURDIR=$2
@@ -149,20 +174,29 @@ fi # CHECKFLAG
 
 cd $CURDIR 
 
-
 INCLUDES="$INCLUDES -I$ROBUSTROOT/Runtime -I. -IRuntime/include \
 -I$BUILDDIR"
 
-FILES="$ROBUSTROOT/Runtime/runtime.c $ROBUSTROOT/Runtime/file.c \
-$ROBUSTROOT/Runtime/Queue.c $ROBUSTROOT/Runtime/SimpleHash.c \
-$ROBUSTROOT/Runtime/option.c $ROBUSTROOT/Runtime/garbage.c \
-$ROBUSTROOT/Runtime/GenericHashtable.c"
+FILES="$ROBUSTROOT/Runtime/runtime.c $ROBUSTROOT/Runtime/task.c \
+$ROBUSTROOT/Runtime/file.c $ROBUSTROOT/Runtime/Queue.c \
+$ROBUSTROOT/Runtime/SimpleHash.c $ROBUSTROOT/Runtime/option.c \
+$ROBUSTROOT/Runtime/garbage.c $ROBUSTROOT/Runtime/socket.c \
+$ROBUSTROOT/Runtime/GenericHashtable.c $ROBUSTROOT/Runtime/object.c"
 
 if $RECOVERFLAG
 then
 EXTRAOPTIONS="$EXTRAOPTIONS -DTASK"
-FILES="$FILES $ROBUSTROOT/Runtime/socket.c tmpbuilddirectory/taskdefs.c $ROBUSTROOT/Runtime/checkpoint.c"
-else
+FILES="$FILES tmpbuilddirectory/taskdefs.c $ROBUSTROOT/Runtime/checkpoint.c"
+fi
+
+if $OPTIONALFLAG
+then
+EXTRAOPTIONS="$EXTRAOPTIONS -DOPTIONAL"
+FILES="$FILES tmpbuilddirectory/optionalarrays.c"
+fi
+
+if $THREADFLAG
+then
 FILES="$FILES $ROBUSTROOT/Runtime/thread.c"
 fi
 
@@ -172,8 +206,13 @@ EXTRAOPTIONS="$EXTRAOPTIONS -DCONSCHECK $BUILDDIR/specdir/*.o"
 INCLUDES="$INCLUDES -I$BUILDDIR/specdir"
 fi
 
+if $USEDMALLOC
+then
+EXTRAOPTIONS="$EXTRAOPTIONS -ldmalloc -DDMALLOC"
+fi
+
 gcc $INCLUDES $EXTRAOPTIONS -DPRECISE_GC \
 tmpbuilddirectory/methods.c $FILES -o $MAINFILE.bin
-exit
 
+exit