From 0426ca274dea4d1b215e654a58e1d01aeecdf162 Mon Sep 17 00:00:00 2001
From: James Cash <james.nvc@gmail.com>
Date: Fri, 11 Apr 2008 22:35:58 -0400
Subject: [PATCH] Refactoring common functions out of platform-specific
 deployment

---
 extra/tools/deploy/backend/backend.factor |  9 +++++++++
 extra/tools/deploy/linux/linux.factor     | 14 ++------------
 extra/tools/deploy/macosx/macosx.factor   | 11 ++---------
 extra/tools/deploy/windows/windows.factor | 11 ++---------
 4 files changed, 15 insertions(+), 30 deletions(-)

diff --git a/extra/tools/deploy/backend/backend.factor b/extra/tools/deploy/backend/backend.factor
index b838654248..ee904105be 100755
--- a/extra/tools/deploy/backend/backend.factor
+++ b/extra/tools/deploy/backend/backend.factor
@@ -105,5 +105,14 @@ DEFER: ?make-staging-image
 : make-deploy-image ( vm image vocab config -- )
     make-boot-image
     deploy-command-line run-factor ;
+    
+: copy-vm ( executable bundle-name extension -- vm )
+  [ prepend-path ] dip append vm over copy-file ;
+  
+: copy-fonts ( name dir -- )  
+  "fonts/" resource-path swap append-path copy-tree-into ;
+  
+: image-name ( vocab bundle-name -- str )  
+  prepend-path ".image" append ;
 
 HOOK: deploy* os ( vocab -- )
diff --git a/extra/tools/deploy/linux/linux.factor b/extra/tools/deploy/linux/linux.factor
index 05cb0cddc1..a995d66cd8 100644
--- a/extra/tools/deploy/linux/linux.factor
+++ b/extra/tools/deploy/linux/linux.factor
@@ -4,20 +4,10 @@ USING: io io.files io.backend kernel namespaces sequences
 system tools.deploy.backend tools.deploy.config assocs
 hashtables prettyprint ;
 IN: tools.deploy.linux
-
-: copy-vm ( executable bundle-name -- vm )
-  prepend-path "" append
-  vm over copy-file ;
-  
-: copy-fonts ( name -- )  
-  "fonts/" resource-path swap copy-tree-into ;
   
 : create-app-dir ( vocab bundle-name -- vm )  
-  dup copy-fonts
-  copy-vm ;
-  
-: image-name ( vocab bundle-name -- str )  
-  prepend-path ".image" append ;
+  dup "" copy-fonts
+  "" copy-vm ;
   
 : bundle-name ( -- str )  
   deploy-name get ;
diff --git a/extra/tools/deploy/macosx/macosx.factor b/extra/tools/deploy/macosx/macosx.factor
index 3121866d94..ca710e9d28 100755
--- a/extra/tools/deploy/macosx/macosx.factor
+++ b/extra/tools/deploy/macosx/macosx.factor
@@ -14,13 +14,6 @@ IN: tools.deploy.macosx
     bundle-dir over append-path -rot
     "Contents" prepend-path append-path copy-tree ;
 
-: copy-vm ( executable bundle-name -- vm )
-    "Contents/MacOS/" append-path prepend-path vm over copy-file ;
-
-: copy-fonts ( name -- )
-    "fonts/" resource-path
-    swap "Contents/Resources/" append-path copy-tree-into ;
-
 : app-plist ( executable bundle-name -- assoc )
     [
         "6.0" "CFBundleInfoDictionaryVersion" set
@@ -40,8 +33,8 @@ IN: tools.deploy.macosx
 : create-app-dir ( vocab bundle-name -- vm )
     dup "Frameworks" copy-bundle-dir
     dup "Resources/English.lproj/MiniFactor.nib" copy-bundle-dir
-    dup copy-fonts
-    2dup create-app-plist copy-vm ;
+    dup "Contents/Resources/" copy-fonts
+    2dup create-app-plist "Contents/MacOS/" append-path "" copy-vm ;
 
 : deploy.app-image ( vocab bundle-name -- str )
     [ % "/Contents/Resources/" % % ".image" % ] "" make ;
diff --git a/extra/tools/deploy/windows/windows.factor b/extra/tools/deploy/windows/windows.factor
index 68b106663c..5fc3e92c2b 100755
--- a/extra/tools/deploy/windows/windows.factor
+++ b/extra/tools/deploy/windows/windows.factor
@@ -5,13 +5,6 @@ tools.deploy.backend tools.deploy.config assocs hashtables
 prettyprint windows.shell32 windows.user32 ;
 IN: tools.deploy.windows
 
-: copy-vm ( executable bundle-name -- vm )
-    prepend-path ".exe" append
-    vm over copy-file ;
-
-: copy-fonts ( bundle-name -- )
-    "fonts/" resource-path swap copy-tree-into ;
-
 : copy-dlls ( bundle-name -- )
     { "freetype6.dll" "zlib1.dll" "factor.dll" }
     [ resource-path ] map
@@ -19,8 +12,8 @@ IN: tools.deploy.windows
 
 : create-exe-dir ( vocab bundle-name -- vm )
     dup copy-dlls
-    dup copy-fonts
-    copy-vm ;
+    dup "" copy-fonts
+    ".exe" copy-vm ;
 
 : image-name ( vocab bundle-name -- str )
     prepend-path ".image" append ;