Merge branch 'master' of git://github.com/seckar/factor

diff --git a/Makefile b/Makefile
index bfaaa3eee44f54f86d875663297aac4750db92ed..3f385ec4964ac062abd75d995e3f26356259d61b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -159,7 +159,7 @@ factor-console: $(DLL_OBJS) $(EXE_OBJS)
        $(CC) $(LIBS) $(LIBPATH) -L. $(LINK_WITH_ENGINE) \
                $(CFLAGS) $(CFLAGS_CONSOLE) -o factor$(EXE_SUFFIX)$(CONSOLE_EXTENSION) $(EXE_OBJS)
 
-factor-ffi-test: $(TEST_OBJS)
+factor-ffi-test: vm/ffi_test.o
        $(CC) $(LIBPATH) $(CFLAGS) $(FFI_TEST_CFLAGS) $(SHARED_FLAG) -o libfactor-ffi-test$(DLL_EXTENSION) $(TEST_OBJS)
 
 clean:
@@ -169,6 +169,9 @@ clean:
 vm/resources.o:
        $(WINDRES) vm/factor.rs vm/resources.o
 
+vm/ffi_test.o: vm/ffi_test.c
+       $(CC) -c $(CFLAGS) $(FFI_TEST_CFLAGS) -o $@ $<
+
 .c.o:
        $(CC) -c $(CFLAGS) -o $@ $<
 

diff --git a/basis/compiler/tests/alien.factor b/basis/compiler/tests/alien.factor
index b26abb561ca9e3349fc62e44d7fa72692b7b2d7f..7d65ea71032f9f08efb05d5430f571cd230f07c6 100644 (file)
--- a/basis/compiler/tests/alien.factor
+++ b/basis/compiler/tests/alien.factor
@@ -3,7 +3,8 @@ namespaces namespaces tools.test sequences stack-checker
 stack-checker.errors words arrays parser quotations
 continuations effects namespaces.private io io.streams.string
 memory system threads tools.test math accessors combinators
-specialized-arrays.float alien.libraries ;
+specialized-arrays.float alien.libraries io.pathnames
+io.backend ;
 IN: compiler.tests
 
 <<

diff --git a/basis/tools/scaffold/scaffold-docs.factor b/basis/tools/scaffold/scaffold-docs.factor
index 4d1240ad3851044c6d3da7db05577cb79709f197..621933bfa8210953190498bc6c2d540a4f0d4ce3 100644 (file)
--- a/basis/tools/scaffold/scaffold-docs.factor
+++ b/basis/tools/scaffold/scaffold-docs.factor
@@ -26,7 +26,7 @@ HELP: scaffold-undocumented
 HELP: scaffold-vocab
 { $values
      { "vocab-root" "a vocabulary root string" } { "string" string } }
-{ $description "Creates a directory in the given root for a new vocabulary and adds a main .factor file, a tests file, and an authors.txt file." } ;
+{ $description "Creates a directory in the given root for a new vocabulary and adds a main .factor file and an authors.txt file." } ;
 
 HELP: scaffold-emacs
 { $description "Touches the .emacs file in your home directory and provides a clickable link to open it in an editor." } ;