tools.deploy.macosx: deploy separate VM and image

This is the easiest way to make sure "resource:" works with deployed bundles for now. Single-file executables aren't really an issue with app bundles anyway.

diff --git a/basis/tools/deploy/macosx/macosx.factor b/basis/tools/deploy/macosx/macosx.factor
index 220bd86d1e40f32c6ea0cfc3427974c69788c401..4a132ed99962326e6612fec16cb7fb4ab25053af 100644 (file)
--- a/basis/tools/deploy/macosx/macosx.factor
+++ b/basis/tools/deploy/macosx/macosx.factor
@@ -70,13 +70,16 @@ IN: tools.deploy.macosx
     [ normalize-path [ <NSString> ] [ parent-directory <NSString> ] bi ] bi*
     -> selectFile:inFileViewerRootedAtPath: drop ;
 
+: deploy.app-image-name ( vocab bundle-name -- str )
+    [ % "/Contents/Resources/" % % ".image" % ] "" make ;
+
 : deploy-app-bundle ( vocab -- )
     "resource:" [
         dup deploy-config [
             bundle-name dup exists? [ delete-tree ] [ drop ] if
             [ bundle-name create-app-dir ] keep
-            [ deployed-image-name ] keep
-            namespace make-deploy-image-executable
+            [ bundle-name deploy.app-image-name ] keep
+            namespace make-deploy-image
             bundle-name
             [ "Contents/Resources" copy-resources ]
             [ "Contents/Frameworks" copy-libraries ] 2bi