# HG changeset patch # User wenzelm # Date 1734372554 -3600 # Node ID f48597f265ffd35c9273a52dd4180f3de733466c # Parent 5995afcacbc363076ea946d614d0ddd65bfda4d9 update to xz-java-1.10; diff -r 5995afcacbc3 -r f48597f265ff Admin/components/components.sha1 --- a/Admin/components/components.sha1 Mon Dec 16 13:55:26 2024 +0100 +++ b/Admin/components/components.sha1 Mon Dec 16 19:09:14 2024 +0100 @@ -578,6 +578,7 @@ 4883f93efb27ae51fb2cc0e1f52309728f2dc407 windows_app-20240202.tar.gz 5269b9e38fe58be10272d6817dbfd08b67b312e7 windows_app-20240204.tar.gz 94fecdab25ddc52b5afde4ab3f017a3c14c656c8 windows_app-20240205.tar.gz +76ff3ea91d3c781507e6998d9e819ae3564cf495 xz-java-1.10.tar.gz 1c36a840320dfa9bac8af25fc289a4df5ea3eccb xz-java-1.2-1.tar.gz 2ae13aa17d0dc95ce254a52f1dba10929763a10d xz-java-1.2.tar.gz c22196148fcace5443a933238216cff5112948df xz-java-1.5.tar.gz diff -r 5995afcacbc3 -r f48597f265ff Admin/components/main --- a/Admin/components/main Mon Dec 16 13:55:26 2024 +0100 +++ b/Admin/components/main Mon Dec 16 19:09:14 2024 +0100 @@ -39,7 +39,7 @@ verit-2021.06.2-rmx-1 vscode_extension-20241002 vscodium-1.70.1 -xz-java-1.9 +xz-java-1.10 z3-4.4.0pre-4 zipperposition-2.1-1 zstd-jni-1.5.6-8 diff -r 5995afcacbc3 -r f48597f265ff etc/build.props --- a/etc/build.props Mon Dec 16 13:55:26 2024 +0100 +++ b/etc/build.props Mon Dec 16 19:09:14 2024 +0100 @@ -47,6 +47,7 @@ src/Pure/Admin/component_vampire.scala \ src/Pure/Admin/component_verit.scala \ src/Pure/Admin/component_windows_app.scala \ + src/Pure/Admin/component_xz.scala \ src/Pure/Admin/component_zipperposition.scala \ src/Pure/Admin/component_zstd.scala \ src/Pure/Admin/isabelle_cronjob.scala \ diff -r 5995afcacbc3 -r f48597f265ff src/Pure/Admin/component_xz.scala --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/Pure/Admin/component_xz.scala Mon Dec 16 19:09:14 2024 +0100 @@ -0,0 +1,97 @@ +/* Title: Pure/Admin/component_xz.scala + Author: Makarius + +Build Isabelle xz-java component from official download. +*/ + +package isabelle + + +object Component_XZ { + /* build xz */ + + val main_url = "https://tukaani.org/xz/java.html" + val default_source_url = "https://github.com/tukaani-project/xz-java/releases/download" + val default_download_url = "https://repo1.maven.org/maven2/org/tukaani/xz" + val default_version = "1.10" + + def build_xz( + target_dir: Path = Path.current, + source_url: String = default_source_url, + download_url: String = default_download_url, + version: String = default_version, + progress: Progress = new Progress, + ): Unit = { + /* component */ + + val component_name = "xz-java-" + version + val component_dir = + Components.Directory(target_dir + Path.basic(component_name)).create(progress = progress) + + File.write(component_dir.README, + "This is " + component_name + " from " + main_url + + "\n\n Makarius\n " + Date.Format.date(Date.now()) + "\n") + + Isabelle_System.with_tmp_file("tmp", ext = "zip") { tmp => + Isabelle_System.download_file( + source_url + "/v" + version + "/xz-java-" + version + ".zip", tmp, progress = progress) + Isabelle_System.extract(tmp, component_dir.path) + } + + + /* lib */ + + val jar_name = "xz-" + version + ".jar" + + Isabelle_System.make_directory(component_dir.lib) + Isabelle_System.download_file( + download_url + "/" + version + "/" + jar_name, + component_dir.lib + Path.basic(jar_name), progress = progress) + + + /* settings */ + + component_dir.write_settings(""" +ISABELLE_XZ_HOME="$COMPONENT" + +classpath "$ISABELLE_XZ_HOME/lib/""" + jar_name + """" +""") + } + + + /* Isabelle tool wrapper */ + + val isabelle_tool = + Isabelle_Tool("component_xz", "build Isabelle xz-java component from official download", + Scala_Project.here, + { args => + var target_dir = Path.current + var source_url = default_source_url + var download_url = default_download_url + var version = default_version + + val getopts = Getopts(""" +Usage: isabelle component_xz [OPTIONS] + + Options are: + -D DIR target directory (default ".") + -S URL source URL (default: """ + quote(default_source_url) + """) + -U URL download URL (default: """ + quote(default_download_url) + """) + -V VERSION version (default: """ + quote(default_version) + """) + + Build zxz-java component from the specified download base URL and VERSION, + see also """ + main_url + "\n", + "D:" -> (arg => target_dir = Path.explode(arg)), + "S:" -> (arg => source_url = arg), + "U:" -> (arg => download_url = arg), + "V:" -> (arg => version = arg)) + + val more_args = getopts(args) + if (more_args.nonEmpty) getopts.usage() + + val progress = new Console_Progress() + + build_xz(target_dir = target_dir, source_url = source_url, + download_url = download_url, version = version, progress = progress) + }) +} diff -r 5995afcacbc3 -r f48597f265ff src/Pure/System/isabelle_tool.scala --- a/src/Pure/System/isabelle_tool.scala Mon Dec 16 13:55:26 2024 +0100 +++ b/src/Pure/System/isabelle_tool.scala Mon Dec 16 19:09:14 2024 +0100 @@ -201,6 +201,7 @@ Component_Vampire.isabelle_tool, Component_VeriT.isabelle_tool, Component_Windows_App.isabelle_tool, + Component_XZ.isabelle_tool, Component_Zipperposition.isabelle_tool, Component_Zstd.isabelle_tool, Components.isabelle_tool,