clarified settings: these are setup defaults, not necessarily the installed version;
authorwenzelm
Wed, 07 May 2025 22:06:49 +0200
changeset 82616 c1871d013556
parent 82615 3e20da339306
child 82617 b7148ee355f6
clarified settings: these are setup defaults, not necessarily the installed version;
etc/settings
src/Pure/Tools/dotnet_setup.scala
src/Pure/Tools/go_setup.scala
--- a/etc/settings	Wed May 07 21:52:22 2025 +0200
+++ b/etc/settings	Wed May 07 22:06:49 2025 +0200
@@ -183,14 +183,14 @@
 ### .Net / Fsharp
 ###
 
-ISABELLE_DOTNET_VERSION="8.0.203"
+ISABELLE_DOTNET_SETUP_VERSION="8.0.203"
 
 
 ###
 ### Go and Caddy
 ###
 
-ISABELLE_GO_VERSION="1.24.1"
+ISABELLE_GO_SETUP_VERSION="1.24.1"
 
 ISABELLE_CADDY_SETUP_VERSION="2.10.0"
 ISABELLE_CADDY_SETUP_MODULES="github.com/jasonlovesdoggo/caddy-defender github.com/mholt/caddy-ratelimit"
--- a/src/Pure/Tools/dotnet_setup.scala	Wed May 07 21:52:22 2025 +0200
+++ b/src/Pure/Tools/dotnet_setup.scala	Wed May 07 22:06:49 2025 +0200
@@ -39,7 +39,7 @@
     Isabelle_Platform.local.ISABELLE_PLATFORM(windows = true, apple = true)
   def default_target_dir: Path = Components.default_components_base
   def default_install_url: String = "https://dot.net/v1/dotnet-install"
-  def default_version: String = Isabelle_System.getenv_strict("ISABELLE_DOTNET_VERSION")
+  def default_version: String = Isabelle_System.getenv_strict("ISABELLE_DOTNET_SETUP_VERSION")
 
   def dotnet_setup(
     platforms: List[String] = List(default_platform),
@@ -151,7 +151,7 @@
     -I URL       URL for install script without extension
                  (default: """ + quote(default_install_url) + """)
     -V VERSION   version: empty means "latest"
-                 (default: ISABELLE_DOTNET_VERSION=""" + quote(default_version) + """)
+                 (default: ISABELLE_DOTNET_SETUP_VERSION=""" + quote(default_version) + """)
     -f           force fresh installation of specified platforms
     -n           dry run: try download without installation
     -p PLATFORMS comma-separated list of platform specifications: "all" or
--- a/src/Pure/Tools/go_setup.scala	Wed May 07 21:52:22 2025 +0200
+++ b/src/Pure/Tools/go_setup.scala	Wed May 07 22:06:49 2025 +0200
@@ -37,7 +37,7 @@
     Isabelle_Platform.local.ISABELLE_PLATFORM(windows = true, apple = true)
   def default_target_dir: Path = Components.default_components_base
   val default_url = "https://go.dev/dl"
-  def default_version: String = Isabelle_System.getenv_strict("ISABELLE_GO_VERSION")
+  def default_version: String = Isabelle_System.getenv_strict("ISABELLE_GO_SETUP_VERSION")
 
   def go_setup(
     platforms: List[String] = List(default_platform),
@@ -146,7 +146,7 @@
   Options are:
     -D DIR       target directory (default ".")
     -U URL       download URL (default: """" + default_url + """")
-    -V VERSION   version (default: """" + default_version + """")
+    -V VERSION   version (default: ISABELLE_GO_SETUP_VERSION=""" + quote(default_version) + """)
     -f           force fresh installation of specified platforms
     -p PLATFORMS comma-separated list of platform specifications: "all" or
                  as family or formal name (default: """ + quote(default_platform) + """)