io.directories.search.windows: merging with io.standard-paths.windows.

diff --git a/basis/io/directories/search/search.factor b/basis/io/directories/search/search.factor
index 98776a45aecc3688093e6314deae26a8696c660c..04f82f7344afc31c10b5879f9ae5437c291ea332 100644 (file)
--- a/basis/io/directories/search/search.factor
+++ b/basis/io/directories/search/search.factor
@@ -156,5 +156,3 @@ ERROR: sequence-expected obj ;
 
 : file-info-recursive ( path -- seq )
     [ dup ?file-info [ 2array ] [ drop f ] if* ] filter-files-by-depth ;
-
-os windows? [ "io.directories.search.windows" require ] when

diff --git a/basis/io/directories/search/windows/authors.txt b/basis/io/directories/search/windows/authors.txt
deleted file mode 100644 (file)
index 7c1b2f2..0000000
--- a/basis/io/directories/search/windows/authors.txt
+++ /dev/null
@@ -1 +0,0 @@
-Doug Coleman

diff --git a/basis/io/directories/search/windows/platforms.txt b/basis/io/directories/search/windows/platforms.txt
deleted file mode 100644 (file)
index 8e1a559..0000000
--- a/basis/io/directories/search/windows/platforms.txt
+++ /dev/null
@@ -1 +0,0 @@
-windows

diff --git a/basis/io/directories/search/windows/windows.factor b/basis/io/directories/search/windows/windows.factor
deleted file mode 100644 (file)
index cbd86ae..0000000
--- a/basis/io/directories/search/windows/windows.factor
+++ /dev/null
@@ -1,18 +0,0 @@
-! Copyright (C) 2008 Doug Coleman.
-! See http://factorcode.org/license.txt for BSD license.
-USING: arrays combinators.smart environment fry
-io.directories.search io.pathnames kernel sequences
-sets windows.shell32 ;
-IN: io.directories.search.windows
-
-: program-files-directories ( -- array )
-    [
-        program-files
-        program-files-x86
-        "ProgramW6432" os-env
-    ] output>array harvest members ; inline
-
-: find-in-program-files ( base-directory quot -- path )
-    t swap [
-        [ program-files-directories ] dip '[ _ append-path ] map
-    ] 2dip find-in-directories ; inline

diff --git a/basis/io/standard-paths/windows/windows.factor b/basis/io/standard-paths/windows/windows.factor
index b0870c22d2e9b92be28a2afa42b2a94f1690c0a7..fcd912687db664be26c6fd82b4bca7a2808aeb34 100644 (file)
--- a/basis/io/standard-paths/windows/windows.factor
+++ b/basis/io/standard-paths/windows/windows.factor
@@ -1,10 +1,22 @@
 ! Copyright (C) 2011 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: environment fry io.directories.search.windows io.files
-io.pathnames io.standard-paths kernel sequences splitting
-system unicode ;
+USING: arrays combinators.smart environment fry
+io.directories.search io.files io.pathnames io.standard-paths
+kernel sequences sets splitting system unicode windows.shell32 ;
 IN: io.standard-paths.windows
 
+: program-files-directories ( -- array )
+    [
+        program-files
+        program-files-x86
+        "ProgramW6432" os-env
+    ] output>array harvest members ; inline
+
+: find-in-program-files ( base-directory quot -- path )
+    t swap [
+        [ program-files-directories ] dip '[ _ append-path ] map
+    ] 2dip find-in-directories ; inline
+
 M: windows find-in-applications
     >lower
     '[ [ >lower _ tail? ] find-in-program-files ] map-find drop ;

diff --git a/extra/graphviz/render/windows/windows.factor b/extra/graphviz/render/windows/windows.factor
index 3933b9f247162b3e971639ae0e9f53dcfb09307d..d26d8c174abee06b279d6daf63dff319c58ef280 100644 (file)
--- a/extra/graphviz/render/windows/windows.factor
+++ b/extra/graphviz/render/windows/windows.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: accessors combinators.short-circuit graphviz.render
 graphviz.render.private io.directories
-io.directories.search.windows io.files.info io.standard-paths
+io.files.info io.standard-paths io.standard-paths.windows
 kernel sequences system ;
 IN: graphviz.render.windows