From 670aaa321af4555081ab8d1f04e5c97214d2be00 Mon Sep 17 00:00:00 2001 From: Eduardo Cavazos Date: Fri, 22 Feb 2008 17:25:12 -0600 Subject: [PATCH 1/6] builder.common: stuff common to builder and builder.release --- extra/builder/common/common.factor | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 extra/builder/common/common.factor diff --git a/extra/builder/common/common.factor b/extra/builder/common/common.factor new file mode 100644 index 0000000000..6ebe1d625a --- /dev/null +++ b/extra/builder/common/common.factor @@ -0,0 +1,18 @@ + +USING: kernel namespaces io.files sequences vars ; + +IN: builder.common + +! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +SYMBOL: builds-dir + +: builds ( -- path ) + builds-dir get + home "/builds" append + or ; + +! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +VAR: stamp + From 99b5f9df3946c52527b27176f3f67c45e7162cbc Mon Sep 17 00:00:00 2001 From: Eduardo Cavazos Date: Fri, 22 Feb 2008 17:25:42 -0600 Subject: [PATCH 2/6] builder.release: binary releases --- extra/builder/release/release.factor | 117 +++++++++++++++++++++++++++ 1 file changed, 117 insertions(+) create mode 100644 extra/builder/release/release.factor diff --git a/extra/builder/release/release.factor b/extra/builder/release/release.factor new file mode 100644 index 0000000000..e1efddbf79 --- /dev/null +++ b/extra/builder/release/release.factor @@ -0,0 +1,117 @@ + +USING: kernel sequences combinators io.files io.launcher + combinators.cleave builder.common builder.util ; + +IN: builder.release + +! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +: releases ( -- path ) builds "/releases" append ; + +! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +: common-files ( -- seq ) + { + "boot.x86.32.image" + "boot.x86.64.image" + "boot.macosx-ppc.boot" + "vm" + "temp" + "logs" + ".git" + ".gitignore" + "Makefile" + "cp_dir" + "unmaintained" + "misc/target" + "misc/wordsize" + "misc/wordsize.c" + "misc/macos-release.sh" + "misc/source-release.sh" + "misc/windows-release.sh" + "misc/version.sh" + } ; + +! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +USING: system sequences splitting ; + +: cpu- ( -- cpu ) cpu "." split "-" join ; + +! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +: base-name ( -- string ) { "factor" os cpu- stamp> } to-strings "-" join ; + +! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +: extension ( -- extension ) + os + { + { "linux" [ ".tar.gz" ] } + { "winnt" [ ".zip" ] } + { "macosx" [ ".dmg" ] } + } + case ; + +: archive-name ( -- string ) base-name extension append ; + +! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +: move-file ( source destination -- ) swap { "mv" , , } run-process drop ; + +! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +: linux-release ( -- ) + + { "rm" "-rf" "Factor.app" } run-process drop + + { "rm" "-rf" common-files } to-strings run-process drop + + ".." cd + + { "tar" "-cvzf" archive-name "factor" } to-strings run-process drop + + archive-name releases move-file ; + +! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +: windows-release ( -- ) + + { "rm" "-rf" "Factor.app" } run-process drop + + { "rm" "-rf" common-files } to-strings run-process drop + + ".." cd + + { "zip" "-r" archive-name "factor" } to-strings run-process drop + + archive-name releases move-file ; + +! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +: macosx-release ( -- ) + + { "rm" "-rf" common-files } to-strings run-process drop + + ".." cd + + { "hdiutil" "create" + "-srcfolder" "factor" + "-fs" "HFS+" + "-volname" "factor" + archive-name } + to-strings run-process drop + + archive-name releases move-file ; + +! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +: release ( -- ) + os + { + { "linux" [ linux-release ] } + { "winnt" [ windows-release ] } + { "macosx" [ macosx-release ] } + } + case ; + \ No newline at end of file From 294a8da124ab77447748201aa72857e4bbf9eb6c Mon Sep 17 00:00:00 2001 From: Eduardo Cavazos Date: Fri, 22 Feb 2008 17:26:09 -0600 Subject: [PATCH 3/6] builder: factor out stuff in builder.common --- extra/builder/builder.factor | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/extra/builder/builder.factor b/extra/builder/builder.factor index d8305041ab..fe5e621a38 100644 --- a/extra/builder/builder.factor +++ b/extra/builder/builder.factor @@ -2,21 +2,14 @@ USING: kernel namespaces sequences splitting system combinators continuations parser io io.files io.launcher io.sockets prettyprint threads bootstrap.image benchmark vars bake smtp builder.util accessors - builder.benchmark ; + builder.common + builder.benchmark + builder.release ; IN: builder ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -SYMBOL: builds-dir - -: builds ( -- path ) - builds-dir get - home "/builds" append - or ; - -! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - : prepare-build-machine ( -- ) builds make-directory builds cd @@ -32,8 +25,6 @@ SYMBOL: builds-dir ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -VAR: stamp - : enter-build-dir ( -- ) datestamp >stamp builds cd From a0dfbf7d68c03150ddc0f97feb0f44684179eb89 Mon Sep 17 00:00:00 2001 From: Eduardo Cavazos Date: Fri, 22 Feb 2008 17:32:40 -0600 Subject: [PATCH 4/6] builder.release: fix using --- extra/builder/release/release.factor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extra/builder/release/release.factor b/extra/builder/release/release.factor index e1efddbf79..db903c9501 100644 --- a/extra/builder/release/release.factor +++ b/extra/builder/release/release.factor @@ -1,5 +1,5 @@ -USING: kernel sequences combinators io.files io.launcher +USING: kernel namespaces sequences combinators io.files io.launcher combinators.cleave builder.common builder.util ; IN: builder.release From a5ee271bd0fd75a74432c0c3ba5ad5ddfc155c3e Mon Sep 17 00:00:00 2001 From: Eduardo Cavazos Date: Fri, 22 Feb 2008 17:48:20 -0600 Subject: [PATCH 5/6] builder: sleep needs a dt --- extra/builder/builder.factor | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/extra/builder/builder.factor b/extra/builder/builder.factor index fe5e621a38..d9961f9452 100644 --- a/extra/builder/builder.factor +++ b/extra/builder/builder.factor @@ -2,6 +2,7 @@ USING: kernel namespaces sequences splitting system combinators continuations parser io io.files io.launcher io.sockets prettyprint threads bootstrap.image benchmark vars bake smtp builder.util accessors + calendar builder.common builder.benchmark builder.release ; @@ -80,7 +81,7 @@ IN: builder +closed+ >>stdin "../boot-log" >>stdout +stdout+ >>stderr - 20 minutes>ms >>timeout + 20 minutes >>timeout >desc ; : builder-test-cmd ( -- cmd ) @@ -92,7 +93,7 @@ IN: builder +closed+ >>stdin "../test-log" >>stdout +stdout+ >>stderr - 45 minutes>ms >>timeout + 45 minutes >>timeout >desc ; ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! @@ -216,7 +217,7 @@ USE: bootstrap.image.download ] [ drop ] recover - 5 minutes>ms sleep + 5 minutes sleep build-loop ; ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! From cbd393ee135383ac0b488267da6da1a6c1594d4f Mon Sep 17 00:00:00 2001 From: Eduardo Cavazos Date: Fri, 22 Feb 2008 23:15:17 -0600 Subject: [PATCH 6/6] smtp: change timeout to a dt --- extra/smtp/smtp.factor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extra/smtp/smtp.factor b/extra/smtp/smtp.factor index 47bc16e029..c74a6e72fb 100755 --- a/extra/smtp/smtp.factor +++ b/extra/smtp/smtp.factor @@ -10,7 +10,7 @@ IN: smtp SYMBOL: smtp-domain SYMBOL: smtp-host "localhost" smtp-host set-global SYMBOL: smtp-port 25 smtp-port set-global -SYMBOL: read-timeout 60000 read-timeout set-global +SYMBOL: read-timeout 1 minutes read-timeout set-global SYMBOL: esmtp t esmtp set-global : log-smtp-connection ( host port -- ) 2drop ;