steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

db4
Eduardo Cavazos 2007-12-12 18:28:25 -06:00
parent 2b0d2e2980 3f22d61a04
commit a4f37f378d
6 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
misc/macos-release.sh
View File

@ -1,15 +1,19 @@
source misc/version.sh
TARGET=$1 TARGET=$1
if [ "$TARGET" = "x86" ]; then if [ "$TARGET" = "x86" ]; then
CPU="x86.32" CPU="x86.32"
else else
CPU="ppc" CPU="macosx-ppc"
fi fi
make macosx-$TARGET BOOT_IMAGE=boot.$CPU.image
Factor.app/Contents/MacOS/factor -i=boot.$CPU.image -no-user-init 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_DIR=Factor-$VERSION
DISK_IMAGE=Factor-$VERSION-$TARGET.dmg 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/{} \; -exec ./cp_dir {} $DISK_IMAGE_DIR/Factor/{} \;
hdiutil create -srcfolder "$DISK_IMAGE_DIR" -fs HFS+ \ hdiutil create -srcfolder "$DISK_IMAGE_DIR" -fs HFS+ \
-volname "$DISK_IMAGE_DIR" "$DISK_IMAGE" -volname "$DISK_IMAGE_DIR" "$DISK_IMAGE"
ssh mkdir -p linode:w/downloads/$VERSION/
scp $DISK_IMAGE linode:w/downloads/$VERSION/

7
misc/source-release.sh Normal file
View File

@ -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/

1
misc/version.sh Normal file
View File

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

9
misc/windows-release.sh
View File

@ -1,14 +1,21 @@
source misc/version.sh
CPU=$1 CPU=$1
VERSION=0.91
if [ "$CPU" = "x86" ]; then if [ "$CPU" = "x86" ]; then
FLAGS="-no-sse2" FLAGS="-no-sse2"
fi fi
make windows-nt-x86 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" CMD="./factor-nt -i=boot.x86.32.image -no-user-init $FLAGS"
echo $CMD echo $CMD
$CMD $CMD
rm -rf .git/
rm -rf Factor.app/ rm -rf Factor.app/
rm -rf vm/ rm -rf vm/
rm -f Makefile rm -f Makefile

3
vm/os-windows-nt.c
View File

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

1
vm/platform.h
View File

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