"windows" application is always x86_64;

--- a/Admin/Windows/launch4j/isabelle.xml	Fri Sep 29 22:45:58 2017 +0200
+++ b/Admin/Windows/launch4j/isabelle.xml	Sat Sep 30 11:20:47 2017 +0200
@@ -23,13 +23,13 @@
     <windowTitle>{ISABELLE_NAME}</windowTitle>
   </singleInstance>
   <jre>
-    <path>%EXEDIR%\contrib\jdk\{PLATFORM}\jre</path>
-    <bundledJre64Bit>{PLATFORM_IS_64}</bundledJre64Bit>
+    <path>%EXEDIR%\contrib\jdk\x86_64-windows\jre</path>
+    <bundledJre64Bit>true</bundledJre64Bit>
     <bundledJreAsFallback>false</bundledJreAsFallback>
     <minVersion></minVersion>
     <maxVersion></maxVersion>
     <jdkPreference>jdkOnly</jdkPreference>
-    <runtimeBits>{PLATFORM_BITS}</runtimeBits>
+    <runtimeBits>64</runtimeBits>
     <opt>-Disabelle.root=&quot;%EXEDIR%&quot; -Dcygwin.root=&quot;%EXEDIR%\contrib\cygwin&quot;</opt>
   </jre>
   <splash>

--- a/Admin/lib/Tools/makedist_bundle	Fri Sep 29 22:45:58 2017 +0200
+++ b/Admin/lib/Tools/makedist_bundle	Sat Sep 30 11:20:47 2017 +0200
@@ -12,7 +12,7 @@
   echo "Usage: isabelle $PRG ARCHIVE PLATFORM_FAMILY [REMOTE_MAC]"
   echo
   echo "  Re-package Isabelle source distribution with add-on components and"
-  echo "  post-hoc patches for platform family linux, windows, windows64, macos."
+  echo "  post-hoc patches for platform family linux, windows, macos."
   echo
   echo "  The optional remote Mac OS X system is used for dmg build."
   echo
@@ -36,12 +36,6 @@
 PLATFORM_FAMILY="$1"; shift
 REMOTE_MAC="$1"; shift
 
-if [ "$PLATFORM_FAMILY" = windows64 ]; then
-  PLATFORM_FAM="windows"
-else
-  PLATFORM_FAM="$PLATFORM_FAMILY"
-fi
-
 [ -f "$ARCHIVE" ] || fail "Bad source archive: $ARCHIVE"
 
 ARCHIVE_DIR="$(cd $(dirname "$ARCHIVE"); echo "$PWD")"
@@ -98,7 +92,7 @@
 
 echo "#bundled components" >> "$ISABELLE_TARGET/etc/components"
 
-for CATALOG in main "$PLATFORM_FAM" bundled "bundled-$PLATFORM_FAM"
+for CATALOG in main "$PLATFORM_FAMILY" bundled "bundled-$PLATFORM_FAMILY"
 do
   CATALOG_FILE="$ISABELLE_HOME/Admin/components/$CATALOG"
   if [ -f "$CATALOG_FILE" ]
@@ -194,7 +188,7 @@
 perl -pi -e "s,view.title=Isabelle/jEdit,view.title=${ISABELLE_NAME},g;" \
   "$ISABELLE_TARGET/src/Tools/jEdit/dist/properties/jEdit.props"
 
-case "$PLATFORM_FAM" in
+case "$PLATFORM_FAMILY" in
   linux)
     purge_target 'contrib -name "x86*-darwin" -o -name "x86*-cygwin" -o -name "x86*-windows"'
     purge_jdk "x86-linux"
@@ -250,19 +244,9 @@
       "$ISABELLE_TARGET/src/Tools/jEdit/dist/properties/jEdit.props"
     ;;
   windows)
-    if [ "$PLATFORM_FAMILY" = windows ]; then
-      purge_target 'contrib -name x86_64-windows -o -name "x86*-linux" -o -name "x86*-darwin"'
-      PLATFORM="x86-windows"
-      PLATFORM_IS_64="false"
-      PLATFORM_BITS="32"
-    else
-      purge_target 'contrib -name "x86*-linux" -o -name "x86*-darwin"'
-      purge_target 'contrib/jdk -name "x86-windows"'
-      PLATFORM="x86_64-windows"
-      PLATFORM_IS_64="true"
-      PLATFORM_BITS="64"
-    fi
-    purge_jdk "$PLATFORM"
+    purge_target 'contrib -name "x86*-linux" -o -name "x86*-darwin"'
+    purge_target 'contrib/jdk -name "x86-windows"'
+    purge_jdk "x86_64-windows"
 
     mv "$ISABELLE_TARGET/contrib/windows_app" "$TMP/."
 
@@ -275,13 +259,8 @@
       init_component "$JEDIT_HOME"
 
       declare -a JAVA_ARGS=()
-      if [ "$PLATFORM_FAMILY" = windows ]; then
-        echo -e "# Java runtime options for 32bit platform\r"
-        eval "JAVA_ARGS=($ISABELLE_JAVA_SYSTEM_OPTIONS $JEDIT_JAVA_SYSTEM_OPTIONS $JEDIT_JAVA_OPTIONS32)"
-      else
-        echo -e "# Java runtime options for 64bit platform\r"
-        eval "JAVA_ARGS=($ISABELLE_JAVA_SYSTEM_OPTIONS $JEDIT_JAVA_SYSTEM_OPTIONS $JEDIT_JAVA_OPTIONS64)"
-      fi
+      echo -e "# Java runtime options for 64bit platform\r"
+      eval "JAVA_ARGS=($ISABELLE_JAVA_SYSTEM_OPTIONS $JEDIT_JAVA_SYSTEM_OPTIONS $JEDIT_JAVA_OPTIONS64)"
       for ARG in "${JAVA_ARGS[@]}"
       do
         echo -e "$ARG\r"
@@ -309,9 +288,6 @@
         -e "s,{SPLASH},$APP_TEMPLATE/isabelle.bmp,g;" \
         -e "s,{CLASSPATH},$EXE_CLASSPATH,g;" \
         -e "s,{ISABELLE_NAME},$ISABELLE_NAME,g;" \
-        -e "s,{PLATFORM},$PLATFORM,g;" \
-        -e "s,{PLATFORM_IS_64},$PLATFORM_IS_64,g;" \
-        -e "s,{PLATFORM_BITS},$PLATFORM_BITS,g;" \
         "$APP_TEMPLATE/isabelle.xml" > isabelle.xml
 
       "windows_app/launch4j-${ISABELLE_PLATFORM_FAMILY}/launch4j" isabelle.xml
@@ -361,7 +337,7 @@
 
 # platform-specific setup (outside archive)
 
-case "$PLATFORM_FAM" in
+case "$PLATFORM_FAMILY" in
   linux)
     echo "application for $PLATFORM_FAMILY"
     ln -s "${ISABELLE_NAME}_linux.tar.gz" "${ARCHIVE_DIR}/${ISABELLE_NAME}_app.tar.gz"
@@ -432,12 +408,6 @@
     ;;
   windows)
     (
-      if [ "$PLATFORM_FAMILY" = windows ]; then
-        PLATFORM_SUFFIX="-win32"
-      else
-        PLATFORM_SUFFIX="-win64"
-      fi
-
       cd "$TMP"
       rm -f "${ARCHIVE_DIR}/${ISABELLE_NAME}.7z"
       7z -y -bd a "$TMP/${ISABELLE_NAME}.7z" "$ISABELLE_NAME" || exit 2
@@ -448,8 +418,8 @@
         cat "$ISABELLE_HOME/Admin/Windows/Installer/sfx.txt" | \
           perl -p -e "s,{ISABELLE_NAME},${ISABELLE_NAME},g;"
         cat "$TMP/${ISABELLE_NAME}.7z"
-      ) > "${ARCHIVE_DIR}/${ISABELLE_NAME}${PLATFORM_SUFFIX}.exe"
-      chmod +x "${ARCHIVE_DIR}/${ISABELLE_NAME}${PLATFORM_SUFFIX}.exe"
+      ) > "${ARCHIVE_DIR}/${ISABELLE_NAME}.exe"
+      chmod +x "${ARCHIVE_DIR}/${ISABELLE_NAME}.exe"
     )
     ;;
   *)

--- a/src/Pure/Admin/build_release.scala	Fri Sep 29 22:45:58 2017 +0200
+++ b/src/Pure/Admin/build_release.scala	Sat Sep 30 11:20:47 2017 +0200
@@ -24,8 +24,7 @@
   {
     val bundle_infos: List[Bundle_Info] =
       List(Bundle_Info("linux", "Linux", name + "_app.tar.gz", None),
-        Bundle_Info("windows", "Windows (32bit)", name + "-win32.exe", None),
-        Bundle_Info("windows64", "Windows (64bit)", name + "-win64.exe", None),
+        Bundle_Info("windows", "Windows (64bit)", name + ".exe", None),
         Bundle_Info("macos", "Mac OS X", name + ".dmg", Some(name + "_dmg.tar.gz")))
 
     def bundle_info(platform_family: String): Bundle_Info =
@@ -34,7 +33,7 @@
   }
 
 
-  private val default_platform_families = List("linux", "windows", "windows64", "macos")
+  private val default_platform_families = List("linux", "windows", "macos")
 
   def build_release(base_dir: Path,
     progress: Progress = No_Progress,