# HG changeset patch
# User wenzelm
# Date 1358195862 -3600
# Node ID 9a7d81d66d090c198682f1d8909230a323aac3e2
# Parent  d1a0335b4231e0b469172c08d20fa09c315c83ac
include /isabelle/rebaseall in autorebaseall, which is run after installation of further packages;
patch cygwin in makedist_bundles instead of makedist_cygwin, to avoid frequent repackaging of the same;

diff -r d1a0335b4231 -r 9a7d81d66d09 Admin/Windows/Cygwin/isabelle/init.bat
--- a/Admin/Windows/Cygwin/isabelle/init.bat	Mon Jan 14 20:12:18 2013 +0100
+++ b/Admin/Windows/Cygwin/isabelle/init.bat	Mon Jan 14 21:37:42 2013 +0100
@@ -6,6 +6,6 @@
 set CYGWIN=nodosfilewarning
 
 echo Initializing Cygwin ...
-"bin\dash" /isabelle/rebaseall polyml-5.5.0
+"bin\dash" /isabelle/rebaseall
 "bin\bash" /isabelle/postinstall
 
diff -r d1a0335b4231 -r 9a7d81d66d09 Admin/Windows/Cygwin/isabelle/rebaseall
--- a/Admin/Windows/Cygwin/isabelle/rebaseall	Mon Jan 14 20:12:18 2013 +0100
+++ b/Admin/Windows/Cygwin/isabelle/rebaseall	Mon Jan 14 21:37:42 2013 +0100
@@ -6,9 +6,9 @@
 
 CONTRIB="$(cygpath -u "$(cygpath -w /)\..")"
 
-for NAME in "$@"
+for DIR in "$CONTRIB/polyml-5.5.0"
 do
-  find "$CONTRIB/$NAME" -name "*.dll" >> "$FILE_LIST"
+  find "$DIR" -name "*.dll" >> "$FILE_LIST"
 done
 
 dash /bin/rebaseall -T "$FILE_LIST"
diff -r d1a0335b4231 -r 9a7d81d66d09 Admin/lib/Tools/makedist_bundles
--- a/Admin/lib/Tools/makedist_bundles	Mon Jan 14 20:12:18 2013 +0100
+++ b/Admin/lib/Tools/makedist_bundles	Mon Jan 14 21:37:42 2013 +0100
@@ -127,6 +127,15 @@
     cp "$ISABELLE_HOME/Admin/Windows/Cygwin/Cygwin-Setup.bat" \
       "$ISABELLE_HOME/Admin/Windows/Cygwin/Cygwin-Terminal.bat" "$ISABELLE_TARGET"
 
+    for NAME in init.bat postinstall rebaseall
+    do
+      cp -a "$ISABELLE_HOME/Admin/Windows/Cygwin/isabelle/$NAME" \
+        "$ISABELLE_TARGET/contrib/cygwin/isabelle/."
+    done
+
+    perl -pi -e "s,/bin/rebaseall.*,/isabelle/rebaseall,g;" \
+      "$ISABELLE_TARGET/contrib/cygwin/etc/postinstall/autorebase.bat.done"
+
     for NAME in ANNOUNCE README NEWS COPYRIGHT CONTRIBUTORS contrib/README
     do
       FILE="$ISABELLE_TARGET/$NAME"
diff -r d1a0335b4231 -r 9a7d81d66d09 Admin/lib/Tools/makedist_cygwin
--- a/Admin/lib/Tools/makedist_cygwin	Mon Jan 14 20:12:18 2013 +0100
+++ b/Admin/lib/Tools/makedist_cygwin	Mon Jan 14 21:37:42 2013 +0100
@@ -72,11 +72,6 @@
 
 rm "$TARGET/Cygwin.bat"
 
-for NAME in init.bat postinstall rebaseall
-do
-  cp -a "$ISABELLE_HOME/Admin/Windows/Cygwin/isabelle/$NAME" "$TARGET/isabelle/."
-done
-
 
 # archive