prefer deterministic result;
authorwenzelm
Fri, 25 Nov 2022 10:49:46 +0100
changeset 76527 63f9ffa1625f
parent 76526 33025e13dcdc
child 76528 bf537a75e872
prefer deterministic result;
src/Pure/Admin/build_jcef.scala
src/Pure/Admin/build_jedit.scala
src/Pure/System/classpath.scala
--- a/src/Pure/Admin/build_jcef.scala	Thu Nov 24 14:22:43 2022 +0100
+++ b/src/Pure/Admin/build_jcef.scala	Fri Nov 25 10:49:46 2022 +0100
@@ -77,7 +77,7 @@
           val classpath =
             File.find_files(platform_dir.file, pred = file => File.is_jar(file.getName))
               .flatMap(file => File.relative_path(platform_dir, File.path(file)))
-              .map(jar => "        " + quote("$ISABELLE_JCEF_HOME/" + jar.implode))
+              .map(_.implode).sorted.map(jar => "        " + quote("$ISABELLE_JCEF_HOME/" + jar))
               .mkString(" \\\n")
 
           "    " + platform.platform_name + ")\n" +
--- a/src/Pure/Admin/build_jedit.scala	Thu Nov 24 14:22:43 2022 +0100
+++ b/src/Pure/Admin/build_jedit.scala	Fri Nov 25 10:49:46 2022 +0100
@@ -157,7 +157,7 @@
 
       progress.echo("Patching jEdit sources ...")
       for {
-        file <- File.find_files(Path.explode("~~/src/Tools/jEdit/patches").file).iterator
+        file <- File.find_files(Path.explode("~~/src/Tools/jEdit/patches").file).sortBy(_.getName)
         name = file.getName
         if !File.is_backup(name)
       } {
@@ -178,11 +178,11 @@
       Isabelle_System.copy_file(tmp_source_dir + Path.explode("build/jedit.jar"), jedit_patched_dir)
 
       val java_sources =
-        for {
+        (for {
           file <- File.find_files(org_source_dir.file, file => File.is_java(file.getName))
           package_name <- Scala_Project.package_name(File.path(file))
           if !exclude_package(package_name)
-        } yield File.path(component_path.java_path.relativize(file.toPath).toFile).implode
+        } yield File.path(component_path.java_path.relativize(file.toPath).toFile).implode).sorted
 
       File.write(component_dir.build_props,
         "module = " + jedit_patched + "/jedit.jar\n" +
--- a/src/Pure/System/classpath.scala	Thu Nov 24 14:22:43 2022 +0100
+++ b/src/Pure/System/classpath.scala	Fri Nov 25 10:49:46 2022 +0100
@@ -29,7 +29,8 @@
       } yield File.absolute(new JFile(s))
 
     val jar_files1 =
-      jar_files.flatMap(start => File.find_files(start, file => File.is_jar(file.getName)))
+      jar_files.flatMap(start =>
+          File.find_files(start, file => File.is_jar(file.getName)).sortBy(_.getName))
         .map(File.absolute)
 
     val tmp_jars =