--- a/src/Pure/Admin/build_csdp.scala Wed Nov 30 15:03:31 2022 +0100
+++ b/src/Pure/Admin/build_csdp.scala Wed Nov 30 15:14:21 2022 +0100
@@ -98,8 +98,7 @@
Isabelle_System.extract(archive_path, tmp_dir)
val source_dir = File.get_dir(tmp_dir, title = download_url)
- Isabelle_System.extract(archive_path, component_dir.path)
- Isabelle_System.move_file(component_dir.path + source_dir.base, component_dir.src)
+ Isabelle_System.extract(archive_path, component_dir.src, strip = true)
/* build */
--- a/src/Pure/Admin/build_e.scala Wed Nov 30 15:03:31 2022 +0100
+++ b/src/Pure/Admin/build_e.scala Wed Nov 30 15:14:21 2022 +0100
@@ -44,8 +44,7 @@
Isabelle_System.extract(archive_path, tmp_dir)
val source_dir = File.get_dir(tmp_dir, title = archive_url)
- Isabelle_System.extract(archive_path, component_dir.path)
- Isabelle_System.move_file(component_dir.path + source_dir.base, component_dir.src)
+ Isabelle_System.extract(archive_path, component_dir.src, strip = true)
/* build */
--- a/src/Pure/Admin/build_jdk.scala Wed Nov 30 15:03:31 2022 +0100
+++ b/src/Pure/Admin/build_jdk.scala Wed Nov 30 15:14:21 2022 +0100
@@ -61,11 +61,9 @@
val name = Library.take_suffix(_ != '/', url.toList)._2.mkString
val file = dir + Path.basic(name)
Isabelle_System.download_file(url, file, progress = progress)
- Isabelle_System.extract(file, dir)
- val jdk_dir = File.get_dir(dir, title = url)
val platform_dir = component_dir.path + Path.basic(platform.name)
- Isabelle_System.move_file(jdk_dir, platform_dir)
+ Isabelle_System.extract(file, platform_dir, strip = true)
}
}
--- a/src/Pure/Admin/build_minisat.scala Wed Nov 30 15:03:31 2022 +0100
+++ b/src/Pure/Admin/build_minisat.scala Wed Nov 30 15:14:21 2022 +0100
@@ -63,8 +63,7 @@
Isabelle_System.extract(archive_path, tmp_dir)
val source_dir = File.get_dir(tmp_dir, title = download_url)
- Isabelle_System.extract(archive_path, component_dir.path)
- Isabelle_System.move_file(component_dir.path + source_dir.base, component_dir.src)
+ Isabelle_System.extract(archive_path, component_dir.src, strip = true)
/* build */
--- a/src/Pure/Admin/build_spass.scala Wed Nov 30 15:03:31 2022 +0100
+++ b/src/Pure/Admin/build_spass.scala Wed Nov 30 15:14:21 2022 +0100
@@ -70,8 +70,7 @@
Isabelle_System.extract(archive_path, tmp_dir)
val source_dir = File.get_dir(tmp_dir, title = download_url)
- Isabelle_System.extract(archive_path, component_dir.path)
- Isabelle_System.move_file(component_dir.path + source_dir.base, component_dir.src)
+ Isabelle_System.extract(archive_path, component_dir.src, strip = true)
/* build */
--- a/src/Pure/Admin/build_vampire.scala Wed Nov 30 15:03:31 2022 +0100
+++ b/src/Pure/Admin/build_vampire.scala Wed Nov 30 15:14:21 2022 +0100
@@ -68,8 +68,7 @@
Isabelle_System.extract(archive_path, tmp_dir)
val source_dir = File.get_dir(tmp_dir, title = download_url)
- Isabelle_System.extract(archive_path, component_dir.path)
- Isabelle_System.move_file(component_dir.path + source_dir.base, component_dir.src)
+ Isabelle_System.extract(archive_path, component_dir.src, strip = true)
/* build */
--- a/src/Pure/Admin/build_verit.scala Wed Nov 30 15:03:31 2022 +0100
+++ b/src/Pure/Admin/build_verit.scala Wed Nov 30 15:14:21 2022 +0100
@@ -64,8 +64,7 @@
Isabelle_System.extract(archive_path, tmp_dir)
val source_dir = File.get_dir(tmp_dir, title = download_url)
- Isabelle_System.extract(archive_path, component_dir.path)
- Isabelle_System.move_file(component_dir.path + source_dir.base, component_dir.src)
+ Isabelle_System.extract(archive_path, component_dir.src, strip = true)
/* build */
--- a/src/Pure/System/isabelle_system.scala Wed Nov 30 15:03:31 2022 +0100
+++ b/src/Pure/System/isabelle_system.scala Wed Nov 30 15:14:21 2022 +0100
@@ -435,6 +435,7 @@
def extract(archive: Path, dir: Path, strip: Boolean = false): Unit = {
val name = archive.file_name
+ make_directory(dir)
if (File.is_zip(name)) {
require(!strip, "Cannot use unzip with strip")
Isabelle_System.bash("unzip -x " + File.bash_path(archive.absolute), cwd = dir.file).check