get rid of feeder -- at the cost of batch-only commit-at-exit;
authorwenzelm
Sat, 08 Oct 2005 23:43:14 +0200
changeset 17807 cc5dbc24e561
parent 17806 b6a547bfb419
child 17808 81c113e4d6fc
get rid of feeder -- at the cost of batch-only commit-at-exit; redirect stderr to stdout;
lib/scripts/run-poplogml
--- a/lib/scripts/run-poplogml	Sat Oct 08 23:36:01 2005 +0200
+++ b/lib/scripts/run-poplogml	Sat Oct 08 23:43:14 2005 +0200
@@ -103,21 +103,24 @@
 POPLOG="$ML_HOME/poplog"
 check_mlhome_file "$POPLOG"
 
-MLTEXT="$EXIT $USE $COMMIT $MLTEXT"
-MLEXIT="commit();"
+INIT="$ISABELLE_TMP/init.ml"
+echo 'pop11
+section $-ml;
+false -> ml_quiet;
+endsection;
+ml' > "$INIT"
 
-if [ -z "$TERMINATE" ]; then
-  FEEDER_OPTS=""
-else
-  FEEDER_OPTS="-q"
+echo "$EXIT $USE $COMMIT $MLTEXT" >> "$INIT"
+
+if [ -n "$TERMINATE" ]; then
+  ML_OPTIONS="$ML_OPTIONS -nostdin"
+  echo "commit();" >> "$INIT"
 fi
 
-"$ISABELLE_HOME/lib/scripts/feeder" -p -h "$MLTEXT" -t "$MLEXIT" $FEEDER_OPTS | \
-  { read FPID; "$POPLOG" pml "$DB" $ML_OPTIONS; RC="$?"; kill -HUP "$FPID"; exit "$RC"; }
+"$POPLOG" pml "$DB" $ML_OPTIONS -load "$INIT" 2>&1
 RC="$?"
 
-
-## check heap
+rm -f "$INIT"
 
 [ -n "$OUTFILE" ] && check_heap_file "$OUTFILE" && \
   [ -n "$NOWRITE" ] && chmod -w "$OUTFILE"