# HG changeset patch
# User wenzelm
# Date 1357846912 -3600
# Node ID 76967aa4fe84aae705990bad415c8a30cec96b85
# Parent  6e77cfc21fc17554e524d6deb5c5b011eac15f63
outermost directory structure for Windows/Cygwin;

diff -r 6e77cfc21fc1 -r 76967aa4fe84 Admin/Windows/Cygwin/Cygwin-Setup.bat
--- a/Admin/Windows/Cygwin/Cygwin-Setup.bat	Thu Jan 10 20:23:16 2013 +0100
+++ b/Admin/Windows/Cygwin/Cygwin-Setup.bat	Thu Jan 10 20:41:52 2013 +0100
@@ -1,4 +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"
+"%CD%\cygwin\isabelle\cygwin" --site http://isabelle.in.tum.de/cygwin_2013 --no-verify --only-site --local-package-dir "%TEMP%" --root "%CD%\cygwin"
 
diff -r 6e77cfc21fc1 -r 76967aa4fe84 Admin/Windows/Cygwin/Cygwin-Terminal.bat
--- a/Admin/Windows/Cygwin/Cygwin-Terminal.bat	Thu Jan 10 20:23:16 2013 +0100
+++ b/Admin/Windows/Cygwin/Cygwin-Terminal.bat	Thu Jan 10 20:41:52 2013 +0100
@@ -6,4 +6,4 @@
 
 echo This is the GNU Bash interpreter of Cygwin.
 echo Use command "isabelle" to invoke Isabelle tools.
-"%CD%\contrib\cygwin-1.7.9\bin\bash" --login -i
+"%CD%\cygwin\bin\bash" --login -i
diff -r 6e77cfc21fc1 -r 76967aa4fe84 Admin/Windows/Cygwin/sfx.txt
--- a/Admin/Windows/Cygwin/sfx.txt	Thu Jan 10 20:23:16 2013 +0100
+++ b/Admin/Windows/Cygwin/sfx.txt	Thu Jan 10 20:41:52 2013 +0100
@@ -1,9 +1,9 @@
 ;!@Install@!UTF-8!
 GUIFlags="64"
 InstallPath="%UserDesktop%"
-BeginPrompt="Unpack Isabelle2012?"
+BeginPrompt="Unpack Isabelle2013?"
 ExtractPathText="Target directory"
-ExtractTitle="Unpacking Isabelle2012 ..."
-Shortcut="Du,{%%T\Isabelle2012\Isabelle.exe},{},{},{},{},{%%T\Isabelle2012}"
-RunProgram="\"%%T\Isabelle2012\contrib\cygwin-1.7.9\init.bat\""
+ExtractTitle="Unpacking Isabelle2013 ..."
+Shortcut="Du,{%%T\Isabelle2013\Isabelle2013.exe},{},{},{},{},{%%T\Isabelle2013}"
+RunProgram="\"%%T\Isabelle2013\cygwin\init.bat\""
 ;!@InstallEnd@!
diff -r 6e77cfc21fc1 -r 76967aa4fe84 Admin/lib/Tools/makedist_bundles
--- a/Admin/lib/Tools/makedist_bundles	Thu Jan 10 20:23:16 2013 +0100
+++ b/Admin/lib/Tools/makedist_bundles	Thu Jan 10 20:41:52 2013 +0100
@@ -117,12 +117,11 @@
     perl -pi -e "s,lookAndFeel=.*,lookAndFeel=com.sun.java.swing.plaf.windows.WindowsLookAndFeel,g;" \
       "$TMP/$ISABELLE_NAME/src/Tools/jEdit/dist/properties/jEdit.props"
 
-# FIXME include cygwin.tar.gz etc.
-#
-#    TAR="$ARCHIVE_DIR/contrib/windows/Isabelle.tar"
-#    [ -e "$TAR" ] || fail "Missing $TAR"
-#    rm -f "$ISABELLE_TARGET/Isabelle"
-#    tar -C "$ISABELLE_TARGET" -xv -f "$TAR"
+    # FIXME cygwin.tar.gz
+
+    cp "$ISABELLE_HOME/Admin/Windows/launch4j/Isabelle.exe" "$ISABELLE_TARGET/Isabelle2013.exe"
+    cp "$ISABELLE_HOME/Admin/Windows/Cygwin/Cygwin-Setup.bat" \
+      "$ISABELLE_HOME/Admin/Windows/Cygwin/Cygwin-Terminal.bat" "$ISABELLE_TARGET"
 
     for NAME in ANNOUNCE README NEWS COPYRIGHT CONTRIBUTORS contrib/README
     do