# HG changeset patch
# User wenzelm
# Date 1357849214 -3600
# Node ID eb38dfcf834a5befffccc96dc4792d5035e79cda
# Parent  d02b9918e4d48a80c7bb27833cc82054ecd64df7
manage cygwin as bundled quasi-component;

diff -r d02b9918e4d4 -r eb38dfcf834a Admin/components/bundled-windows
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Admin/components/bundled-windows	Thu Jan 10 21:20:14 2013 +0100
@@ -0,0 +1,3 @@
+#additional components to be bundled for release
+cygwin-20130110
+
diff -r d02b9918e4d4 -r eb38dfcf834a Admin/components/components.sha1
--- a/Admin/components/components.sha1	Thu Jan 10 21:14:01 2013 +0100
+++ b/Admin/components/components.sha1	Thu Jan 10 21:20:14 2013 +0100
@@ -1,4 +1,5 @@
 2f6417b8e96a0e4e8354fe0f1a253c18fb55d9a7  cvc3-2.4.1.tar.gz
+842d9526f37b928cf9e22f141884365129990d63  cygwin-20130110.tar.gz
 0fe549949a025d65d52d6deca30554de8fca3b6e  e-1.5.tar.gz
 b98a98025d1f7e560ca6864a53296137dae736b4  e-1.6.tar.gz
 6d34b18ca0aa1e10bab6413045d079188c0e2dfb  exec_process-1.0.1.tar.gz
diff -r d02b9918e4d4 -r eb38dfcf834a Admin/lib/Tools/makedist_bundles
--- a/Admin/lib/Tools/makedist_bundles	Thu Jan 10 21:14:01 2013 +0100
+++ b/Admin/lib/Tools/makedist_bundles	Thu Jan 10 21:20:14 2013 +0100
@@ -60,7 +60,7 @@
 
 echo "#bundled components" >> "$ISABELLE_TARGET/etc/components"
 
-for CATALOG in main bundled "$PLATFORM_FAMILY"
+for CATALOG in main "$PLATFORM_FAMILY" bundled "bundled-$PLATFORM_FAMILY"
 do
   CATALOG_FILE="$ISABELLE_HOME/Admin/components/$CATALOG"
   if [ -f "$CATALOG_FILE" ]
@@ -117,7 +117,7 @@
     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 cygwin.tar.gz
+    mv "$ISABELLE_TARGET/contrib/cygwin" "$ISABELLE_TARGET"
 
     cp "$ISABELLE_HOME/Admin/Windows/launch4j/Isabelle.exe" "$ISABELLE_TARGET/Isabelle2013.exe"
     cp "$ISABELLE_HOME/Admin/Windows/Cygwin/Cygwin-Setup.bat" \