vocabs.metadata: moving os-specific paths to tools.deploy.

diff --git a/basis/tools/deploy/macosx/macosx.factor b/basis/tools/deploy/macosx/macosx.factor
index 2dcf465ef099b35fc2f358f2fb5fc698562458ba..402986cf286c0c1e61b3ae8f61372f76548e5398 100644 (file)
--- a/basis/tools/deploy/macosx/macosx.factor
+++ b/basis/tools/deploy/macosx/macosx.factor
@@ -45,6 +45,9 @@ IN: tools.deploy.macosx
         "Contents/Resources/English.lproj/MiniFactor.nib" copy-bundle-dir
     ] [ drop ] if ;
 
+: vocab-mac-icon-path ( vocab -- string )
+    vocab-dir "icon.icns" append-path ;
+
 : copy-icns ( vocab bundle-name -- icon? )
     swap dup vocab-mac-icon-path vocab-append-path dup exists?
     [ swap "Contents/Resources/Icon.icns" append-path copy-file t ]

diff --git a/basis/tools/deploy/windows/windows.factor b/basis/tools/deploy/windows/windows.factor
index 24f353e1b3d33e6558ae4064a8c54b3b115f54c6..cf2d6be968c3f5b95245e2d4f00b6b5351536efc 100755 (executable)
--- a/basis/tools/deploy/windows/windows.factor
+++ b/basis/tools/deploy/windows/windows.factor
@@ -25,6 +25,9 @@ CONSTANT: app-icon-resource-id "APPICON"
 : ?open-in-explorer ( dir -- )
     open-directory-after-deploy? get [ open-in-explorer ] [ drop ] if ;
 
+: vocab-windows-icon-path ( vocab -- string )
+    vocab-dir "icon.ico" append-path ;
+
 : embed-ico ( vm-path vocab -- )
     dup vocab-windows-icon-path vocab-append-path dup exists?
     [ binary file-contents app-icon-resource-id embed-icon-resource ]

diff --git a/basis/vocabs/metadata/metadata.factor b/basis/vocabs/metadata/metadata.factor
index f6aa934145c05eb87a4ec2c8a79504c5a42fcce5..e2bef1f726e96991a4f0b364d890bd367700daf3 100644 (file)
--- a/basis/vocabs/metadata/metadata.factor
+++ b/basis/vocabs/metadata/metadata.factor
@@ -20,12 +20,6 @@ MEMO: vocab-file-contents ( vocab name -- seq )
         \ vocab-file-contents reset-memoized
     ] [ vocab-name no-vocab ] ?if ;
 
-: vocab-windows-icon-path ( vocab -- string )
-    vocab-dir "icon.ico" append-path ;
-
-: vocab-mac-icon-path ( vocab -- string )
-    vocab-dir "icon.icns" append-path ;
-
 : vocab-resources-path ( vocab -- string )
     vocab-dir "resources.txt" append-path ;