# HG changeset patch # User wenzelm # Date 1711550321 -3600 # Node ID 71d005ffa9fe55d46927b00469f3b302df95ff76 # Parent 98808cc7b0c1eeebce43c790a3ad7255dfdbc274 remove unused TEMP_WINDOWS more thoroughly (see also fa18208fd7bd and 37f852399a32); diff -r 98808cc7b0c1 -r 71d005ffa9fe Admin/Windows/Cygwin/Cygwin-Terminal.bat --- a/Admin/Windows/Cygwin/Cygwin-Terminal.bat Wed Mar 27 15:01:38 2024 +0100 +++ b/Admin/Windows/Cygwin/Cygwin-Terminal.bat Wed Mar 27 15:38:41 2024 +0100 @@ -1,6 +1,5 @@ @echo off -set TEMP_WINDOWS=%TEMP% set HOME=%HOMEDRIVE%%HOMEPATH% set PATH=%CD%\bin;%PATH% set LANG=en_US.UTF-8 diff -r 98808cc7b0c1 -r 71d005ffa9fe Admin/components/components.sha1 --- a/Admin/components/components.sha1 Wed Mar 27 15:01:38 2024 +0100 +++ b/Admin/components/components.sha1 Wed Mar 27 15:38:41 2024 +0100 @@ -176,6 +176,7 @@ cb9f061ccd7c6f90d00c8aa115aeea8679f3f996 isabelle_setup-20221028.tar.gz f582c621471583d06e00007c6acc01376c7395af isabelle_setup-20230206.tar.gz d30109fe63cec35c31cee9ffd17ae3a13c1e6a33 isabelle_setup-20230922.tar.gz +cd92c141883f0f6a18adceb885316c8b6119e648 isabelle_setup-20240327.tar.gz f23037b322b968c61350f9ec9995a4f397e6c71c javamail-1.4.7.tar.gz 18e6b60ceb98e327fbf14e52f4613dd5b0483d2f javamail-20240109.tar.gz 0b2206f914336dec4923dd0479d8cee4b904f544 jdk-11+28.tar.gz diff -r 98808cc7b0c1 -r 71d005ffa9fe Admin/components/main --- a/Admin/components/main Wed Mar 27 15:01:38 2024 +0100 +++ b/Admin/components/main Wed Mar 27 15:38:41 2024 +0100 @@ -11,7 +11,7 @@ foiltex-2.1.4b idea-icons-20210508 isabelle_fonts-20211004 -isabelle_setup-20230922 +isabelle_setup-20240327 javamail-20240109 jdk-21.0.2 jedit-20231120 diff -r 98808cc7b0c1 -r 71d005ffa9fe src/Pure/ROOT.scala --- a/src/Pure/ROOT.scala Wed Mar 27 15:01:38 2024 +0100 +++ b/src/Pure/ROOT.scala Wed Mar 27 15:38:41 2024 +0100 @@ -29,4 +29,3 @@ def if_proper[A](x: Iterable[A], body: => String): String = Library.if_proper(x, body) def if_proper(b: Boolean, body: => String): String = Library.if_proper(b, body) } - diff -r 98808cc7b0c1 -r 71d005ffa9fe src/Tools/Setup/src/Environment.java --- a/src/Tools/Setup/src/Environment.java Wed Mar 27 15:01:38 2024 +0100 +++ b/src/Tools/Setup/src/Environment.java Wed Mar 27 15:38:41 2024 +0100 @@ -366,11 +366,7 @@ BiFunction env_default = (String a, String b) -> { if (!b.isEmpty()) env.putIfAbsent(a, b); return null; }; - String temp_windows = is_windows() ? System.getenv("TEMP") : null; - env_default.apply("CYGWIN_ROOT", cygwin_root); - env_default.apply("TEMP_WINDOWS", - (temp_windows != null && temp_windows.contains("\\")) ? temp_windows : ""); env_default.apply("ISABELLE_JDK_HOME", standard_path(cygwin_root, System.getProperty("java.home", ""))); env_default.apply("HOME", System.getProperty("user.home", ""));