"windows" application is always x86_64;
authorwenzelm
Sat Sep 30 11:20:47 2017 +0200 (18 months ago)
changeset 667241e1f9f603385
parent 66723 18cc87e2335f
child 66725 c37c4f0db878
"windows" application is always x86_64;
Admin/Windows/launch4j/isabelle.xml
Admin/lib/Tools/makedist_bundle
src/Pure/Admin/build_release.scala
     1.1 --- a/Admin/Windows/launch4j/isabelle.xml	Fri Sep 29 22:45:58 2017 +0200
     1.2 +++ b/Admin/Windows/launch4j/isabelle.xml	Sat Sep 30 11:20:47 2017 +0200
     1.3 @@ -23,13 +23,13 @@
     1.4      <windowTitle>{ISABELLE_NAME}</windowTitle>
     1.5    </singleInstance>
     1.6    <jre>
     1.7 -    <path>%EXEDIR%\contrib\jdk\{PLATFORM}\jre</path>
     1.8 -    <bundledJre64Bit>{PLATFORM_IS_64}</bundledJre64Bit>
     1.9 +    <path>%EXEDIR%\contrib\jdk\x86_64-windows\jre</path>
    1.10 +    <bundledJre64Bit>true</bundledJre64Bit>
    1.11      <bundledJreAsFallback>false</bundledJreAsFallback>
    1.12      <minVersion></minVersion>
    1.13      <maxVersion></maxVersion>
    1.14      <jdkPreference>jdkOnly</jdkPreference>
    1.15 -    <runtimeBits>{PLATFORM_BITS}</runtimeBits>
    1.16 +    <runtimeBits>64</runtimeBits>
    1.17      <opt>-Disabelle.root=&quot;%EXEDIR%&quot; -Dcygwin.root=&quot;%EXEDIR%\contrib\cygwin&quot;</opt>
    1.18    </jre>
    1.19    <splash>
     2.1 --- a/Admin/lib/Tools/makedist_bundle	Fri Sep 29 22:45:58 2017 +0200
     2.2 +++ b/Admin/lib/Tools/makedist_bundle	Sat Sep 30 11:20:47 2017 +0200
     2.3 @@ -12,7 +12,7 @@
     2.4    echo "Usage: isabelle $PRG ARCHIVE PLATFORM_FAMILY [REMOTE_MAC]"
     2.5    echo
     2.6    echo "  Re-package Isabelle source distribution with add-on components and"
     2.7 -  echo "  post-hoc patches for platform family linux, windows, windows64, macos."
     2.8 +  echo "  post-hoc patches for platform family linux, windows, macos."
     2.9    echo
    2.10    echo "  The optional remote Mac OS X system is used for dmg build."
    2.11    echo
    2.12 @@ -36,12 +36,6 @@
    2.13  PLATFORM_FAMILY="$1"; shift
    2.14  REMOTE_MAC="$1"; shift
    2.15  
    2.16 -if [ "$PLATFORM_FAMILY" = windows64 ]; then
    2.17 -  PLATFORM_FAM="windows"
    2.18 -else
    2.19 -  PLATFORM_FAM="$PLATFORM_FAMILY"
    2.20 -fi
    2.21 -
    2.22  [ -f "$ARCHIVE" ] || fail "Bad source archive: $ARCHIVE"
    2.23  
    2.24  ARCHIVE_DIR="$(cd $(dirname "$ARCHIVE"); echo "$PWD")"
    2.25 @@ -98,7 +92,7 @@
    2.26  
    2.27  echo "#bundled components" >> "$ISABELLE_TARGET/etc/components"
    2.28  
    2.29 -for CATALOG in main "$PLATFORM_FAM" bundled "bundled-$PLATFORM_FAM"
    2.30 +for CATALOG in main "$PLATFORM_FAMILY" bundled "bundled-$PLATFORM_FAMILY"
    2.31  do
    2.32    CATALOG_FILE="$ISABELLE_HOME/Admin/components/$CATALOG"
    2.33    if [ -f "$CATALOG_FILE" ]
    2.34 @@ -194,7 +188,7 @@
    2.35  perl -pi -e "s,view.title=Isabelle/jEdit,view.title=${ISABELLE_NAME},g;" \
    2.36    "$ISABELLE_TARGET/src/Tools/jEdit/dist/properties/jEdit.props"
    2.37  
    2.38 -case "$PLATFORM_FAM" in
    2.39 +case "$PLATFORM_FAMILY" in
    2.40    linux)
    2.41      purge_target 'contrib -name "x86*-darwin" -o -name "x86*-cygwin" -o -name "x86*-windows"'
    2.42      purge_jdk "x86-linux"
    2.43 @@ -250,19 +244,9 @@
    2.44        "$ISABELLE_TARGET/src/Tools/jEdit/dist/properties/jEdit.props"
    2.45      ;;
    2.46    windows)
    2.47 -    if [ "$PLATFORM_FAMILY" = windows ]; then
    2.48 -      purge_target 'contrib -name x86_64-windows -o -name "x86*-linux" -o -name "x86*-darwin"'
    2.49 -      PLATFORM="x86-windows"
    2.50 -      PLATFORM_IS_64="false"
    2.51 -      PLATFORM_BITS="32"
    2.52 -    else
    2.53 -      purge_target 'contrib -name "x86*-linux" -o -name "x86*-darwin"'
    2.54 -      purge_target 'contrib/jdk -name "x86-windows"'
    2.55 -      PLATFORM="x86_64-windows"
    2.56 -      PLATFORM_IS_64="true"
    2.57 -      PLATFORM_BITS="64"
    2.58 -    fi
    2.59 -    purge_jdk "$PLATFORM"
    2.60 +    purge_target 'contrib -name "x86*-linux" -o -name "x86*-darwin"'
    2.61 +    purge_target 'contrib/jdk -name "x86-windows"'
    2.62 +    purge_jdk "x86_64-windows"
    2.63  
    2.64      mv "$ISABELLE_TARGET/contrib/windows_app" "$TMP/."
    2.65  
    2.66 @@ -275,13 +259,8 @@
    2.67        init_component "$JEDIT_HOME"
    2.68  
    2.69        declare -a JAVA_ARGS=()
    2.70 -      if [ "$PLATFORM_FAMILY" = windows ]; then
    2.71 -        echo -e "# Java runtime options for 32bit platform\r"
    2.72 -        eval "JAVA_ARGS=($ISABELLE_JAVA_SYSTEM_OPTIONS $JEDIT_JAVA_SYSTEM_OPTIONS $JEDIT_JAVA_OPTIONS32)"
    2.73 -      else
    2.74 -        echo -e "# Java runtime options for 64bit platform\r"
    2.75 -        eval "JAVA_ARGS=($ISABELLE_JAVA_SYSTEM_OPTIONS $JEDIT_JAVA_SYSTEM_OPTIONS $JEDIT_JAVA_OPTIONS64)"
    2.76 -      fi
    2.77 +      echo -e "# Java runtime options for 64bit platform\r"
    2.78 +      eval "JAVA_ARGS=($ISABELLE_JAVA_SYSTEM_OPTIONS $JEDIT_JAVA_SYSTEM_OPTIONS $JEDIT_JAVA_OPTIONS64)"
    2.79        for ARG in "${JAVA_ARGS[@]}"
    2.80        do
    2.81          echo -e "$ARG\r"
    2.82 @@ -309,9 +288,6 @@
    2.83          -e "s,{SPLASH},$APP_TEMPLATE/isabelle.bmp,g;" \
    2.84          -e "s,{CLASSPATH},$EXE_CLASSPATH,g;" \
    2.85          -e "s,{ISABELLE_NAME},$ISABELLE_NAME,g;" \
    2.86 -        -e "s,{PLATFORM},$PLATFORM,g;" \
    2.87 -        -e "s,{PLATFORM_IS_64},$PLATFORM_IS_64,g;" \
    2.88 -        -e "s,{PLATFORM_BITS},$PLATFORM_BITS,g;" \
    2.89          "$APP_TEMPLATE/isabelle.xml" > isabelle.xml
    2.90  
    2.91        "windows_app/launch4j-${ISABELLE_PLATFORM_FAMILY}/launch4j" isabelle.xml
    2.92 @@ -361,7 +337,7 @@
    2.93  
    2.94  # platform-specific setup (outside archive)
    2.95  
    2.96 -case "$PLATFORM_FAM" in
    2.97 +case "$PLATFORM_FAMILY" in
    2.98    linux)
    2.99      echo "application for $PLATFORM_FAMILY"
   2.100      ln -s "${ISABELLE_NAME}_linux.tar.gz" "${ARCHIVE_DIR}/${ISABELLE_NAME}_app.tar.gz"
   2.101 @@ -432,12 +408,6 @@
   2.102      ;;
   2.103    windows)
   2.104      (
   2.105 -      if [ "$PLATFORM_FAMILY" = windows ]; then
   2.106 -        PLATFORM_SUFFIX="-win32"
   2.107 -      else
   2.108 -        PLATFORM_SUFFIX="-win64"
   2.109 -      fi
   2.110 -
   2.111        cd "$TMP"
   2.112        rm -f "${ARCHIVE_DIR}/${ISABELLE_NAME}.7z"
   2.113        7z -y -bd a "$TMP/${ISABELLE_NAME}.7z" "$ISABELLE_NAME" || exit 2
   2.114 @@ -448,8 +418,8 @@
   2.115          cat "$ISABELLE_HOME/Admin/Windows/Installer/sfx.txt" | \
   2.116            perl -p -e "s,{ISABELLE_NAME},${ISABELLE_NAME},g;"
   2.117          cat "$TMP/${ISABELLE_NAME}.7z"
   2.118 -      ) > "${ARCHIVE_DIR}/${ISABELLE_NAME}${PLATFORM_SUFFIX}.exe"
   2.119 -      chmod +x "${ARCHIVE_DIR}/${ISABELLE_NAME}${PLATFORM_SUFFIX}.exe"
   2.120 +      ) > "${ARCHIVE_DIR}/${ISABELLE_NAME}.exe"
   2.121 +      chmod +x "${ARCHIVE_DIR}/${ISABELLE_NAME}.exe"
   2.122      )
   2.123      ;;
   2.124    *)
     3.1 --- a/src/Pure/Admin/build_release.scala	Fri Sep 29 22:45:58 2017 +0200
     3.2 +++ b/src/Pure/Admin/build_release.scala	Sat Sep 30 11:20:47 2017 +0200
     3.3 @@ -24,8 +24,7 @@
     3.4    {
     3.5      val bundle_infos: List[Bundle_Info] =
     3.6        List(Bundle_Info("linux", "Linux", name + "_app.tar.gz", None),
     3.7 -        Bundle_Info("windows", "Windows (32bit)", name + "-win32.exe", None),
     3.8 -        Bundle_Info("windows64", "Windows (64bit)", name + "-win64.exe", None),
     3.9 +        Bundle_Info("windows", "Windows (64bit)", name + ".exe", None),
    3.10          Bundle_Info("macos", "Mac OS X", name + ".dmg", Some(name + "_dmg.tar.gz")))
    3.11  
    3.12      def bundle_info(platform_family: String): Bundle_Info =
    3.13 @@ -34,7 +33,7 @@
    3.14    }
    3.15  
    3.16  
    3.17 -  private val default_platform_families = List("linux", "windows", "windows64", "macos")
    3.18 +  private val default_platform_families = List("linux", "windows", "macos")
    3.19  
    3.20    def build_release(base_dir: Path,
    3.21      progress: Progress = No_Progress,