Remove really-delete-tree in favor of setting the file attributes to normal

on Windows deletes.

diff --git a/extra/mason/cleanup/cleanup.factor b/extra/mason/cleanup/cleanup.factor
index fb8e2e893a1f339e0872692593f48582458b3006..6dd9e4c5e39569d2755c31ac74c24820d8dd0736 100644 (file)
--- a/extra/mason/cleanup/cleanup.factor
+++ b/extra/mason/cleanup/cleanup.factor
@@ -19,6 +19,6 @@ IN: mason.cleanup
         build-dir [
             compress-image
             compress-test-log
-            "factor" really-delete-tree
+            "factor" delete-tree
         ] with-directory
     ] unless ;

diff --git a/extra/mason/common/common.factor b/extra/mason/common/common.factor
index 8599c4e1d39b783e3f526c79f07b66dce6faacc4..2a2d0ef98dcc9dfff2469e474d96359f7175b37a 100644 (file)
--- a/extra/mason/common/common.factor
+++ b/extra/mason/common/common.factor
@@ -23,20 +23,6 @@ SYMBOL: current-git-id
     #! 30 minutes to complete, to catch hangs.
     >process 30 minutes >>timeout try-output-process ;
 
-HOOK: (really-delete-tree) os ( path -- )
-
-M: windows (really-delete-tree)
-    #! Workaround: Cygwin GIT creates read-only files for
-    #! some reason.
-    [ { "chmod" "ug+rw" "-R" } swap absolute-path suffix short-running-process ]
-    [ delete-tree ]
-    bi ;
-
-M: unix (really-delete-tree) delete-tree ;
-
-: really-delete-tree ( path -- )
-    dup exists? [ (really-delete-tree) ] [ drop ] if ;
-
 : retry ( n quot -- )
     [ iota ] dip
     '[ drop @ f ] attempt-all drop ; inline

diff --git a/extra/mason/git/git.factor b/extra/mason/git/git.factor
index 9740a6ebe521a2d4b1db371d79d3c1873cb15c43..9aeeda82682ee1640299add45ef804ae48c69849 100644 (file)
--- a/extra/mason/git/git.factor
+++ b/extra/mason/git/git.factor
@@ -3,7 +3,7 @@
 USING: accessors combinators.short-circuit continuations
 debugger io io.directories io.encodings.utf8 io.files
 io.launcher io.sockets io.streams.string kernel mason.common
-mason.email sequences splitting ;
+mason.email sequences splitting io.directories.hierarchy ;
 IN: mason.git
 
 : git-id ( -- id )
@@ -42,7 +42,7 @@ IN: mason.git
 
 : git-repo-corrupted ( error -- )
     repo-corrupted-body "corrupted repo" email-fatal
-    "factor" really-delete-tree
+    "factor" delete-tree
     git-clone ;
 
 : git-pull-failed ( error -- )
@@ -84,7 +84,7 @@ IN: mason.git
 
 : git-repo-dirty ( files -- )
     repo-dirty-body "dirty repo" email-fatal
-    "factor" really-delete-tree
+    "factor" delete-tree
     git-clone ;
 
 PRIVATE>

diff --git a/extra/mason/release/archive/archive.factor b/extra/mason/release/archive/archive.factor
index d79ae8c8334060e1d50f7d1e2404fc6d35f251a5..a58d21f544eedf9030849f146cc5dc839ebe4219 100644 (file)
--- a/extra/mason/release/archive/archive.factor
+++ b/extra/mason/release/archive/archive.factor
@@ -28,7 +28,7 @@ IN: mason.release.archive
     "dmg-root" make-directory
     "factor" "dmg-root" copy-tree-into
     "factor" "dmg-root" make-disk-image
-    "dmg-root" really-delete-tree ;
+    "dmg-root" delete-tree ;
 
 :: make-unix-archive ( archive-name -- )
     { "tar" "-cvzf" archive-name "factor" } short-running-process ;

diff --git a/extra/mason/release/tidy/tidy.factor b/extra/mason/release/tidy/tidy.factor
index cf82c43d06c7d487fae507c04c9a73cfeb79caf1..29f01d7d92a7181d770e099cb4e86966b6405b8d 100644 (file)
--- a/extra/mason/release/tidy/tidy.factor
+++ b/extra/mason/release/tidy/tidy.factor
@@ -15,5 +15,5 @@ IN: mason.release.tidy
     "factor" [
         useless-files
         [ exists? ] filter
-        [ really-delete-tree ] each
+        [ delete-tree ] each
     ] with-directory ;