Refactoring common functions out of platform-specific deployment
parent
738a59ee45
commit
0426ca274d
|
@ -106,4 +106,13 @@ DEFER: ?make-staging-image
|
||||||
make-boot-image
|
make-boot-image
|
||||||
deploy-command-line run-factor ;
|
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 -- )
|
HOOK: deploy* os ( vocab -- )
|
||||||
|
|
|
@ -5,19 +5,9 @@ system tools.deploy.backend tools.deploy.config assocs
|
||||||
hashtables prettyprint ;
|
hashtables prettyprint ;
|
||||||
IN: tools.deploy.linux
|
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 )
|
: create-app-dir ( vocab bundle-name -- vm )
|
||||||
dup copy-fonts
|
dup "" copy-fonts
|
||||||
copy-vm ;
|
"" copy-vm ;
|
||||||
|
|
||||||
: image-name ( vocab bundle-name -- str )
|
|
||||||
prepend-path ".image" append ;
|
|
||||||
|
|
||||||
: bundle-name ( -- str )
|
: bundle-name ( -- str )
|
||||||
deploy-name get ;
|
deploy-name get ;
|
||||||
|
|
|
@ -14,13 +14,6 @@ IN: tools.deploy.macosx
|
||||||
bundle-dir over append-path -rot
|
bundle-dir over append-path -rot
|
||||||
"Contents" prepend-path append-path copy-tree ;
|
"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 )
|
: app-plist ( executable bundle-name -- assoc )
|
||||||
[
|
[
|
||||||
"6.0" "CFBundleInfoDictionaryVersion" set
|
"6.0" "CFBundleInfoDictionaryVersion" set
|
||||||
|
@ -40,8 +33,8 @@ IN: tools.deploy.macosx
|
||||||
: create-app-dir ( vocab bundle-name -- vm )
|
: create-app-dir ( vocab bundle-name -- vm )
|
||||||
dup "Frameworks" copy-bundle-dir
|
dup "Frameworks" copy-bundle-dir
|
||||||
dup "Resources/English.lproj/MiniFactor.nib" copy-bundle-dir
|
dup "Resources/English.lproj/MiniFactor.nib" copy-bundle-dir
|
||||||
dup copy-fonts
|
dup "Contents/Resources/" copy-fonts
|
||||||
2dup create-app-plist copy-vm ;
|
2dup create-app-plist "Contents/MacOS/" append-path "" copy-vm ;
|
||||||
|
|
||||||
: deploy.app-image ( vocab bundle-name -- str )
|
: deploy.app-image ( vocab bundle-name -- str )
|
||||||
[ % "/Contents/Resources/" % % ".image" % ] "" make ;
|
[ % "/Contents/Resources/" % % ".image" % ] "" make ;
|
||||||
|
|
|
@ -5,13 +5,6 @@ tools.deploy.backend tools.deploy.config assocs hashtables
|
||||||
prettyprint windows.shell32 windows.user32 ;
|
prettyprint windows.shell32 windows.user32 ;
|
||||||
IN: tools.deploy.windows
|
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 -- )
|
: copy-dlls ( bundle-name -- )
|
||||||
{ "freetype6.dll" "zlib1.dll" "factor.dll" }
|
{ "freetype6.dll" "zlib1.dll" "factor.dll" }
|
||||||
[ resource-path ] map
|
[ resource-path ] map
|
||||||
|
@ -19,8 +12,8 @@ IN: tools.deploy.windows
|
||||||
|
|
||||||
: create-exe-dir ( vocab bundle-name -- vm )
|
: create-exe-dir ( vocab bundle-name -- vm )
|
||||||
dup copy-dlls
|
dup copy-dlls
|
||||||
dup copy-fonts
|
dup "" copy-fonts
|
||||||
copy-vm ;
|
".exe" copy-vm ;
|
||||||
|
|
||||||
: image-name ( vocab bundle-name -- str )
|
: image-name ( vocab bundle-name -- str )
|
||||||
prepend-path ".image" append ;
|
prepend-path ".image" append ;
|
||||||
|
|
Loading…
Reference in New Issue