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

.gitignore

@@ -18,4 +18,4 @@ factor
 temp
 logs
 work
-misc/wordsize
+buildsupport/wordsize

Makefile

@@ -45,8 +45,8 @@ DLL_OBJS = $(PLAF_DLL_OBJS) \
 
 EXE_OBJS = $(PLAF_EXE_OBJS)
 
-default: misc/wordsize
-	$(MAKE) `./misc/target`
+default: build-support/wordsize
+	$(MAKE) `./build-support/target`
 
 help:
 	@echo "Run '$(MAKE)' with one of the following parameters:"
@@ -162,8 +162,8 @@ factor: $(DLL_OBJS) $(EXE_OBJS)
 	$(CC) $(LIBS) $(LIBPATH) -L. $(LINK_WITH_ENGINE) \
 		$(CFLAGS) -o $@$(EXE_SUFFIX)$(EXE_EXTENSION) $(EXE_OBJS)
 
-misc/wordsize: misc/wordsize.c
-	gcc misc/wordsize.c -o misc/wordsize
+build-support/wordsize: build-support/wordsize.c
+	gcc build-support/wordsize.c -o build-support/wordsize
 
 clean:
 	rm -f vm/*.o

build-support/target

@@ -17,7 +17,7 @@ then
   echo macosx-ppc
 elif [ `uname -s` = Darwin ]
 then
-  echo macosx-x86-`./misc/wordsize`
+  echo macosx-x86-`./build-support/wordsize`
 elif [ \( `uname -s` = Linux \) -a \( `uname -m` = i686 \) ]
 then
   echo linux-x86-32
@@ -26,7 +26,7 @@ then
   echo linux-x86-64
 elif [ \( `uname -o` = Cygwin \) -a \( `uname -m` = i686 \) ]
 then
-  echo winnt-x86-`./misc/wordsize`
+  echo winnt-x86-`./build-support/wordsize`
 else
   echo help
 fi

core/io/files/files-tests.factor

@@ -131,7 +131,7 @@ io.files.unique sequences strings accessors ;
 
 [ ] [ "append-test" temp-file dup exists? [ delete-file ] [ drop ] if ] unit-test
 
-[ ] [ "append-test" ascii <file-appender> dispose ] unit-test
+[ ] [ "append-test" temp-file ascii <file-appender> dispose ] unit-test
 
 
 

extra/graphics/bitmap/bitmap.factor

@@ -117,16 +117,16 @@ M: bitmap height ( bitmap -- ) bitmap-height ;
     load-bitmap [ <graphics-gadget> "bitmap" open-window ] keep ;
 
 : test-bitmap24 ( -- )
-    "misc/graphics/bmps/thiswayup24.bmp" resource-path bitmap. ;
+    "extra/graphics/bitmap/test-data/thiswayup24.bmp" resource-path bitmap. ;
 
 : test-bitmap8 ( -- )
-    "misc/graphics/bmps/rgb8bit.bmp" resource-path bitmap. ;
+    "extra/graphics/bitmap/test-data/rgb8bit.bmp" resource-path bitmap. ;
 
 : test-bitmap4 ( -- )
-    "misc/graphics/bmps/rgb4bit.bmp" resource-path
+    "extra/graphics/bitmap/test-data/rgb4bit.bmp" resource-path
     load-bitmap ;
     ! bitmap. ;
 
 : test-bitmap1 ( -- )
-    "misc/graphics/bmps/1bit.bmp" resource-path bitmap. ;
+    "extra/graphics/bitmap/test-data/1bit.bmp" resource-path bitmap. ;
 

misc/version.sh

@@ -1 +0,0 @@
-export VERSION=0.92