Admin/lib/Tools/makedist_bundle

--- a/Admin/lib/Tools/makedist_bundle	Mon Jul 15 23:53:04 2013 +0200
+++ b/Admin/lib/Tools/makedist_bundle	Tue Jul 16 12:25:59 2013 +0200
@@ -97,6 +97,8 @@
   fi
 done
 
+mv "$ISABELLE_TARGET/contrib/windows_app" "$TMP/."
+
 
 # purge other platforms
 
@@ -133,7 +135,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"
 
-    cp "$ISABELLE_HOME/Admin/Windows/launch4j/Isabelle.exe" "$ISABELLE_TARGET/Isabelle2013.exe"
+    cp "$TMP/windows_app/Isabelle.exe" "$ISABELLE_TARGET/${ISABELLE_NAME}.exe"
     cp "$ISABELLE_HOME/Admin/Windows/Cygwin/Cygwin-Setup.bat" \
       "$ISABELLE_HOME/Admin/Windows/Cygwin/Cygwin-Latex-Setup.bat" \
       "$ISABELLE_HOME/Admin/Windows/Cygwin/Cygwin-Terminal.bat" "$ISABELLE_TARGET"
@@ -141,7 +143,7 @@
     (
       cd "$ISABELLE_TARGET"
 
-      for NAME in init.bat postinstall rebaseall
+      for NAME in postinstall rebaseall
       do
         cp -a "$ISABELLE_HOME/Admin/Windows/Cygwin/isabelle/$NAME" \
           "contrib/cygwin/isabelle/."
@@ -180,15 +182,26 @@
 echo "packaging $(basename "$BUNDLE_ARCHIVE")"
 tar -C "$TMP" -c -z -f "$BUNDLE_ARCHIVE" "$ISABELLE_NAME" || exit 2
 
+
+# application
+
 if [ "$PLATFORM_FAMILY" = windows ]
 then
   if type -p 7z >/dev/null
   then
-    echo "packaging ${ISABELLE_NAME}.7z"
     (
       cd "$TMP"
       rm -f "${ARCHIVE_DIR}/${ISABELLE_NAME}.7z"
-      7z -y a "${ARCHIVE_DIR}/${ISABELLE_NAME}.7z" "$ISABELLE_NAME" || exit 2
+      7z -y -bd a "${ARCHIVE_DIR}/${ISABELLE_NAME}.7z" "$ISABELLE_NAME" || exit 2
+
+      echo "application for $PLATFORM_FAMILY"
+      (
+        cat "windows_app/7zsd_All.sfx"
+        cat "$ISABELLE_HOME/Admin/Windows/Installer/sfx.txt" | \
+          perl -p -e "s,{ISABELLE_NAME},${ISABELLE_NAME},g;"
+        cat "${ARCHIVE_DIR}/${ISABELLE_NAME}.7z"
+      ) > "${ARCHIVE_DIR}/${ISABELLE_NAME}.exe"
+      chmod +x "${ARCHIVE_DIR}/${ISABELLE_NAME}.exe"
     )
   fi
 fi