misc improvements;
authorwenzelm
Fri, 04 Feb 2000 21:53:36 +0100
changeset 8194 0c5d9d23b715
parent 8193 33e4ec7a2daa
child 8195 af2575a5c5ae
misc improvements;
lib/Tools/mkdir
--- a/lib/Tools/mkdir	Fri Feb 04 21:45:57 2000 +0100
+++ b/lib/Tools/mkdir	Fri Feb 04 21:53:36 2000 +0100
@@ -12,14 +12,15 @@
 function usage()
 {
   echo
-  echo "Usage: $PRG LOGIC NAME"
+  echo "Usage: $PRG [LOGIC] NAME"
   echo
   echo "  Options are:"
   echo "    -b           setup build mode (session outputs heap image)"
   echo "    -d           setup document"
   echo "    -p           include parent logic target"
   echo
-  echo "  Prepare logic session directory, including IsaMakefile, document etc."
+  echo "  Prepare session directory, including IsaMakefile, document etc."
+  echo "  with parent LOGIC (default \$ISABELLE_LOGIC=$ISABELLE_LOGIC)"
   echo
   exit 1
 }
@@ -62,10 +63,16 @@
 
 # args
 
-[ $# -ne 2 ] && usage
 
-LOGIC="$1"; shift
-NAME="$1"; shift
+if [ $# -eq 1 ]; then
+  LOGIC="$ISABELLE_LOGIC"
+  NAME="$1"; shift
+elif [ $# -eq 2 ]; then
+  LOGIC="$1"; shift
+  NAME="$1"; shift
+else
+  usage
+fi
 
 [ -z "$SESSION" ] && SESSION=$(basename $NAME)
 
@@ -79,12 +86,12 @@
   IMAGES="$NAME"
   TEST=""
   TARGET="\$(OUT)/$NAME"
-  USEDIR="usedir -b"
+  USEDIR="\$(USEDIR) -b -P http://isabelle.in.tum.de/library"
 else
   IMAGES=""
   TEST="$NAME"
   TARGET="\$(LOG)/$NAME.gz"
-  USEDIR="usedir"
+  USEDIR="\$(USEDIR)"
 fi
 
 if [ -f IsaMakefile ]; then
@@ -105,7 +112,7 @@
     echo "SRC = \$(ISABELLE_HOME)/src"
     echo "OUT = \$(ISABELLE_OUTPUT)"
     echo "LOG = \$(OUT)/log"
-    echo "INFO = \$(ISABELLE_BROWSER_INFO)"
+    echo "USEDIR = \$(ISATOOL) usedir -i true -d dvi"
     echo
     echo
     echo "## $NAME"
@@ -117,12 +124,12 @@
       echo -e "\t@cd \$(SRC)/$LOGIC; \$(ISATOOL) make $LOGIC"
       echo
       echo "$TARGET: \$(OUT)/$LOGIC     ## add $NAME sources here"
-      echo -e "\t@\$(ISATOOL) $USEDIR \$(OUT)/$LOGIC $NAME"
+      echo -e "\t@$USEDIR \$(OUT)/$LOGIC $NAME"
     else
       echo "$NAME: $TARGET"
       echo
       echo "$TARGET:                    ## add $NAME sources here"
-      echo -e "\t@\$(ISATOOL) $USEDIR $LOGIC $NAME"
+      echo -e "\t@$USEDIR $LOGIC $NAME"
     fi
     echo
     echo