# HG changeset patch # User wenzelm # Date 1757243794 -7200 # Node ID 917ad72422a6e0a8a7ad0642f5c0fd8b707cb310 # Parent e0ebbdd1ad36db5f99d57a408ab3e8592acba80a clarified signature: more explicit packages; diff -r e0ebbdd1ad36 -r 917ad72422a6 src/Tools/VSCode/src/component_vscode_extension.scala --- a/src/Tools/VSCode/src/component_vscode_extension.scala Sat Sep 06 22:20:02 2025 +0200 +++ b/src/Tools/VSCode/src/component_vscode_extension.scala Sun Sep 07 13:16:34 2025 +0200 @@ -199,7 +199,7 @@ val vsix_name = Isabelle_System.with_tmp_dir("build") { build_dir => val node_context = Component_VSCodium.Node_Context() - val node_dir = node_context.setup(build_dir, progress = progress, packages = List("vsce")) + val node_dir = node_context.setup(build_dir, List("yarn", "vsce"), progress = progress) val manifest_text = File.read(VSCode_Main.extension_dir + VSCode_Main.MANIFEST) val manifest_entries = split_lines(manifest_text).filter(_.nonEmpty) diff -r e0ebbdd1ad36 -r 917ad72422a6 src/Tools/VSCode/src/component_vscodium.scala --- a/src/Tools/VSCode/src/component_vscodium.scala Sat Sep 06 22:20:02 2025 +0200 +++ b/src/Tools/VSCode/src/component_vscodium.scala Sun Sep 07 13:16:34 2025 +0200 @@ -38,11 +38,7 @@ def download_url: String = "https://nodejs.org/dist/v" + version + "/" + full_name + "." + download_ext - def setup( - base_dir: Path, - progress: Progress = new Progress, - packages: List[String] = Nil - ): Path = { + def setup(base_dir: Path, packages: List[String], progress: Progress = new Progress): Path = { Isabelle_System.with_tmp_file("node", ext = download_ext) { archive => progress.echo("Getting Node.js ...") Isabelle_System.download_file(download_url, archive) @@ -51,7 +47,7 @@ Isabelle_System.extract(archive, base_dir) val node_dir = base_dir + Path.basic(full_name) - for (name <- "yarn" :: packages) { + for (name <- packages) { progress.echo("Installing " + name + " ...") Isabelle_System.bash( path_setup(node_dir) + "\nnpm install -g " + Bash.string(name), @@ -312,7 +308,7 @@ val vscode_dir = build_dir + Path.explode("vscode") val node_context = build_context.node_context - val node_dir = node_context.setup(build_dir, progress = progress) + val node_dir = node_context.setup(build_dir, List("yarn"), progress = progress) progress.echo("Preparing VSCode ...") Isabelle_System.with_copy_dir(vscode_dir, vscode_dir.orig) { @@ -377,7 +373,7 @@ val sources_patch = build_context.patch_sources(build_dir, progress = progress) write_patch("02-isabelle_sources", sources_patch) - val node_dir = node_context.setup(build_dir, progress = progress) + val node_dir = node_context.setup(build_dir, List("yarn"), progress = progress) progress.echo("Building VSCodium ...") val environment = build_context.environment(build_dir)