mason.release.dlls: change where it copies from

diff --git a/extra/mason/release/dlls/dlls.factor b/extra/mason/release/dlls/dlls.factor
index 8ce02be7a96b962ea15be255df7d93eefd3d0263..043dd009a070a021c22e29b52488feaa9689f901 100644 (file)
--- a/extra/mason/release/dlls/dlls.factor
+++ b/extra/mason/release/dlls/dlls.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2016 Doug Coleman.
 ! See https://factorcode.org/license.txt for BSD license.
-USING: io.directories kernel sequences system ;
+USING: io.directories io.pathnames kernel namespaces sequences system ;
 IN: mason.release.dlls
 
 HOOK: dll-list os ( -- seq )
@@ -10,19 +10,16 @@ M: object dll-list { } ;
 ! These files should be in the directory that mason is run from.
 ! e.g. c:\factor32 or c:\factor64 on the build machine.
 
-! Sqlite win64: https://synopse.info/files/SQLite3-64.7z
+INITIALIZED-SYMBOL: dll-root [ "resource:" ]
+
 M: windows dll-list
-    cpu x86.64 = {
-        "resource:libcrypto-3-x64.dll"
-        "resource:libssl-3-x64.dll"
-    } {
-        "resource:libcrypto-3.dll"
-        "resource:libssl-3.dll"
-    } ? {
-        "resource:sqlite3.dll"
-    } append ;
+    cpu x86.64 =
+    { "libcrypto-3-x64.dll" "libssl-3-x64.dll" }
+    { "libcrypto-3.dll" "libssl-3.dll" } ?
+    { "sqlite3.dll" } append ;
+
+: dll-paths ( -- seq )
+    dll-root get dll-list [ append-relative-path ] with map ;
 
 : copy-dlls ( -- )
-    dll-list [
-        "factor" copy-files-into
-    ] unless-empty ;
+    dll-paths [ "factor" copy-files-into ] unless-empty ;