From cf0453f80c425c2145ee1a4c8a7b9eb2fd1fe32c Mon Sep 17 00:00:00 2001 From: Daniel Ehrenberg Date: Sat, 24 Apr 2010 21:29:46 -0500 Subject: [PATCH 1/2] Making tools.deploy.shaker remove require-when data structures --- basis/tools/deploy/shaker/shaker.factor | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/basis/tools/deploy/shaker/shaker.factor b/basis/tools/deploy/shaker/shaker.factor index a2a2dbbc86..485f0f5fa7 100755 --- a/basis/tools/deploy/shaker/shaker.factor +++ b/basis/tools/deploy/shaker/shaker.factor @@ -6,7 +6,7 @@ parser.notes lexer strings.parser vocabs sequences sequences.deep sequences.private words memory kernel.private continuations io vocabs.loader system strings sets vectors quotations byte-arrays sorting compiler.units definitions generic generic.standard -generic.single tools.deploy.config combinators classes +generic.single tools.deploy.config combinators classes vocabs.loader.private classes.builtin slots.private grouping command-line io.pathnames ; QUALIFIED: bootstrap.stage2 QUALIFIED: classes.private @@ -349,6 +349,8 @@ IN: tools.deploy.shaker lexer-factory print-use-hook root-cache + require-when-vocabs + require-when-table source-files.errors:error-types source-files.errors:error-observers vocabs:dictionary From c434fbf47ccf3fd9e9d18e8a6630c021a1bb1d08 Mon Sep 17 00:00:00 2001 From: Joe Groff Date: Sun, 25 Apr 2010 12:18:45 -0700 Subject: [PATCH 2/2] ui.backend.x11: search path for xmessage rather than hardcoding path --- basis/ui/backend/x11/x11.factor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/basis/ui/backend/x11/x11.factor b/basis/ui/backend/x11/x11.factor index 6a7a8d147f..fc7943efb0 100644 --- a/basis/ui/backend/x11/x11.factor +++ b/basis/ui/backend/x11/x11.factor @@ -332,7 +332,7 @@ M: x11-ui-backend beep ( -- ) [ dup CHAR: ' = [ drop "'\\''" ] [ 1string ] if ] { } map-as concat ; : xmessage ( string -- ) - escape-' "/usr/X11R6/bin/xmessage '" "'" surround system drop ; + escape-' "/usr/bin/env xmessage '" "'" surround system drop ; PRIVATE> M: x11-ui-backend system-alert