From 859ec88bcd3788cea1c45af5d40bd1c927ee886a Mon Sep 17 00:00:00 2001 From: Joe Groff Date: Sun, 25 Apr 2010 12:18:45 -0700 Subject: [PATCH 1/4] 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 From 6023070fec9d9b073022c8d8bce7fd02c252f322 Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Sun, 25 Apr 2010 14:59:07 -0500 Subject: [PATCH 2/4] A little overzealous with the factor.sh echo cleanup --- build-support/factor.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build-support/factor.sh b/build-support/factor.sh index bcc3e8f966..d8b547d8d6 100755 --- a/build-support/factor.sh +++ b/build-support/factor.sh @@ -25,7 +25,8 @@ test_program_installed() { exit_script() { if [[ $FIND_MAKE_TARGET -eq true ]] ; then - $ECHO $MAKE_TARGET; + # Must be echo not $ECHO + echo $MAKE_TARGET; fi exit $1 } From daf63d11b6b0a67a1d8515866e00f00da23eda39 Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Sun, 25 Apr 2010 15:16:08 -0500 Subject: [PATCH 3/4] gitignore the fresh boot image --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 3bc5a6ffda..7bd42557b7 100644 --- a/.gitignore +++ b/.gitignore @@ -12,6 +12,7 @@ Factor/factor *.res *.RES *.image +factor.image.fresh *.dylib factor factor.com From 13baf777c9b48e3a016c23b861eff4ad04a937dc Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Sun, 25 Apr 2010 15:23:44 -0500 Subject: [PATCH 4/4] Test factor.sh output on unix platforms --- extra/build-support/authors.txt | 1 + extra/build-support/build-support-tests.factor | 6 ++++++ extra/build-support/build-support.factor | 10 ++++++++++ extra/build-support/platforms.txt | 1 + 4 files changed, 18 insertions(+) create mode 100644 extra/build-support/authors.txt create mode 100644 extra/build-support/build-support-tests.factor create mode 100644 extra/build-support/build-support.factor create mode 100644 extra/build-support/platforms.txt diff --git a/extra/build-support/authors.txt b/extra/build-support/authors.txt new file mode 100644 index 0000000000..7c1b2f2279 --- /dev/null +++ b/extra/build-support/authors.txt @@ -0,0 +1 @@ +Doug Coleman diff --git a/extra/build-support/build-support-tests.factor b/extra/build-support/build-support-tests.factor new file mode 100644 index 0000000000..1f855d5701 --- /dev/null +++ b/extra/build-support/build-support-tests.factor @@ -0,0 +1,6 @@ +! Copyright (C) 2010 Doug Coleman. +! See http://factorcode.org/license.txt for BSD license. +USING: build-support sequences tools.test ; +IN: build-support.tests + +[ f ] [ factor.sh-make-target empty? ] unit-test diff --git a/extra/build-support/build-support.factor b/extra/build-support/build-support.factor new file mode 100644 index 0000000000..177042e186 --- /dev/null +++ b/extra/build-support/build-support.factor @@ -0,0 +1,10 @@ +! Copyright (C) 2010 Doug Coleman. +! See http://factorcode.org/license.txt for BSD license. +USING: arrays io io.backend io.encodings.utf8 io.launcher ; +IN: build-support + +CONSTANT: factor.sh-path "resource:build-support/factor.sh" + +: factor.sh-make-target ( -- string ) + factor.sh-path normalize-path "make-target" 2array + utf8 [ readln ] with-process-reader ; diff --git a/extra/build-support/platforms.txt b/extra/build-support/platforms.txt new file mode 100644 index 0000000000..509143d863 --- /dev/null +++ b/extra/build-support/platforms.txt @@ -0,0 +1 @@ +unix