Don't compile contrib/ files until the very end; reduces compile time considerably.
parent
bba4812b9b
commit
0b721bb542
|
@ -1,9 +1,9 @@
|
||||||
IN: scratchpad
|
IN: scratchpad
|
||||||
USING: kernel parser sequences words compiler ;
|
USING: kernel parser sequences words compiler ;
|
||||||
|
|
||||||
"contrib/crypto/load.factor" run-file
|
"contrib/crypto/load.factor" run-file
|
||||||
|
|
||||||
{ "net-bytes" "aim" }
|
{
|
||||||
[ "contrib/aim/" swap ".factor" append3 run-file ]
|
"net-bytes"
|
||||||
|
"aim"
|
||||||
{ "aim-internals" "aim" }
|
} [ "contrib/aim/" swap ".factor" append3 run-file ]
|
||||||
[ words [ try-compile ] each ] each
|
|
||||||
|
|
|
@ -1,13 +1,13 @@
|
||||||
IN: scratchpad
|
IN: scratchpad
|
||||||
USING: alien kernel parser compiler words sequences ;
|
USING: alien kernel parser compiler words sequences ;
|
||||||
|
|
||||||
{ { "cairo" "libcairo" }
|
{
|
||||||
|
{ "cairo" "libcairo" }
|
||||||
{ "sdl-gfx" "libSDL_gfx" }
|
{ "sdl-gfx" "libSDL_gfx" }
|
||||||
{ "sdl" "libSDL" } }
|
{ "sdl" "libSDL" }
|
||||||
[ first2 add-simple-library ] each
|
} [ first2 add-simple-library ] each
|
||||||
|
|
||||||
{ "cairo" "cairo_sdl" }
|
{
|
||||||
[ "contrib/cairo/" swap ".factor" append3 run-file ] each
|
"cairo"
|
||||||
|
"cairo_sdl"
|
||||||
{ "cairo" "cairo-sdl" }
|
} [ "contrib/cairo/" swap ".factor" append3 run-file ] each
|
||||||
[ words [ try-compile ] each ] each
|
|
||||||
|
|
|
@ -4,7 +4,7 @@ USING: kernel parser compiler words sequences ;
|
||||||
"contrib/dlists.factor" run-file
|
"contrib/dlists.factor" run-file
|
||||||
"contrib/math/load.factor" run-file
|
"contrib/math/load.factor" run-file
|
||||||
|
|
||||||
{ "concurrency" "concurrency-examples" }
|
{
|
||||||
dup
|
"concurrency"
|
||||||
[ "contrib/concurrency/" swap ".factor" append3 run-file ] each
|
"concurrency-examples"
|
||||||
[ words [ try-compile ] each ] each
|
} [ "contrib/concurrency/" swap ".factor" append3 run-file ] each
|
||||||
|
|
|
@ -1,11 +1,16 @@
|
||||||
IN: scratchpad
|
IN: scratchpad
|
||||||
USING: words kernel parser sequences io compiler ;
|
USING: words kernel parser sequences io compiler ;
|
||||||
|
|
||||||
"contrib/httpd/load.factor" run-file
|
"contrib/httpd/load.factor" run-file
|
||||||
"contrib/parser-combinators/load.factor" run-file
|
"contrib/parser-combinators/load.factor" run-file
|
||||||
|
|
||||||
{ "cont-examples" "cont-numbers-game" "todo" "todo-example" "live-updater" "eval-responder" "live-updater-responder" "cont-testing" }
|
{
|
||||||
[ "contrib/cont-responder/" swap ".factor" append3 run-file ] each
|
"cont-examples"
|
||||||
|
"cont-numbers-game"
|
||||||
{ "cont-examples" "numbers-game" "cont-responder" "eval-responder" "live-updater-responder" "live-updater" "todo-example" "todo" }
|
"todo"
|
||||||
[ words [ try-compile ] each ] each
|
"todo-example"
|
||||||
|
"live-updater"
|
||||||
|
"eval-responder"
|
||||||
|
"live-updater-responder"
|
||||||
|
"cont-testing"
|
||||||
|
} [ "contrib/cont-responder/" swap ".factor" append3 run-file ] each
|
||||||
|
|
|
@ -1,8 +1,10 @@
|
||||||
IN: scratchpad
|
IN: scratchpad
|
||||||
USING: kernel parser sequences words compiler ;
|
USING: kernel parser sequences words compiler ;
|
||||||
|
|
||||||
"contrib/math/load.factor" run-file
|
"contrib/math/load.factor" run-file
|
||||||
|
|
||||||
{ "common" "md5" "sha1" }
|
{
|
||||||
[ "contrib/crypto/" swap ".factor" append3 run-file ] each
|
"common"
|
||||||
|
"md5"
|
||||||
"crypto" words [ try-compile ] each
|
"sha1"
|
||||||
|
} [ "contrib/crypto/" swap ".factor" append3 run-file ] each
|
||||||
|
|
|
@ -1,8 +1,21 @@
|
||||||
IN: scratchpad
|
IN: scratchpad
|
||||||
USING: words kernel parser sequences io compiler ;
|
USING: words kernel parser sequences io compiler ;
|
||||||
{ "http-common" "mime" "html-tags" "html" "responder" "httpd" "file-responder" "cont-responder" "browser-responder" "default-responders" "http-client"
|
|
||||||
"test/html" "test/http-client" "test/httpd" "test/url-encoding" }
|
|
||||||
[ "contrib/httpd/" swap ".factor" append3 run-file ] each
|
|
||||||
|
|
||||||
{ "browser-responder" "cont-responder" "httpd" "file-responder" "html" "http-client" "http" "xml" }
|
{
|
||||||
[ words [ try-compile ] each ] each
|
"http-common"
|
||||||
|
"mime"
|
||||||
|
"html-tags"
|
||||||
|
"html"
|
||||||
|
"responder"
|
||||||
|
"httpd"
|
||||||
|
"file-responder"
|
||||||
|
"cont-responder"
|
||||||
|
"browser-responder"
|
||||||
|
"default-responders"
|
||||||
|
"http-client"
|
||||||
|
|
||||||
|
"test/html"
|
||||||
|
"test/http-client"
|
||||||
|
"test/httpd"
|
||||||
|
"test/url-encoding"
|
||||||
|
} [ "contrib/httpd/" swap ".factor" append3 run-file ] each
|
||||||
|
|
|
@ -1,26 +1,26 @@
|
||||||
! Load all contrib libs, compile them, and save a new image.
|
! Load all contrib libs, compile them, and save a new image.
|
||||||
IN: scratchpad
|
IN: scratchpad
|
||||||
USING: alien kernel words sequences parser compiler memory ;
|
USING: alien compiler kernel memory parser sequences words ;
|
||||||
|
|
||||||
! digraph dependencies {
|
{
|
||||||
! // run-file libs in the correct order to avoid repeated run-filing
|
"coroutines"
|
||||||
! aim -> crypto
|
"dlists"
|
||||||
! concurrency -> dlists
|
"splay-trees"
|
||||||
! concurrency -> math
|
} [ "contrib/" swap ".factor" append3 run-file clear ] each
|
||||||
! cont-responder -> httpd
|
|
||||||
! crypto -> math
|
|
||||||
! factor -> x11
|
|
||||||
! space-invaders -> parser-combinators
|
|
||||||
! cont-responder -> parser-combinators
|
|
||||||
! }
|
|
||||||
|
|
||||||
{ "coroutines" "dlists" "splay-trees" }
|
{ "cairo"
|
||||||
[ dup
|
"math"
|
||||||
"contrib/" swap ".factor" append3 run-file
|
"concurrency"
|
||||||
words [ try-compile ] each ] each
|
"crypto"
|
||||||
|
"aim"
|
||||||
{ "cairo" "math" "concurrency" "crypto" "aim" "httpd" "units" "sqlite" "win32" "x11" ! "factory" has a C component, ick.
|
"httpd"
|
||||||
"postgresql" "parser-combinators" "cont-responder" "space-invaders"
|
"units"
|
||||||
} [ "contrib/" swap "/load.factor" append3 run-file ] each
|
"sqlite"
|
||||||
|
"win32"
|
||||||
compile-all
|
"x11"
|
||||||
|
! "factory" has a C component, ick.
|
||||||
|
"postgresql"
|
||||||
|
"parser-combinators"
|
||||||
|
"cont-responder"
|
||||||
|
"space-invaders"
|
||||||
|
} [ "contrib/" swap "/load.factor" append3 run-file clear ] each
|
||||||
|
|
|
@ -1,7 +1,13 @@
|
||||||
IN: scratchpad
|
IN: scratchpad
|
||||||
USING: kernel parser sequences words compiler ;
|
USING: kernel parser sequences words compiler ;
|
||||||
{ "utils" "combinatorics" "analysis" "polynomials" "quaternions" "matrices" "statistics" "numerical-integration" }
|
|
||||||
[ "contrib/math/" swap ".factor" append3 run-file ] each
|
|
||||||
|
|
||||||
"math-contrib" words [ try-compile ] each
|
|
||||||
|
|
||||||
|
{
|
||||||
|
"utils"
|
||||||
|
"combinatorics"
|
||||||
|
"analysis"
|
||||||
|
"polynomials"
|
||||||
|
"quaternions"
|
||||||
|
"matrices"
|
||||||
|
"statistics"
|
||||||
|
"numerical-integration"
|
||||||
|
} [ "contrib/math/" swap ".factor" append3 run-file ] each
|
||||||
|
|
|
@ -1,8 +1,9 @@
|
||||||
IN: scratchpad
|
IN: scratchpad
|
||||||
USING: kernel parser sequences words compiler ;
|
USING: kernel parser sequences words compiler ;
|
||||||
|
|
||||||
{ "lazy" "parser-combinators" "lazy-examples" "tests" }
|
{
|
||||||
[ "contrib/parser-combinators/" swap ".factor" append3 run-file ] each
|
"lazy"
|
||||||
|
"parser-combinators"
|
||||||
{ "lazy" "lazy-examples" "parser-combinators" }
|
"lazy-examples"
|
||||||
[ words [ try-compile ] each ] each
|
"tests"
|
||||||
|
} [ "contrib/parser-combinators/" swap ".factor" append3 run-file ] each
|
||||||
|
|
|
@ -1,8 +1,11 @@
|
||||||
IN: scratchpad
|
IN: scratchpad
|
||||||
USING: alien compiler kernel parser sequences words ;
|
USING: alien compiler kernel parser sequences words ;
|
||||||
|
|
||||||
"postgresql" "libpq" add-simple-library
|
"postgresql" "libpq" add-simple-library
|
||||||
{ "libpq" "postgresql" "postgresql-test" ! "private" ! Put your password in this file
|
|
||||||
|
{
|
||||||
|
"libpq"
|
||||||
|
"postgresql"
|
||||||
|
"postgresql-test"
|
||||||
|
! "private" ! Put your password in this file
|
||||||
} [ "contrib/postgresql/" swap ".factor" append3 run-file ] each
|
} [ "contrib/postgresql/" swap ".factor" append3 run-file ] each
|
||||||
|
|
||||||
"postgresql" words [ try-compile ] each
|
|
||||||
|
|
||||||
|
|
|
@ -1,11 +1,9 @@
|
||||||
IN: scratchpad
|
IN: scratchpad
|
||||||
USING: kernel parser compiler words sequences io ;
|
USING: kernel parser compiler words sequences io ;
|
||||||
|
|
||||||
"contrib/parser-combinators/load.factor" run-file
|
"contrib/parser-combinators/load.factor" run-file
|
||||||
|
|
||||||
{ "cpu-8080" "space-invaders" }
|
{
|
||||||
[ "contrib/space-invaders/" swap ".factor" append3 run-file ] each
|
"cpu-8080"
|
||||||
|
"space-invaders"
|
||||||
{ "cpu-8080" "space-invaders" }
|
} [ "contrib/space-invaders/" swap ".factor" append3 run-file ] each
|
||||||
[ words [ try-compile ] each ] each
|
|
||||||
|
|
||||||
"Use 'run' in the 'space-invaders' vocabulary to start." print
|
|
||||||
|
|
|
@ -1,9 +1,11 @@
|
||||||
IN: scratchpad
|
IN: scratchpad
|
||||||
USING: kernel alien parser compiler words sequences ;
|
USING: kernel alien parser compiler words sequences ;
|
||||||
|
|
||||||
"sqlite" "libsqlite3" add-simple-library
|
"sqlite" "libsqlite3" add-simple-library
|
||||||
|
|
||||||
{ "sqlite" "tuple-db" "test" "tuple-db-tests" }
|
{
|
||||||
[ "contrib/sqlite/" swap ".factor" append3 run-file ] each
|
"sqlite"
|
||||||
|
"tuple-db"
|
||||||
{ "sqlite" "tuple-db" }
|
"test"
|
||||||
[ words [ try-compile ] each ] each
|
"tuple-db-tests"
|
||||||
|
} [ "contrib/sqlite/" swap ".factor" append3 run-file ] each
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
IN: scratchpad
|
IN: scratchpad
|
||||||
USING: kernel parser sequences words compiler ;
|
USING: kernel parser sequences words compiler ;
|
||||||
{ "dimensioned" "si-units" "constants" }
|
|
||||||
[ "contrib/units/" swap ".factor" append3 run-file ] each
|
|
||||||
|
|
||||||
{ "units-internal" "units" "si-units" }
|
|
||||||
[ words [ try-compile ] each ] each
|
|
||||||
|
|
||||||
|
{
|
||||||
|
"dimensioned"
|
||||||
|
"si-units"
|
||||||
|
"constants"
|
||||||
|
} [ "contrib/units/" swap ".factor" append3 run-file ] each
|
||||||
|
|
|
@ -1,11 +1,14 @@
|
||||||
IN: scratchpad
|
IN: scratchpad
|
||||||
USING: alien compiler kernel parser sequences words ;
|
USING: alien compiler kernel parser sequences words ;
|
||||||
|
|
||||||
{ { "user" "user32" }
|
{
|
||||||
{ "kernel" "kernel32" } }
|
{ "user" "user32" }
|
||||||
[ first2 add-simple-library ] each
|
{ "kernel" "kernel32" }
|
||||||
|
} [ first2 add-simple-library ] each
|
||||||
|
|
||||||
{ "utils" "types" "kernel32" "user32" }
|
{
|
||||||
[ "contrib/win32/" swap ".factor" append3 run-file ] each
|
"utils"
|
||||||
|
"types"
|
||||||
"win32" words [ try-compile ] each
|
"kernel32"
|
||||||
|
"user32"
|
||||||
|
} [ "contrib/win32/" swap ".factor" append3 run-file ] each
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
IN: scratchpad
|
IN: scratchpad
|
||||||
USING: kernel parser words compiler sequences ;
|
USING: alien compiler kernel parser sequences words ;
|
||||||
|
|
||||||
"X11" "libX11" add-simple-library
|
"X11" "libX11" add-simple-library
|
||||||
|
|
||||||
|
@ -13,4 +13,4 @@ USING: kernel parser words compiler sequences ;
|
||||||
"gl"
|
"gl"
|
||||||
} [ "contrib/x11/" swap ".factor" append3 run-file ] each
|
} [ "contrib/x11/" swap ".factor" append3 run-file ] each
|
||||||
|
|
||||||
{ "xlib" "x11" } [ words [ try-compile ] each ] each
|
! { "xlib" "x11" } [ words [ try-compile ] each ] each
|
||||||
|
|
|
@ -1,3 +1,9 @@
|
||||||
|
factor (0.79+cvs20060120-1) unstable; urgency=low
|
||||||
|
|
||||||
|
* Refactored wrapper scripts and reduced build time.
|
||||||
|
|
||||||
|
-- Trent Buck <trentbuck@gmail.com> Fri, 20 Jan 2006 12:18:21 +1100
|
||||||
|
|
||||||
factor (0.79+cvs20060119-1) unstable; urgency=low
|
factor (0.79+cvs20060119-1) unstable; urgency=low
|
||||||
|
|
||||||
* Make an extended.image.
|
* Make an extended.image.
|
||||||
|
|
|
@ -28,7 +28,7 @@ build-stamp: configure-stamp
|
||||||
# Build the extended image
|
# Build the extended image
|
||||||
sqlite3 contrib/sqlite/test.db < contrib/sqlite/test.txt
|
sqlite3 contrib/sqlite/test.db < contrib/sqlite/test.txt
|
||||||
$(CC) $(CFLAGS) -L /usr/X11R6/lib -shared -o contrib/factory/simple-error-handler.so contrib/factory/simple-error-handler.c -lX11
|
$(CC) $(CFLAGS) -L /usr/X11R6/lib -shared -o contrib/factory/simple-error-handler.so contrib/factory/simple-error-handler.c -lX11
|
||||||
echo 'USING: image kernel ; "extended.image" save-image 0 exit' | ./runtime basic.image contrib/load.factor
|
echo 'USING: image kernel ; "contrib/load.factor" run-file compile-all "extended.image" save-image 0 exit' | ./runtime basic.image +X8
|
||||||
# Build the documentation
|
# Build the documentation
|
||||||
cd doc && for i in *.eps; do epstopdf $$i; done
|
cd doc && for i in *.eps; do epstopdf $$i; done
|
||||||
cd doc && rubber --pdf theory
|
cd doc && rubber --pdf theory
|
||||||
|
@ -49,11 +49,15 @@ install: build
|
||||||
dh_clean -k
|
dh_clean -k
|
||||||
dh_installdirs
|
dh_installdirs
|
||||||
# Install binary files
|
# Install binary files
|
||||||
install runtime boot.image basic.image extended.image $(CURDIR)/debian/factor/usr/lib/factor
|
install -m 755 -o root -g root runtime $(CURDIR)/debian/factor/usr/lib/factor
|
||||||
|
install -m 644 -o root -g root boot.image basic.image extended.image $(CURDIR)/debian/factor/usr/lib/factor
|
||||||
# Install source files
|
# Install source files
|
||||||
install contrib examples fonts library version.factor $(CURDIR)/debian/factor/usr/share/factor
|
cp -r contrib examples fonts library version.factor $(CURDIR)/debian/factor/usr/share/factor
|
||||||
|
find $(CURDIR)/debian/factor/usr/share/factor -type d -exec chmod 755 {} \;
|
||||||
|
find $(CURDIR)/debian/factor/usr/share/factor -type f -exec chmod 644 {} \;
|
||||||
|
chown -R root.root $(CURDIR)/debian/factor/usr/share/factor
|
||||||
# Install wrapper scripts
|
# Install wrapper scripts
|
||||||
install -m 755 debian/scripts/factor-* $(CURDIR)/debian/factor/usr/bin
|
install -m 755 -o root -g root debian/scripts/factor-* $(CURDIR)/debian/factor/usr/bin
|
||||||
|
|
||||||
binary-indep: build install
|
binary-indep: build install
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue