From b1a9ba88068f68434d0a210f8872618c05fbe341 Mon Sep 17 00:00:00 2001
From: Eduardo Cavazos <dharmatech@finkelstein.stackeffects.info>
Date: Sat, 1 Mar 2008 03:01:51 -0600
Subject: [PATCH] builder.release: refactor and cleanup

---
 extra/builder/release/release.factor | 95 +++++++++++-----------------
 1 file changed, 37 insertions(+), 58 deletions(-)

diff --git a/extra/builder/release/release.factor b/extra/builder/release/release.factor
index c65241d922..849d1a54a3 100644
--- a/extra/builder/release/release.factor
+++ b/extra/builder/release/release.factor
@@ -1,12 +1,17 @@
 
-USING: kernel namespaces sequences combinators io.files io.launcher
+USING: kernel system namespaces sequences splitting combinators
+       io.files io.launcher
        bake combinators.cleave builder.common builder.util ;
 
 IN: builder.release
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-: releases ( -- path ) builds "/releases" append dup make-directory ;
+: releases ( -- path )
+  builds "releases" path+
+  dup exists? not
+    [ dup make-directory ]
+  when ;
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
@@ -34,8 +39,6 @@ IN: builder.release
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-USING: system sequences splitting ;
-
 : cpu- ( -- cpu ) cpu "." split "-" join ;
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -57,70 +60,46 @@ USING: system sequences splitting ;
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-: move-file ( source destination -- )
-  swap { "mv" , , } bake run-process drop ;
-
-! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
-: linux-release ( -- )
-
-  "factor" cd
-
-  { "rm" "-rf" "Factor.app" } run-process drop
-
-  { "rm" "-rf" common-files } to-strings run-process drop
-
-  ".." cd
-
-  { "tar" "-cvzf" archive-name "factor" } to-strings run-process drop
-
-  archive-name releases move-file ;
-
-! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
-: windows-release ( -- )
-
-  "factor" cd
-
-  { "rm" "-rf" "Factor.app" } run-process drop
-
-  { "rm" "-rf" common-files } to-strings run-process drop
-
-  ".." cd
-
-  { "zip" "-r" archive-name "factor" } to-strings run-process drop
-
-  archive-name releases move-file ;
-
-! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
-: macosx-release ( -- )
-
-  "factor" cd
-
-  { "rm" "-rf" common-files } to-strings run-process drop
-
-  ".." cd
+: windows-archive-cmd ( -- cmd ) { "zip" "-r" archive-name "factor" } ;
 
+: macosx-archive-cmd ( -- cmd )
   { "hdiutil" "create"
               "-srcfolder" "factor"
               "-fs" "HFS+"
               "-volname" "factor"
-              archive-name }
-  to-strings run-process drop
+              archive-name } ;
 
-  archive-name releases move-file ;
+: unix-archive-cmd ( -- cmd ) { "tar" "-cvzf" archive-name "factor" } ;
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
+: archive-cmd ( -- cmd )
+  {
+    { [ windows? ] [ windows-archive-cmd ] }
+    { [ macosx?  ] [ macosx-archive-cmd  ] }
+    { [ unix?    ] [ unix-archive-cmd    ] }
+  }
+  cond ;
+
+: make-archive ( -- ) archive-cmd to-strings try-process ;
+
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+: remove-common-files ( -- )
+  { "rm" "-rf" common-files } to-strings try-process ;
+
+: remove-factor-app ( -- )
+  macosx? not [ { "rm" "-rf" "Factor.app" } try-process ] when ;
+
 : release ( -- )
-  os
-    {
-      { "linux"  [ linux-release   ] }
-      { "winnt"  [ windows-release ] }
-      { "macosx" [ macosx-release  ] }
-    }
-  case ;
+  "factor"
+    [
+      remove-factor-app
+      remove-common-files
+    ]
+  with-directory
+  make-archive
+  archive-name releases move-file-into ;
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!