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

.gitignore

@@ -12,6 +12,7 @@ Factor/factor
 *.res
 *.RES
 *.image
+factor.image.fresh
 *.dylib
 factor
 factor.com

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

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
 }

extra/build-support/authors.txt

@@ -0,0 +1 @@
+Doug Coleman

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

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 ;

extra/build-support/platforms.txt

@@ -0,0 +1 @@
+unix