1.1 --- a/Admin/makebin	Sun Jun 06 17:37:44 2010 +0200
     1.2 +++ b/Admin/makebin	Sun Jun 06 18:29:10 2010 +0200
     1.3 @@ -21,7 +21,6 @@
     1.4    echo
     1.5    echo "  Options are:"
     1.6    echo "    -l           produce library"
     1.7 -  echo "    -n           dry run"
     1.8    echo
     1.9    echo "  Precompile Isabelle for the current platform."
    1.10    echo
    1.11 @@ -40,7 +39,6 @@
    1.12  # options
    1.13  
    1.14  DO_LIBRARY=""
    1.15 -DRY_RUN=""
    1.16  
    1.17  while getopts "ln" OPT
    1.18  do
    1.19 @@ -48,9 +46,6 @@
    1.20      l)
    1.21        DO_LIBRARY=true
    1.22        ;;
    1.23 -    n)
    1.24 -      DRY_RUN=true
    1.25 -      ;;
    1.26      \?)
    1.27        usage
    1.28        ;;
    1.29 @@ -102,24 +97,12 @@
    1.30  COMPILER=$(./bin/isabelle getenv -b ML_IDENTIFIER)
    1.31  PLATFORM=$(./bin/isabelle getenv -b ML_PLATFORM)
    1.32  
    1.33 -if [ -n "$DRY_RUN" ]; then
    1.34 -  mkdir -p "heaps/$COMPILER/log"
    1.35 -  touch "heaps/$COMPILER/HOL"
    1.36 -  touch "heaps/$COMPILER/log/HOL.gz"
    1.37 -  touch "heaps/$COMPILER/HOL-Nominal"
    1.38 -  touch "heaps/$COMPILER/log/HOL-Nominal.gz"
    1.39 -  touch "heaps/$COMPILER/HOLCF"
    1.40 -  touch "heaps/$COMPILER/log/HOLCF.gz"
    1.41 -  touch "heaps/$COMPILER/ZF"
    1.42 -  touch "heaps/$COMPILER/log/ZF.gz"
    1.43 -  mkdir browser_info
    1.44 -elif [ -n "$DO_LIBRARY" ]; then
    1.45 +if [ -n "$DO_LIBRARY" ]; then
    1.46    ./build -bait
    1.47  else
    1.48    ./build -b -m HOL-Nominal HOL
    1.49    ./build -b HOLCF
    1.50    ./build -b ZF
    1.51 -  rm -f "heaps/$COMPILER/Pure" "heaps/$COMPILER/FOL"
    1.52  fi
    1.53  
    1.54  
    1.55 @@ -131,18 +114,9 @@
    1.56  chgrp -R isabelle "$TMP"
    1.57  
    1.58  if [ -n "$DO_LIBRARY" ]; then
    1.59 -  tar cf "${ISABELLE_NAME}_library.tar" $ISABELLE_NAME/browser_info && \
    1.60 -    gzip -f "${ISABELLE_NAME}_library.tar"
    1.61 -    cp -f "${ISABELLE_NAME}_library.tar.gz" "$ARCHIVE_DIR"
    1.62 +  tar -c -z -f "$ARCHIVE_DIR/${ISABELLE_NAME}_library.tar.gz" "$ISABELLE_NAME/browser_info"
    1.63  else
    1.64 -  for IMG in HOL HOL-Nominal HOLCF ZF
    1.65 -  do
    1.66 -    tar cf "${IMG}_$PLATFORM.tar" \
    1.67 -      "$ISABELLE_NAME/heaps/$COMPILER/$IMG" \
    1.68 -      "$ISABELLE_NAME/heaps/$COMPILER/log/$IMG.gz"
    1.69 -    gzip -f "${IMG}_$PLATFORM.tar"
    1.70 -    cp -f "${IMG}_$PLATFORM.tar.gz" "$ARCHIVE_DIR"
    1.71 -  done
    1.72 +  tar -c -z -f "$ARCHIVE_DIR/${ISABELLE_NAME}_heaps_${PLATFORM}.tar.gz" "$ISABELLE_NAME/heaps"
    1.73  fi
    1.74  
    1.75