Admin/makebundle

     NAME="$(basename "$CONTRIB" .tar.gz)"
     [ -d "$ISABELLE_HOME/contrib/$NAME" ] || fail "Bad archive content $CONTRIB"
 
     if [ -e "$ISABELLE_HOME/contrib/$NAME/etc/settings" ]; then
       echo "component $NAME"
-      echo "contrib/$NAME" >> "$ISABELLE_HOME/etc/components"
+      if [ "$PLATFORM" != x86-cygwin -a "$NAME" = ProofGeneral-3.7.1.1 ]; then
+        echo "#contrib/$NAME" >> "$ISABELLE_HOME/etc/components"
+      elif [ "$PLATFORM" = x86-cygwin -a "$NAME" = ProofGeneral-4.1 ]; then
+        echo "#contrib/$NAME" >> "$ISABELLE_HOME/etc/components"
+      else
+        echo "contrib/$NAME" >> "$ISABELLE_HOME/etc/components"
+      fi
     else
       echo "package $NAME"
     fi
   fi
 done

 
 HEAPS_ARCHIVE="$ARCHIVE_DIR/${ISABELLE_NAME}_heaps_${PLATFORM}.tar.gz"
 [ -f "$HEAPS_ARCHIVE" ] || fail "Bad heaps archive: $HEAPS_ARCHIVE"
 echo "heaps"
 tar -C "$TMP" -x -z -f "$HEAPS_ARCHIVE"
-
-
-(
-  cd "$TMP/$ISABELLE_NAME/contrib/ProofGeneral"
-  find . -name "*.elc" -exec rm {} ";"
-)
 
 case "$PLATFORM" in
   x86_64-linux)
     perl -pi -e 's,^ML_PLATFORM=.*$,ML_PLATFORM="\$ISABELLE_PLATFORM64",g;' "$TMP/$ISABELLE_NAME/etc/settings"
     perl -pi -e "s,^ML_OPTIONS=.*$,ML_OPTIONS=\"-H 400\",g;" "$TMP/$ISABELLE_NAME/etc/settings"

       "$TMP/$ISABELLE_NAME/src/Tools/jEdit/dist/properties/jEdit.props"
     ;;
   *-cygwin)
     perl -pi -e "s,lookAndFeel=.*,lookAndFeel=com.sun.java.swing.plaf.windows.WindowsLookAndFeel,g;" \
       "$TMP/$ISABELLE_NAME/src/Tools/jEdit/dist/properties/jEdit.props"
-    rm "$TMP/$ISABELLE_NAME/contrib/ProofGeneral"
-    ln -s ProofGeneral-3.7.1.1 "$TMP/$ISABELLE_NAME/contrib/ProofGeneral"
     ;;
   *)
     ;;
 esac