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

Merge commit 'origin/master'

db4
Chris Double 2008-06-21 10:48:56 +12:00
parent dcdf4d668d 482f1d4c36
commit 354dcce13c
4 changed files with 40 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
extra/assocs/lib/lib-tests.factor Normal file
View File

@ -0,0 +1,4 @@
IN: assocs.lib.tests
USING: assocs.lib tools.test vectors ;
{ 1 1 } [ [ ?push ] histogram ] must-infer-as

2
extra/assocs/lib/lib.factor
View File

@ -41,4 +41,4 @@ IN: assocs.lib
: histogram ( assoc quot -- assoc' ) : histogram ( assoc quot -- assoc' )
H{ } clone [ H{ } clone [
swap [ change-at ] 2curry assoc-each swap [ change-at ] 2curry assoc-each
] keep ; ] keep ; inline

15
extra/builder/release/archive/archive.factor
View File

@ -24,12 +24,23 @@ IN: builder.release.archive
: windows-archive-cmd ( -- cmd ) { "zip" "-r" archive-name "factor" } ; : windows-archive-cmd ( -- cmd ) { "zip" "-r" archive-name "factor" } ;
! : macosx-archive-cmd ( -- cmd )
! { "hdiutil" "create"
! "-srcfolder" "factor"
! "-fs" "HFS+"
! "-volname" "factor"
! archive-name } ;
: macosx-archive-cmd ( -- cmd ) : macosx-archive-cmd ( -- cmd )
{ "mkdir" "dmg-root" } try-process
{ "cp" "-r" "factor" "dmg-root" } try-process
{ "hdiutil" "create" { "hdiutil" "create"
"-srcfolder" "factor" "-srcfolder" "dmg-root"
"-fs" "HFS+" "-fs" "HFS+"
"-volname" "factor" "-volname" "factor"
archive-name } ; archive-name } to-strings try-process
{ "rm" "-rf" "dmg-root" } try-process
{ "true" } ;
: unix-archive-cmd ( -- cmd ) { "tar" "-cvzf" archive-name "factor" } ; : unix-archive-cmd ( -- cmd ) { "tar" "-cvzf" archive-name "factor" } ;

30
extra/websites/concatenative/concatenative.factor
View File

@ -63,19 +63,33 @@ TUPLE: factor-website < dispatcher ;
{ factor-website "page" } >>template { factor-website "page" } >>template
test-db <alloy> ; test-db <alloy> ;
: init-factor-website ( -- ) SYMBOL: key-password
"factorcode.org" 25 <inet> smtp-server set-global SYMBOL: key-file
SYMBOL: dh-file
: common-configuration ( -- )
"concatenative.org" 25 <inet> smtp-server set-global
"noreply@concatenative.org" lost-password-from set-global "noreply@concatenative.org" lost-password-from set-global
"website@concatenative.org" insomniac-sender set-global "website@concatenative.org" insomniac-sender set-global
"slava@factorcode.org" insomniac-recipients set-global "slava@factorcode.org" insomniac-recipients set-global
init-factor-db <factor-website> main-responder set-global
<factor-website> main-responder set-global ; init-factor-db ;
: init-testing ( -- )
"resource:extra/openssl/test/dh1024.pem" dh-file set-global
"resource:extra/openssl/test/server.pem" key-file set-global
"password" key-password set-global
common-configuration ;
: init-production ( -- )
"/home/slava/cert/host.pem" key-file set-global
common-configuration ;
: <factor-secure-config> ( -- config ) : <factor-secure-config> ( -- config )
<secure-config> <secure-config>
"resource:extra/openssl/test/server.pem" >>key-file key-file get >>key-file
"resource:extra/openssl/test/dh1024.pem" >>dh-file dh-file get >>dh-file
"password" >>password ; key-password get >>password ;
: <factor-website-server> ( -- threaded-server ) : <factor-website-server> ( -- threaded-server )
<http-server> <http-server>
@ -83,7 +97,7 @@ TUPLE: factor-website < dispatcher ;
8080 >>insecure 8080 >>insecure
8431 >>secure ; 8431 >>secure ;
: start-factor-website ( -- ) : start-website ( -- )
test-db start-expiring test-db start-expiring
test-db start-update-task test-db start-update-task
http-insomniac http-insomniac