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

tools.deploy: fix deployment of apps that use vocab: paths -- regression from recent patch that adds add-vocab-root word

db4
Slava Pestov 2010-07-05 23:41:27 -04:00
parent 23f2a82d47
commit d0822992c7
8 changed files with 62 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
basis/tools/deploy/deploy-tests.factor
View File

@ -2,9 +2,12 @@ USING: tools.test system io io.encodings.ascii io.pathnames
io.files io.files.info io.files.temp kernel tools.deploy.config
tools.deploy.config.editor tools.deploy.backend math sequences
io.launcher arrays namespaces continuations layouts accessors
urls math.parser io.directories tools.deploy.test ;
urls math.parser io.directories tools.deploy tools.deploy.test
vocabs ;
IN: tools.deploy.tests
[ "no such vocab, fool!" deploy ] [ no-vocab? ] must-fail-with
[ ] [ "hello-world" shake-and-bake 500000 small-enough? ] unit-test
[ ] [ "sudoku" shake-and-bake 800000 small-enough? ] unit-test
@ -127,3 +130,7 @@ os macosx? [
deploy-test-command ascii [ readln ] with-process-reader
"test.image" temp-file =
] unit-test
[ ] [ "resource:license.txt" "license.txt" temp-file copy-file ] unit-test
[ ] [ "tools.deploy.test.19" shake-and-bake run-temp-image ] unit-test

7
basis/tools/deploy/deploy.factor
View File

@ -1,10 +1,11 @@
! Copyright (C) 2007, 2008 Slava Pestov.
! Copyright (C) 2007, 2010 Slava Pestov.
! See http://factorcode.org/license.txt for BSD license.
USING: tools.deploy.backend system vocabs.loader kernel
USING: tools.deploy.backend system vocabs vocabs.loader kernel
combinators tools.deploy.config.editor ;
IN: tools.deploy
: deploy ( vocab -- ) deploy* ;
: deploy ( vocab -- )
dup find-vocab-root [ deploy* ] [ no-vocab ] if ;
: deploy-image-only ( vocab image -- )
[ vm ] 2dip swap dup deploy-config make-deploy-image drop ;

5
basis/tools/deploy/shaker/shaker.factor
View File

@ -21,6 +21,7 @@ QUALIFIED: layouts
QUALIFIED: source-files
QUALIFIED: source-files.errors
QUALIFIED: vocabs
QUALIFIED: vocabs.loader
FROM: alien.libraries.private => >deployed-library-path ;
FROM: namespaces => set ;
FROM: sets => members ;
@ -358,6 +359,7 @@ IN: tools.deploy.shaker
vocabs:dictionary
vocabs:load-vocab-hook
vocabs:vocab-observers
vocabs.loader:add-vocab-root-hook
word
parser-notes
} %
@ -467,7 +469,8 @@ SYMBOL: deploy-vocab
: startup-stripper ( -- )
t "quiet" set-global
f output-stream set-global
V{ "resource:" } clone vocab-roots set-global ;
[ V{ "resource:" } clone vocab-roots set-global ]
"vocabs.loader" startup-hooks get-global set-at ;
: next-method* ( method -- quot )
[ "method-class" word-prop ]

9
basis/tools/deploy/test/19/19.factor Normal file
View File

@ -0,0 +1,9 @@
! Copyright (C) 2010 Slava Pestov.
! See http://factorcode.org/license.txt for BSD license.
USING: io io.files io.encodings.ascii ;
IN: tools.deploy.test.19
: main ( -- )
"vocab:license.txt" ascii file-contents write ;
MAIN: main

1
basis/tools/deploy/test/19/authors.txt Normal file
View File

@ -0,0 +1 @@
Slava Pestov

15
basis/tools/deploy/test/19/deploy.factor Normal file
View File

@ -0,0 +1,15 @@
USING: tools.deploy.config ;
H{
{ deploy-name "tools.deploy.test.19" }
{ deploy-ui? f }
{ deploy-c-types? f }
{ deploy-console? t }
{ deploy-unicode? f }
{ "stop-after-last-window?" t }
{ deploy-io 2 }
{ deploy-reflection 1 }
{ deploy-word-props? f }
{ deploy-math? f }
{ deploy-threads? f }
{ deploy-word-defs? f }
}

20
basis/tools/deploy/test/19/license.txt Normal file
View File

@ -0,0 +1,20 @@
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
1. Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
DEVELOPERS AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

1
basis/tools/deploy/test/19/resources.txt Normal file
View File

@ -0,0 +1 @@
license.txt