# HG changeset patch
# User wenzelm
# Date 1334688487 -7200
# Node ID f74da4658bd1ea629f020d8451386baeafa3e4e7
# Parent  69f95ac85c3df14bd7c82325f96d23b232672826
accomodate ProofGeneral as Isabelle component, with adhoc version switch for Cygwin as before;

diff -r 69f95ac85c3d -r f74da4658bd1 Admin/makebundle
--- a/Admin/makebundle	Tue Apr 17 19:16:13 2012 +0200
+++ b/Admin/makebundle	Tue Apr 17 20:48:07 2012 +0200
@@ -57,7 +57,13 @@
 
     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
@@ -70,12 +76,6 @@
 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"
@@ -90,8 +90,6 @@
   *-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"
     ;;
   *)
     ;;