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

Merge branch 'master' of git://factorcode.org/git/factor

db4
Slava Pestov 2008-02-25 16:32:54 -06:00
parent d165f29b36 5045330209
commit e70b5525af
6 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -145,7 +145,8 @@ wince-arm:
macosx.app: factor macosx.app: factor
mkdir -p $(BUNDLE)/Contents/MacOS mkdir -p $(BUNDLE)/Contents/MacOS
cp $(EXECUTABLE) $(BUNDLE)/Contents/MacOS/factor mv $(EXECUTABLE) $(BUNDLE)/Contents/MacOS/factor
ln -s Factor.app/Contents/MacOS/factor ./factor
cp $(ENGINE) $(BUNDLE)/Contents/Frameworks cp $(ENGINE) $(BUNDLE)/Contents/Frameworks
install_name_tool \ install_name_tool \

17
extra/builder/builder.factor
View File

@ -65,15 +65,14 @@ IN: builder
! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
: factor-binary ( -- name ) ! : factor-binary ( -- name )
os ! os "macosx" =
{ { "macosx" [ "./Factor.app/Contents/MacOS/factor" ] } ! [ "./Factor.app/Contents/MacOS/factor" ]
{ "winnt" [ "./factor-nt.exe" ] } ! [ "./factor" ]
[ drop "./factor" ] } ! if ;
case ;
: bootstrap-cmd ( -- cmd ) : bootstrap-cmd ( -- cmd )
{ factor-binary { "-i=" my-boot-image-name } "-no-user-init" } to-strings ; { "./factor" { "-i=" my-boot-image-name } "-no-user-init" } to-strings ;
: bootstrap ( -- desc ) : bootstrap ( -- desc )
<process*> <process*>
@ -85,7 +84,7 @@ IN: builder
>desc ; >desc ;
: builder-test-cmd ( -- cmd ) : builder-test-cmd ( -- cmd )
{ factor-binary "-run=builder.test" } to-strings ; { "./factor" "-run=builder.test" } to-strings ;
: builder-test ( -- desc ) : builder-test ( -- desc )
<process*> <process*>
@ -178,7 +177,7 @@ SYMBOL: builder-recipients
: build ( -- ) : build ( -- )
[ (build) ] [ drop ] recover [ (build) ] [ drop ] recover
maybe-release build-status get [ maybe-release ] when
[ send-builder-email ] [ drop "not sending mail" . ] recover [ send-builder-email ] [ drop "not sending mail" . ] recover
".." cd { "rm" "-rf" "factor" } run-process drop ".." cd { "rm" "-rf" "factor" } run-process drop
[ compress-image ] [ drop ] recover ; [ compress-image ] [ drop ] recover ;

1
extra/furnace/furnace.factor
View File

@ -204,4 +204,3 @@ SYMBOL: model
] [ ] [
drop drop
] if ; ] if ;

7
extra/furnace/sessions/sessions.factor
View File

@ -1,5 +1,5 @@
USING: assocs calendar init kernel math.parser USING: assocs calendar init kernel math.parser
namespaces random boxes alarms ; namespaces random boxes alarms combinators.lib ;
IN: furnace.sessions IN: furnace.sessions
SYMBOL: sessions SYMBOL: sessions
@ -11,9 +11,8 @@ SYMBOL: sessions
] "furnace.sessions" add-init-hook ] "furnace.sessions" add-init-hook
: new-session-id ( -- str ) : new-session-id ( -- str )
4 big-random >hex [ 4 big-random >hex ]
dup sessions get-global key? [ sessions get-global key? not ] generate ;
[ drop new-session-id ] when ;
TUPLE: session id namespace alarm user-agent ; TUPLE: session id namespace alarm user-agent ;

2
extra/http/server/responders/responders.factor
View File

@ -77,7 +77,7 @@ SYMBOL: max-post-request
1024 256 * max-post-request set-global 1024 256 * max-post-request set-global
: content-length ( header -- n ) : content-length ( header -- n )
"content-length" peek-at string>number dup [ "content-length" swap peek-at string>number dup [
dup max-post-request get > [ dup max-post-request get > [
"Content-Length > max-post-request" throw "Content-Length > max-post-request" throw
] when ] when

4
misc/factor.sh
View File

@ -186,8 +186,8 @@ find_word_size() {
set_factor_binary() { set_factor_binary() {
case $OS in case $OS in
winnt) FACTOR_BINARY=factor-nt;; # winnt) FACTOR_BINARY=factor-nt;;
macosx) FACTOR_BINARY=./Factor.app/Contents/MacOS/factor;; # macosx) FACTOR_BINARY=./Factor.app/Contents/MacOS/factor;;
*) FACTOR_BINARY=factor;; *) FACTOR_BINARY=factor;;
esac esac
} }