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

misc/macos-release.sh

@@ -1,15 +1,19 @@
+source misc/version.sh
+
 TARGET=$1
 
 if [ "$TARGET" = "x86" ]; then
 	CPU="x86.32"
 else
-	CPU="ppc"
+	CPU="macosx-ppc"
 fi
 
-make macosx-$TARGET
-Factor.app/Contents/MacOS/factor -i=boot.$CPU.image -no-user-init
+BOOT_IMAGE=boot.$CPU.image
+wget http://factorcode.org/images/$VERSION/$BOOT_IMAGE
+
+make macosx-$TARGET
+Factor.app/Contents/MacOS/factor -i=$BOOT_IMAGE -no-user-init
 
-VERSION=0.91
 DISK_IMAGE_DIR=Factor-$VERSION
 DISK_IMAGE=Factor-$VERSION-$TARGET.dmg
 
@@ -24,3 +28,6 @@ find core extra fonts misc unmaintained -type f \
 	-exec ./cp_dir {} $DISK_IMAGE_DIR/Factor/{} \;
 hdiutil create -srcfolder "$DISK_IMAGE_DIR" -fs HFS+ \
 	-volname "$DISK_IMAGE_DIR" "$DISK_IMAGE"
+
+ssh mkdir -p linode:w/downloads/$VERSION/
+scp $DISK_IMAGE linode:w/downloads/$VERSION/

misc/source-release.sh

@@ -0,0 +1,7 @@
+source misc/version.sh
+rm -rf .git
+cd ..
+tar cfz Factor-$VERSION.tgz factor/
+
+ssh mkdir -p linode:w/downloads/$VERSION/
+scp Factor-$VERSION.tgz linode:w/downloads/$VERSION/

misc/version.sh

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

misc/windows-release.sh

@@ -1,14 +1,21 @@
+source misc/version.sh
+
 CPU=$1
-VERSION=0.91
 
 if [ "$CPU" = "x86" ]; then
     FLAGS="-no-sse2"
 fi
 
 make windows-nt-x86
+
+wget http://factorcode.org/dlls/freetype6.dll
+wget http://factorcode.org/dlls/zlib1.dll
+wget http://factorcode.org/images/$VERSION/boot.x86.32.image
+
 CMD="./factor-nt -i=boot.x86.32.image -no-user-init $FLAGS"
 echo $CMD
 $CMD
+rm -rf .git/
 rm -rf Factor.app/
 rm -rf vm/
 rm -f Makefile

vm/os-windows-nt.c

@@ -87,8 +87,7 @@ void c_to_factor_toplevel(CELL quot)
 	if(!AddVectoredExceptionHandler(0, (void*)exception_handler))
 		fatal_error("AddVectoredExceptionHandler failed", 0);
 	c_to_factor(quot);
-	if(!RemoveVectoredExceptionHandler((void*)exception_handler))
-		fatal_error("RemoveVectoredExceptionHandler failed", 0);
+	RemoveVectoredExceptionHandler((void*)exception_handler);
 }
 
 void open_console(void)

vm/platform.h

@@ -72,7 +72,6 @@
 			#elif defined(FACTOR_ARM)
 				#include "os-linux-arm.h"
 			#elif defined(FACTOR_AMD64)
-				#include "os-unix-ucontext.h"
 				#include "os-linux-x86-64.h"
 			#else
 				#error "Unsupported Linux flavor"