# HG changeset patch
# User wenzelm
# Date 1335276372 -7200
# Node ID ea153f6abdb613ab8035b5ad66d75d060df3ae5c
# Parent  503efdb07566512bceb618b51a6b8c2686729226# Parent  f43b8873743d4768dd9a5309eb6aed9c91d6f00e
merged

diff -r 503efdb07566 -r ea153f6abdb6 Admin/Cygwin/Cygwin-Setup.bat
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Admin/Cygwin/Cygwin-Setup.bat	Tue Apr 24 16:06:12 2012 +0200
@@ -0,0 +1,4 @@
+@echo off
+
+"%CD%\contrib\cygwin-1.7.9\setup" --site http://isabelle.in.tum.de/cygwin --no-verify --only-site --local-package-dir "%TEMP%" --root "%CD%\contrib\cygwin-1.7.9"
+
diff -r 503efdb07566 -r ea153f6abdb6 Admin/Cygwin/Cygwin-Terminal.bat
--- a/Admin/Cygwin/Cygwin-Terminal.bat	Tue Apr 24 14:13:04 2012 +0100
+++ b/Admin/Cygwin/Cygwin-Terminal.bat	Tue Apr 24 16:06:12 2012 +0200
@@ -2,4 +2,5 @@
 
 set HOME=%HOMEDRIVE%%HOMEPATH%
 set PATH=%CD%\bin;%PATH%
+set CHERE_INVOKING=true
 "%CD%\contrib\cygwin-1.7.9\bin\bash" --login -i
diff -r 503efdb07566 -r ea153f6abdb6 Admin/makebundle
--- a/Admin/makebundle	Tue Apr 24 14:13:04 2012 +0100
+++ b/Admin/makebundle	Tue Apr 24 16:06:12 2012 +0200
@@ -71,15 +71,10 @@
 done
 
 if [ "$PLATFORM" = x86-cygwin ]; then
-  for NAME in Isabelle.exe Cygwin-Terminal.bat
-  do
-    EXE="$ARCHIVE_DIR/contrib/x86-cygwin/$NAME"
-    [ ! -e "$EXE" ] && fail "Missing $NAME"
-    echo "$NAME"
-    cp "$EXE" "$ISABELLE_HOME/"
-    chmod +x "$ISABELLE_HOME/$NAME"
-  done
+  TAR="$ARCHIVE_DIR/contrib/x86-cygwin/Isabelle.tar"
+  [ -e "$TAR" ] || fail "Missing $TAR"
   rm -f "$ISABELLE_HOME/Isabelle"
+  tar -C "$ISABELLE_HOME" -xv -f "$TAR"
 fi