more robust shasum: proper relative file names;
authorwenzelm
Sun, 23 Feb 2025 15:48:08 +0100
changeset 82224 979b63c3b4c1
parent 82223 706562be40fc
child 82225 d3b401fe8188
more robust shasum: proper relative file names; rebuild find_facts_web-20250223;
Admin/components/components.sha1
Admin/components/main
src/Tools/Find_Facts/src/elm.scala
--- a/Admin/components/components.sha1	Sun Feb 23 15:40:44 2025 +0100
+++ b/Admin/components/components.sha1	Sun Feb 23 15:48:08 2025 +0100
@@ -114,6 +114,7 @@
 ae7ee5becb26512f18c609e83b34612918bae5f0 exec_process-1.0.tar.gz
 a7dffe7ab28c0627ef5957ef521ded2db9022b37 find_facts_web-20250208.tar.gz
 2e391c5bfe1dede4c0f9b3b2af6e7227c6e425f4 find_facts_web-20250215.tar.gz
+b814ec6f0b0de509bab09fe802c40b1a19b1e578 find_facts_web-20250223.tar.gz
 7a4b46752aa60c1ee6c53a2c128dedc8255a4568 flatlaf-0.46-1.tar.gz
 ed5cbc216389b655dac21a19e770a02a96867b85 flatlaf-0.46.tar.gz
 d37b38b9a27a6541c644e22eeebe9a339282173d flatlaf-1.0-rc1.tar.gz
--- a/Admin/components/main	Sun Feb 23 15:40:44 2025 +0100
+++ b/Admin/components/main	Sun Feb 23 15:48:08 2025 +0100
@@ -8,7 +8,7 @@
 elm-0.19.1
 easychair-3.5
 eptcs-1.7.0
-find_facts_web-20250215
+find_facts_web-20250223
 flatlaf-3.5.4-1
 foiltex-2.1.4b
 idea-icons-20210508
--- a/src/Tools/Find_Facts/src/elm.scala	Sun Feb 23 15:40:44 2025 +0100
+++ b/src/Tools/Find_Facts/src/elm.scala	Sun Feb 23 15:48:08 2025 +0100
@@ -53,18 +53,19 @@
       JSON.strings(definition, "source-directories").getOrElse(
         error("Missing source directories in elm.json"))
 
-    def sources: List[JFile] =
+    def sources: List[Path] =
       for {
         src_dir <- src_dirs
         path = dir + Path.explode(src_dir)
         file <- File.find_files(path.file, _.getName.endsWith(".elm"))
-      } yield file
+        rel_path <- File.relative_path(dir, File.path(file))
+      } yield rel_path
 
     def sources_shasum: SHA1.Shasum = {
       val meta_info = SHA1.shasum_meta_info(SHA1.digest(JSON.Format(definition)))
       val head_digest = SHA1.shasum(SHA1.digest(XML.string_of_body(head)), "head")
       val source_digest =
-        SHA1.shasum_sorted(for (file <- sources) yield SHA1.digest(file) -> file.getCanonicalPath)
+        SHA1.shasum_sorted(for (src <- sources) yield SHA1.digest(dir + src) -> src.implode)
       meta_info ::: head_digest ::: source_digest
     }