]> gitweb.factorcode.org Git - factor.git/commitdiff
Revert "mason.release.dlls: move symbol to mason.config"
authorJohn Benediktsson <mrjbq7@gmail.com>
Wed, 23 Aug 2023 04:09:44 +0000 (21:09 -0700)
committerJohn Benediktsson <mrjbq7@gmail.com>
Wed, 23 Aug 2023 04:09:44 +0000 (21:09 -0700)
This reverts commit bbf66e761df80fee971ba051425bc27b77b12857.

extra/mason/config/config.factor
extra/mason/release/dlls/dlls.factor

index 69386483b755df08fa9d39941153ec50a488147f..528fd1597a8f62b031caa91f3a170a49271dada1 100644 (file)
@@ -112,7 +112,3 @@ ssh-command [ "ssh" ] initialize
 
 ! Notary command-line arguments
 SYMBOL: notary-args
-
-! Location of DLLs to copy
-SYMBOL: dll-root
-dll-root [ "resource:" ] initialize
index bc2a29938c1029c6d7514fb5882bc7b0bfd8582f..043dd009a070a021c22e29b52488feaa9689f901 100644 (file)
@@ -1,8 +1,6 @@
 ! Copyright (C) 2016 Doug Coleman.
 ! See https://factorcode.org/license.txt for BSD license.
-USING: io.directories io.pathnames kernel mason.config
-namespaces sequences system ;
-
+USING: io.directories io.pathnames kernel namespaces sequences system ;
 IN: mason.release.dlls
 
 HOOK: dll-list os ( -- seq )
@@ -12,6 +10,8 @@ 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.
 
+INITIALIZED-SYMBOL: dll-root [ "resource:" ]
+
 M: windows dll-list
     cpu x86.64 =
     { "libcrypto-3-x64.dll" "libssl-3-x64.dll" }