steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't copy freetype over if UI is not deployed

db4
Slava Pestov 2008-10-02 10:53:30 -05:00
parent d5bbbd90e4
commit 00afda7f7e
3 changed files with 39 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
basis/tools/deploy/backend/backend.factor
View File

@ -13,7 +13,9 @@ IN: tools.deploy.backend
[ prepend-path ] dip append vm over copy-file ; [ prepend-path ] dip append vm over copy-file ;
: copy-fonts ( name dir -- ) : copy-fonts ( name dir -- )
append-path "resource:fonts/" swap copy-tree-into ; deploy-ui? get [
append-path "resource:fonts/" swap copy-tree-into
] [ 2drop ] if ;
: image-name ( vocab bundle-name -- str ) : image-name ( vocab bundle-name -- str )
prepend-path ".image" append ; prepend-path ".image" append ;

24
basis/tools/deploy/macosx/macosx.factor
View File

@ -4,7 +4,7 @@ USING: io io.files kernel namespaces make sequences
system tools.deploy.backend tools.deploy.config assocs system tools.deploy.backend tools.deploy.config assocs
hashtables prettyprint io.unix.backend cocoa io.encodings.utf8 hashtables prettyprint io.unix.backend cocoa io.encodings.utf8
io.backend cocoa.application cocoa.classes cocoa.plists io.backend cocoa.application cocoa.classes cocoa.plists
qualified ; qualified combinators ;
IN: tools.deploy.macosx IN: tools.deploy.macosx
: bundle-dir ( -- dir ) : bundle-dir ( -- dir )
@ -30,12 +30,26 @@ IN: tools.deploy.macosx
"Contents/Info.plist" append-path "Contents/Info.plist" append-path
write-plist ; write-plist ;
: copy-dll ( bundle-name -- )
"Frameworks/libfactor.dylib" copy-bundle-dir ;
: copy-freetype ( bundle-name -- )
deploy-ui? get [ "Frameworks" copy-bundle-dir ] [ drop ] if ;
: copy-nib ( bundle-name -- )
deploy-ui? get [
"Resources/English.lproj/MiniFactor.nib" copy-bundle-dir
] [ drop ] if ;
: create-app-dir ( vocab bundle-name -- vm ) : create-app-dir ( vocab bundle-name -- vm )
[ [
nip nip {
[ "Frameworks" copy-bundle-dir ] [ copy-dll ]
[ "Resources/English.lproj/MiniFactor.nib" copy-bundle-dir ] [ copy-freetype ]
[ "Contents/Resources/" copy-fonts ] tri [ copy-nib ]
[ "Contents/Resources/" copy-fonts ]
[ "Contents/Resources" append-path make-directories ]
} cleave
] ]
[ create-app-plist ] [ create-app-plist ]
[ "Contents/MacOS/" append-path "" copy-vm ] 2tri ; [ "Contents/MacOS/" append-path "" copy-vm ] 2tri ;

15
basis/tools/deploy/windows/windows.factor
View File

@ -5,16 +5,23 @@ tools.deploy.backend tools.deploy.config assocs hashtables
prettyprint combinators windows.shell32 windows.user32 ; prettyprint combinators windows.shell32 windows.user32 ;
IN: tools.deploy.windows IN: tools.deploy.windows
: copy-dlls ( bundle-name -- ) : copy-dll ( bundle-name -- )
"resource:factor.dll" swap copy-file-into ;
: copy-freetype ( bundle-name -- )
deploy-ui? get [
{ {
"resource:freetype6.dll" "resource:freetype6.dll"
"resource:zlib1.dll" "resource:zlib1.dll"
"resource:factor.dll" } swap copy-files-into
} swap copy-files-into ; ] when ;
: create-exe-dir ( vocab bundle-name -- vm ) : create-exe-dir ( vocab bundle-name -- vm )
dup copy-dlls deploy-ui? get [
dup copy-dll
dup copy-freetype
dup "" copy-fonts dup "" copy-fonts
] when
".exe" copy-vm ; ".exe" copy-vm ;
M: winnt deploy* M: winnt deploy*