Fix conflict

[factor.git] / extra / tools / deploy / windows / windows.factor

diff --git a/extra/tools/deploy/windows/windows.factor b/extra/tools/deploy/windows/windows.factor
index 34580cf6f9da0a1dcfc33060c35c9b636cde7309..59e446af34558fea8ced17966e26622da2c18136 100755 (executable)
--- a/extra/tools/deploy/windows/windows.factor
+++ b/extra/tools/deploy/windows/windows.factor
@@ -1,8 +1,8 @@
 ! Copyright (C) 2007 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: io io.files kernel namespaces sequences system
-tools.deploy tools.deploy.config assocs hashtables prettyprint
-windows.shell32 windows.user32 ;
+tools.deploy.backend tools.deploy.config assocs hashtables
+prettyprint windows.shell32 windows.user32 ;
 IN: tools.deploy.windows
 
 : copy-vm ( executable bundle-name -- vm )
@@ -33,11 +33,12 @@ TUPLE: windows-deploy-implementation ;
 
 T{ windows-deploy-implementation } deploy-implementation set-global
 
-M: windows-deploy-implementation deploy
+M: windows-deploy-implementation deploy*
+    stage1
     "." resource-path cd
     dup deploy-config [
-        [ deploy-name get create-exe-dir ] keep
-        [ deploy-name get image-name ] keep
-        namespace
-        deploy-name get open-in-explorer
-    ] bind deploy* ;
+        [
+            [ deploy-name get create-exe-dir ] keep
+            [ deploy-name get image-name ] keep
+        ] bind
+    ] keep stage2 open-in-explorer ;