From db55ca6408fe7927a160a0ef73f47fe7b3d8c421 Mon Sep 17 00:00:00 2001 From: Eduardo Cavazos Date: Thu, 21 Feb 2008 19:36:29 -0600 Subject: [PATCH 01/11] add misc/wordsize.c --- misc/wordsize.c | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 misc/wordsize.c diff --git a/misc/wordsize.c b/misc/wordsize.c new file mode 100644 index 0000000000..a0e7d0b9c0 --- /dev/null +++ b/misc/wordsize.c @@ -0,0 +1,8 @@ + +#include + +int main () +{ + printf("%d", 8*sizeof(void*)); + return 0; +} From 8ffc6197460f584f359fd59327f53b64cd8a7269 Mon Sep 17 00:00:00 2001 From: Eduardo Cavazos Date: Thu, 21 Feb 2008 19:36:45 -0600 Subject: [PATCH 02/11] add misc/target --- misc/target | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100755 misc/target diff --git a/misc/target b/misc/target new file mode 100755 index 0000000000..b2b04dfc1c --- /dev/null +++ b/misc/target @@ -0,0 +1,16 @@ +#!/bin/bash + +if [ \( `uname -s` = Darwin \) -a \( `uname -p` = powerpc \) ] +then + echo macosx-ppc +elif [ `uname -s` = Darwin ] +then + echo macosx-x86-`./misc/wordsize` +elif [ \( `uname -s` = Linux \) -a \( `uname -m` = i686 \) ] +then + echo linux-x86-`./misc/wordsize` +elif [ \( `uname -o` = Cygwin \) -a \( `uname -m` = i686 \) ] +then + echo winnt-x86-`./misc/wordsize` +fi + From 7303efe22161645c33422ffaf27bae9f89a59079 Mon Sep 17 00:00:00 2001 From: Eduardo Cavazos Date: Thu, 21 Feb 2008 19:37:19 -0600 Subject: [PATCH 03/11] Makefile: add an 'auto' target --- Makefile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Makefile b/Makefile index 9776027a59..d5880921fd 100755 --- a/Makefile +++ b/Makefile @@ -158,6 +158,12 @@ 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 + +auto: misc/wordsize + make `./misc/target` + clean: rm -f vm/*.o rm -f factor*.dll libfactor*.* From 95185cf9e12d053566083baaf6f463f954cdc4bd Mon Sep 17 00:00:00 2001 From: Eduardo Cavazos Date: Thu, 21 Feb 2008 19:38:51 -0600 Subject: [PATCH 04/11] builder.util: add to-file --- extra/builder/util/util.factor | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/extra/builder/util/util.factor b/extra/builder/util/util.factor index 0e68cdbc0e..3d699d4ba8 100644 --- a/extra/builder/util/util.factor +++ b/extra/builder/util/util.factor @@ -98,4 +98,10 @@ USING: bootstrap.image bootstrap.image.download io.streams.null ; : cat-n ( file n -- ) [ file-lines ] [ ] bi* maybe-tail* - [ print ] each ; \ No newline at end of file + [ print ] each ; + +! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +USE: prettyprint + +: to-file ( object file -- ) [ . ] with-file-writer ; \ No newline at end of file From 06511db6328658724db128b925329a430996b513 Mon Sep 17 00:00:00 2001 From: Eduardo Cavazos Date: Thu, 21 Feb 2008 20:37:18 -0600 Subject: [PATCH 05/11] Makefile: default rule builds via autodetection misc/target: output 'help' system not detected --- Makefile | 8 ++++---- misc/target | 5 +++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index d5880921fd..60091d44ea 100755 --- a/Makefile +++ b/Makefile @@ -45,7 +45,10 @@ DLL_OBJS = $(PLAF_DLL_OBJS) \ EXE_OBJS = $(PLAF_EXE_OBJS) -default: +default: misc/wordsize + make `./misc/target` + +help: @echo "Run 'make' with one of the following parameters:" @echo "" @echo "freebsd-x86-32" @@ -161,9 +164,6 @@ factor: $(DLL_OBJS) $(EXE_OBJS) misc/wordsize: misc/wordsize.c gcc misc/wordsize.c -o misc/wordsize -auto: misc/wordsize - make `./misc/target` - clean: rm -f vm/*.o rm -f factor*.dll libfactor*.* diff --git a/misc/target b/misc/target index b2b04dfc1c..e55032784b 100755 --- a/misc/target +++ b/misc/target @@ -12,5 +12,6 @@ then elif [ \( `uname -o` = Cygwin \) -a \( `uname -m` = i686 \) ] then echo winnt-x86-`./misc/wordsize` -fi - +else + echo help +fi \ No newline at end of file From 1ef1d41ab1994f6562cb989eaab4b916b3453b19 Mon Sep 17 00:00:00 2001 From: Eduardo Cavazos Date: Thu, 21 Feb 2008 21:59:05 -0600 Subject: [PATCH 06/11] remove cp_dir --- cp_dir | 5 ----- 1 file changed, 5 deletions(-) delete mode 100755 cp_dir diff --git a/cp_dir b/cp_dir deleted file mode 100755 index 76c8a8f03b..0000000000 --- a/cp_dir +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -echo $1 -mkdir -p "`dirname \"$2\"`" -cp "$1" "$2" From b2cc6914b6227c197bc5425ca1161eeea68d2fc2 Mon Sep 17 00:00:00 2001 From: Eduardo Cavazos Date: Thu, 21 Feb 2008 22:07:22 -0600 Subject: [PATCH 07/11] .gitignore: temp directory --- .gitignore | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 897825c826..c4bb6b7937 100644 --- a/.gitignore +++ b/.gitignore @@ -15,5 +15,4 @@ factor .gdb_history *.*.marks .*.swp -reverse-complement-in.txt -reverse-complement-out.txt +temp \ No newline at end of file From 41ca620271b0fdd5db6ae9e6322e65adc64ef6a9 Mon Sep 17 00:00:00 2001 From: Eduardo Cavazos Date: Thu, 21 Feb 2008 22:08:03 -0600 Subject: [PATCH 08/11] io.files: temp-file --- core/io/files/files.factor | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/core/io/files/files.factor b/core/io/files/files.factor index 1824a47867..108ace4393 100755 --- a/core/io/files/files.factor +++ b/core/io/files/files.factor @@ -154,3 +154,11 @@ M: pathname <=> [ pathname-string ] compare ; : with-file-appender ( path quot -- ) >r r> with-stream ; inline + +: temp-dir ( -- path ) + "temp" resource-path + dup exists? not + [ dup make-directory ] + when ; + +: temp-file ( name -- path ) temp-dir swap path+ ; \ No newline at end of file From 09e5564435e2d67834144e74c98746f81d3389ec Mon Sep 17 00:00:00 2001 From: Eduardo Cavazos Date: Thu, 21 Feb 2008 22:08:51 -0600 Subject: [PATCH 09/11] Use temp-file in a few tests and benchmarks --- core/io/streams/c/c-tests.factor | 4 ++-- extra/benchmark/mandel/mandel.factor | 2 +- extra/benchmark/raytracer/raytracer.factor | 2 +- extra/io/unix/unix-tests.factor | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/core/io/streams/c/c-tests.factor b/core/io/streams/c/c-tests.factor index 5ace929ceb..16b78c2192 100755 --- a/core/io/streams/c/c-tests.factor +++ b/core/io/streams/c/c-tests.factor @@ -2,9 +2,9 @@ USING: tools.test io.files io io.streams.c ; IN: temporary [ "hello world" ] [ - "test.txt" resource-path [ + "test.txt" temp-file [ "hello world" write ] with-file-writer - "test.txt" resource-path "rb" fopen contents + "test.txt" temp-file "rb" fopen contents ] unit-test diff --git a/extra/benchmark/mandel/mandel.factor b/extra/benchmark/mandel/mandel.factor index 230fb2f889..0da4785785 100755 --- a/extra/benchmark/mandel/mandel.factor +++ b/extra/benchmark/mandel/mandel.factor @@ -65,7 +65,7 @@ SYMBOL: cols ] with-scope ; : mandel-main ( -- ) - "mandel.ppm" resource-path + "mandel.ppm" temp-file [ mandel write ] with-file-writer ; MAIN: mandel-main diff --git a/extra/benchmark/raytracer/raytracer.factor b/extra/benchmark/raytracer/raytracer.factor index 8f2badc95f..ddfd0ed6dd 100644 --- a/extra/benchmark/raytracer/raytracer.factor +++ b/extra/benchmark/raytracer/raytracer.factor @@ -170,7 +170,7 @@ DEFER: create ( level c r -- scene ) ] "" make ; : raytracer-main - "raytracer.pnm" resource-path + "raytracer.pnm" temp-file [ run write ] with-file-writer ; MAIN: raytracer-main diff --git a/extra/io/unix/unix-tests.factor b/extra/io/unix/unix-tests.factor index 515077f22b..6eb0b78955 100755 --- a/extra/io/unix/unix-tests.factor +++ b/extra/io/unix/unix-tests.factor @@ -38,8 +38,8 @@ yield "unix-domain-datagram-test" resource-path delete-file ] ignore-errors -: server-addr "unix-domain-datagram-test" resource-path ; -: client-addr "unix-domain-datagram-test-2" resource-path ; +: server-addr "unix-domain-datagram-test" temp-file ; +: client-addr "unix-domain-datagram-test-2" temp-file ; [ [ @@ -112,7 +112,7 @@ client-addr "unix-domain-datagram-test-3" resource-path delete-file ] ignore-errors -"unix-domain-datagram-test-2" resource-path delete-file +"unix-domain-datagram-test-2" temp-file delete-file [ ] [ client-addr "d" set ] unit-test From 9ead707c5b43961e7598a99e7715ff515c377f8e Mon Sep 17 00:00:00 2001 From: Eduardo Cavazos Date: Thu, 21 Feb 2008 22:14:08 -0600 Subject: [PATCH 10/11] benchmark.reverse-complement: use temp-file --- .../benchmark/reverse-complement/reverse-complement.factor | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/extra/benchmark/reverse-complement/reverse-complement.factor b/extra/benchmark/reverse-complement/reverse-complement.factor index 0771b756bf..cf4143d533 100755 --- a/extra/benchmark/reverse-complement/reverse-complement.factor +++ b/extra/benchmark/reverse-complement/reverse-complement.factor @@ -41,12 +41,10 @@ HINTS: do-line vector string ; ] with-disposal ; : reverse-complement-in - "extra/benchmark/reverse-complement/reverse-complement-in.txt" - resource-path ; + "reverse-complement-in.txt" temp-file ; : reverse-complement-out - "extra/benchmark/reverse-complement/reverse-complement-out.txt" - resource-path ; + "reverse-complement-out.txt" temp-file ; : reverse-complement-main ( -- ) reverse-complement-in From 31c2659828628fe2af9a57a53a7b6ff0f83ee5d3 Mon Sep 17 00:00:00 2001 From: Eduardo Cavazos Date: Thu, 21 Feb 2008 22:16:10 -0600 Subject: [PATCH 11/11] .gitignore: logs, work, etc --- .gitignore | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index c4bb6b7937..19ace1f500 100644 --- a/.gitignore +++ b/.gitignore @@ -15,4 +15,7 @@ factor .gdb_history *.*.marks .*.swp -temp \ No newline at end of file +temp +logs +work +misc/wordsize \ No newline at end of file