--- a/src/Pure/Admin/build_csdp.scala Wed Nov 30 21:53:55 2022 +0100
+++ b/src/Pure/Admin/build_csdp.scala Wed Nov 30 22:07:59 2022 +0100
@@ -130,9 +130,7 @@
/* settings */
- File.write(component_dir.settings,
- """# -*- shell-script -*- :mode=shellscript:
-
+ component_dir.write_settings("""
ISABELLE_CSDP="$COMPONENT/${ISABELLE_WINDOWS_PLATFORM64:-$ISABELLE_PLATFORM64}/csdp"
""")
--- a/src/Pure/Admin/build_cvc5.scala Wed Nov 30 21:53:55 2022 +0100
+++ b/src/Pure/Admin/build_cvc5.scala Wed Nov 30 22:07:59 2022 +0100
@@ -59,9 +59,7 @@
/* settings */
- File.write(component_dir.settings,
- """# -*- shell-script -*- :mode=shellscript:
-
+ component_dir.write_settings("""
CVC5_HOME="$COMPONENT/${ISABELLE_WINDOWS_PLATFORM64:-${ISABELLE_APPLE_PLATFORM64:-$ISABELLE_PLATFORM64}}"
CVC5_VERSION=""" + Bash.string(version) + """
--- a/src/Pure/Admin/build_e.scala Wed Nov 30 21:53:55 2022 +0100
+++ b/src/Pure/Admin/build_e.scala Wed Nov 30 22:07:59 2022 +0100
@@ -77,13 +77,12 @@
/* settings */
- File.write(component_dir.settings,
- """# -*- shell-script -*- :mode=shellscript:
-
+ component_dir.write_settings("""
E_HOME="$COMPONENT/$ISABELLE_PLATFORM64"
E_VERSION=""" + quote(version) + """
""")
+
/* README */
File.write(component_dir.README,
--- a/src/Pure/Admin/build_easychair.scala Wed Nov 30 21:53:55 2022 +0100
+++ b/src/Pure/Admin/build_easychair.scala Wed Nov 30 22:07:59 2022 +0100
@@ -45,9 +45,7 @@
/* settings */
- File.write(component_dir.settings,
- """# -*- shell-script -*- :mode=shellscript:
-
+ component_dir.write_settings("""
ISABELLE_EASYCHAIR_HOME="$COMPONENT"
""")
--- a/src/Pure/Admin/build_eptcs.scala Wed Nov 30 21:53:55 2022 +0100
+++ b/src/Pure/Admin/build_eptcs.scala Wed Nov 30 22:07:59 2022 +0100
@@ -42,9 +42,7 @@
/* settings */
- File.write(component_dir.settings,
- """# -*- shell-script -*- :mode=shellscript:
-
+ component_dir.write_settings("""
ISABELLE_EPTCS_HOME="$COMPONENT"
""")
--- a/src/Pure/Admin/build_foiltex.scala Wed Nov 30 21:53:55 2022 +0100
+++ b/src/Pure/Admin/build_foiltex.scala Wed Nov 30 22:07:59 2022 +0100
@@ -52,9 +52,7 @@
/* settings */
- File.write(component_dir.settings,
- """# -*- shell-script -*- :mode=shellscript:
-
+ component_dir.write_settings("""
ISABELLE_FOILTEX_HOME="$COMPONENT"
""")
--- a/src/Pure/Admin/build_fonts.scala Wed Nov 30 21:53:55 2022 +0100
+++ b/src/Pure/Admin/build_fonts.scala Wed Nov 30 22:07:59 2022 +0100
@@ -334,9 +334,7 @@
""" "$COMPONENT/""" + make_path(hinted = hinted).file_name + "/" + ttf.file_name + "\"")
.mkString(" \\\n")
- File.write(component_dir.settings,
- """# -*- shell-script -*- :mode=shellscript:
-
+ component_dir.write_settings("""
if grep "isabelle_fonts_hinted.*=.*false" "$ISABELLE_HOME_USER/etc/preferences" >/dev/null 2>/dev/null
then""" + make_settings() + """
else""" + make_settings(hinted = true) + """
--- a/src/Pure/Admin/build_jdk.scala Wed Nov 30 21:53:55 2022 +0100
+++ b/src/Pure/Admin/build_jdk.scala Wed Nov 30 22:07:59 2022 +0100
@@ -89,9 +89,7 @@
/* settings */
- File.write(component_dir.settings,
- """# -*- shell-script -*- :mode=shellscript:
-
+ component_dir.write_settings("""
case "$ISABELLE_PLATFORM_FAMILY" in
linux)
ISABELLE_JAVA_PLATFORM="$ISABELLE_PLATFORM64"
--- a/src/Pure/Admin/build_jedit.scala Wed Nov 30 21:53:55 2022 +0100
+++ b/src/Pure/Admin/build_jedit.scala Wed Nov 30 22:07:59 2022 +0100
@@ -469,9 +469,7 @@
/* settings */
- File.write(component_dir.settings,
- """# -*- shell-script -*- :mode=shellscript:
-
+ component_dir.write_settings("""
JEDIT_HOME="$COMPONENT/""" + jedit_patched + """"
JEDIT_JARS=""" + quote(File.read_dir(jars_dir).map("$JEDIT_HOME/jars/" + _).mkString(":")) + """
JEDIT_JAR="$JEDIT_HOME/jedit.jar"
--- a/src/Pure/Admin/build_lipics.scala Wed Nov 30 21:53:55 2022 +0100
+++ b/src/Pure/Admin/build_lipics.scala Wed Nov 30 22:07:59 2022 +0100
@@ -60,9 +60,7 @@
/* settings */
- File.write(component_dir.settings,
- """# -*- shell-script -*- :mode=shellscript:
-
+ component_dir.write_settings("""
ISABELLE_LIPICS_HOME="$COMPONENT/authors"
""")
--- a/src/Pure/Admin/build_llncs.scala Wed Nov 30 21:53:55 2022 +0100
+++ b/src/Pure/Admin/build_llncs.scala Wed Nov 30 22:07:59 2022 +0100
@@ -52,9 +52,7 @@
/* settings */
- File.write(component_dir.settings,
- """# -*- shell-script -*- :mode=shellscript:
-
+ component_dir.write_settings("""
ISABELLE_LLNCS_HOME="$COMPONENT"
""")
--- a/src/Pure/Admin/build_minisat.scala Wed Nov 30 21:53:55 2022 +0100
+++ b/src/Pure/Admin/build_minisat.scala Wed Nov 30 22:07:59 2022 +0100
@@ -89,9 +89,7 @@
/* settings */
- File.write(component_dir.settings,
- """# -*- shell-script -*- :mode=shellscript:
-
+ component_dir.write_settings("""
MINISAT_HOME="$COMPONENT/$ISABELLE_PLATFORM64"
ISABELLE_MINISAT="$MINISAT_HOME/minisat"
--- a/src/Pure/Admin/build_pdfjs.scala Wed Nov 30 21:53:55 2022 +0100
+++ b/src/Pure/Admin/build_pdfjs.scala Wed Nov 30 22:07:59 2022 +0100
@@ -44,9 +44,7 @@
/* settings */
- File.write(component_dir.settings,
- """# -*- shell-script -*- :mode=shellscript:
-
+ component_dir.write_settings("""
ISABELLE_PDFJS_HOME="$COMPONENT"
""")
--- a/src/Pure/Admin/build_postgresql.scala Wed Nov 30 21:53:55 2022 +0100
+++ b/src/Pure/Admin/build_postgresql.scala Wed Nov 30 22:07:59 2022 +0100
@@ -81,9 +81,7 @@
/* settings */
- File.write(component_dir.settings,
-"""# -*- shell-script -*- :mode=shellscript:
-
+ component_dir.write_settings("""
classpath "$COMPONENT/""" + download_name + """.jar"
""")
--- a/src/Pure/Admin/build_prismjs.scala Wed Nov 30 21:53:55 2022 +0100
+++ b/src/Pure/Admin/build_prismjs.scala Wed Nov 30 22:07:59 2022 +0100
@@ -46,9 +46,7 @@
/* settings */
- File.write(component_dir.settings,
- """# -*- shell-script -*- :mode=shellscript:
-
+ component_dir.write_settings("""
ISABELLE_PRISMJS_HOME="$COMPONENT"
""")
--- a/src/Pure/Admin/build_scala.scala Wed Nov 30 21:53:55 2022 +0100
+++ b/src/Pure/Admin/build_scala.scala Wed Nov 30 22:07:59 2022 +0100
@@ -108,9 +108,7 @@
/* settings */
- File.write(component_dir.settings,
- """# -*- shell-script -*- :mode=shellscript:
-
+ component_dir.write_settings("""
SCALA_HOME="$COMPONENT"
SCALA_INTERFACES="$SCALA_HOME/lib/""" + interfaces + """"
""" + terminate_lines(classpath.map(jar => "classpath \"$SCALA_HOME/lib/" + jar + "\"")))
--- a/src/Pure/Admin/build_spass.scala Wed Nov 30 21:53:55 2022 +0100
+++ b/src/Pure/Admin/build_spass.scala Wed Nov 30 22:07:59 2022 +0100
@@ -102,13 +102,12 @@
/* settings */
- File.write(component_dir.settings,
- """# -*- shell-script -*- :mode=shellscript:
-
+ component_dir.write_settings("""
SPASS_HOME="$COMPONENT/$ISABELLE_PLATFORM64"
SPASS_VERSION=""" + quote(version) + """
""")
+
/* README */
File.write(component_dir.README,
--- a/src/Pure/Admin/build_sqlite.scala Wed Nov 30 21:53:55 2022 +0100
+++ b/src/Pure/Admin/build_sqlite.scala Wed Nov 30 22:07:59 2022 +0100
@@ -41,9 +41,7 @@
/* settings */
- File.write(component_dir.settings,
-"""# -*- shell-script -*- :mode=shellscript:
-
+ component_dir.write_settings("""
ISABELLE_SQLITE_HOME="$COMPONENT"
classpath "$ISABELLE_SQLITE_HOME/lib/""" + download_name + """.jar"
--- a/src/Pure/Admin/build_vampire.scala Wed Nov 30 21:53:55 2022 +0100
+++ b/src/Pure/Admin/build_vampire.scala Wed Nov 30 22:07:59 2022 +0100
@@ -95,9 +95,7 @@
/* settings */
- File.write(component_dir.settings,
- """# -*- shell-script -*- :mode=shellscript:
-
+ component_dir.write_settings("""
VAMPIRE_HOME="$COMPONENT/$ISABELLE_PLATFORM64"
ISABELLE_VAMPIRE="$VAMPIRE_HOME/vampire"
--- a/src/Pure/Admin/build_verit.scala Wed Nov 30 21:53:55 2022 +0100
+++ b/src/Pure/Admin/build_verit.scala Wed Nov 30 22:07:59 2022 +0100
@@ -89,9 +89,7 @@
/* settings */
- File.write(component_dir.settings,
- """# -*- shell-script -*- :mode=shellscript:
-
+ component_dir.write_settings("""
ISABELLE_VERIT="$COMPONENT/${ISABELLE_WINDOWS_PLATFORM64:-$ISABELLE_PLATFORM64}/veriT"
""")
--- a/src/Pure/Admin/build_zipperposition.scala Wed Nov 30 21:53:55 2022 +0100
+++ b/src/Pure/Admin/build_zipperposition.scala Wed Nov 30 22:07:59 2022 +0100
@@ -68,9 +68,7 @@
/* settings */
- File.write(component_dir.settings,
- """# -*- shell-script -*- :mode=shellscript:
-
+ component_dir.write_settings("""
ZIPPERPOSITION_HOME="$COMPONENT/$ISABELLE_PLATFORM64"
""")
--- a/src/Pure/Admin/build_zstd.scala Wed Nov 30 21:53:55 2022 +0100
+++ b/src/Pure/Admin/build_zstd.scala Wed Nov 30 22:07:59 2022 +0100
@@ -68,9 +68,7 @@
/* settings */
- File.write(component_dir.settings,
-"""# -*- shell-script -*- :mode=shellscript:
-
+ component_dir.write_settings("""
ISABELLE_ZSTD_HOME="$COMPONENT"
classpath "$ISABELLE_ZSTD_HOME/""" + jar_name + """"
--- a/src/Pure/System/components.scala Wed Nov 30 21:53:55 2022 +0100
+++ b/src/Pure/System/components.scala Wed Nov 30 22:07:59 2022 +0100
@@ -131,6 +131,9 @@
split_lines(File.read(components)).filter(_.nonEmpty)
def write_components(lines: List[String]): Unit =
File.write(components, terminate_lines(lines))
+
+ def write_settings(text: String): Unit =
+ File.write(settings, "# -*- shell-script -*- :mode=shellscript:\n" + text)
}
--- a/src/Pure/Tools/dotnet_setup.scala Wed Nov 30 21:53:55 2022 +0100
+++ b/src/Pure/Tools/dotnet_setup.scala Wed Nov 30 22:07:59 2022 +0100
@@ -83,8 +83,7 @@
progress.echo("Component " + component_dir)
Isabelle_System.make_directory(component_dir.etc)
- File.write(component_dir.settings, """# -*- shell-script -*- :mode=shellscript:
-
+ component_dir.write_settings("""
ISABELLE_DOTNET_ROOT="$COMPONENT"
if [ -n "$ISABELLE_WINDOWS_PLATFORM64" -a -d "$ISABELLE_DOTNET_ROOT/$ISABELLE_WINDOWS_PLATFORM64" ]; then
--- a/src/Tools/VSCode/src/build_vscode_extension.scala Wed Nov 30 21:53:55 2022 +0100
+++ b/src/Tools/VSCode/src/build_vscode_extension.scala Wed Nov 30 22:07:59 2022 +0100
@@ -190,9 +190,7 @@
/* settings */
- File.write(component_dir.settings,
- """# -*- shell-script -*- :mode=shellscript:
-
+ component_dir.write_settings("""
ISABELLE_VSCODE_VSIX="$COMPONENT/""" + vsix_name + "\"\n")
--- a/src/Tools/VSCode/src/build_vscodium.scala Wed Nov 30 21:53:55 2022 +0100
+++ b/src/Tools/VSCode/src/build_vscodium.scala Wed Nov 30 22:07:59 2022 +0100
@@ -372,9 +372,7 @@
/* settings */
- File.write(component_dir.settings,
- """# -*- shell-script -*- :mode=shellscript:
-
+ component_dir.write_settings("""
ISABELLE_VSCODIUM_HOME="$COMPONENT/${ISABELLE_WINDOWS_PLATFORM64:-$ISABELLE_PLATFORM64}"
if [ "$ISABELLE_PLATFORM_FAMILY" = "macos" ]; then