From d0822992c7afcea76fa9f643d72e1cc4cf17aa3a Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Mon, 5 Jul 2010 23:41:27 -0400 Subject: [PATCH] tools.deploy: fix deployment of apps that use vocab: paths -- regression from recent patch that adds add-vocab-root word --- basis/tools/deploy/deploy-tests.factor | 9 ++++++++- basis/tools/deploy/deploy.factor | 7 ++++--- basis/tools/deploy/shaker/shaker.factor | 5 ++++- basis/tools/deploy/test/19/19.factor | 9 +++++++++ basis/tools/deploy/test/19/authors.txt | 1 + basis/tools/deploy/test/19/deploy.factor | 15 +++++++++++++++ basis/tools/deploy/test/19/license.txt | 20 ++++++++++++++++++++ basis/tools/deploy/test/19/resources.txt | 1 + 8 files changed, 62 insertions(+), 5 deletions(-) create mode 100644 basis/tools/deploy/test/19/19.factor create mode 100644 basis/tools/deploy/test/19/authors.txt create mode 100644 basis/tools/deploy/test/19/deploy.factor create mode 100644 basis/tools/deploy/test/19/license.txt create mode 100644 basis/tools/deploy/test/19/resources.txt diff --git a/basis/tools/deploy/deploy-tests.factor b/basis/tools/deploy/deploy-tests.factor index 4f470af202..7a505ca957 100644 --- a/basis/tools/deploy/deploy-tests.factor +++ b/basis/tools/deploy/deploy-tests.factor @@ -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 diff --git a/basis/tools/deploy/deploy.factor b/basis/tools/deploy/deploy.factor index 9430802803..2babdb2b53 100644 --- a/basis/tools/deploy/deploy.factor +++ b/basis/tools/deploy/deploy.factor @@ -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 ; diff --git a/basis/tools/deploy/shaker/shaker.factor b/basis/tools/deploy/shaker/shaker.factor index b435f5c8e7..941b3e07f2 100755 --- a/basis/tools/deploy/shaker/shaker.factor +++ b/basis/tools/deploy/shaker/shaker.factor @@ -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 ] diff --git a/basis/tools/deploy/test/19/19.factor b/basis/tools/deploy/test/19/19.factor new file mode 100644 index 0000000000..1fc17e38d6 --- /dev/null +++ b/basis/tools/deploy/test/19/19.factor @@ -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 diff --git a/basis/tools/deploy/test/19/authors.txt b/basis/tools/deploy/test/19/authors.txt new file mode 100644 index 0000000000..1901f27a24 --- /dev/null +++ b/basis/tools/deploy/test/19/authors.txt @@ -0,0 +1 @@ +Slava Pestov diff --git a/basis/tools/deploy/test/19/deploy.factor b/basis/tools/deploy/test/19/deploy.factor new file mode 100644 index 0000000000..5cfc34702e --- /dev/null +++ b/basis/tools/deploy/test/19/deploy.factor @@ -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 } +} diff --git a/basis/tools/deploy/test/19/license.txt b/basis/tools/deploy/test/19/license.txt new file mode 100644 index 0000000000..e9cd58a5e4 --- /dev/null +++ b/basis/tools/deploy/test/19/license.txt @@ -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. diff --git a/basis/tools/deploy/test/19/resources.txt b/basis/tools/deploy/test/19/resources.txt new file mode 100644 index 0000000000..8f961ef997 --- /dev/null +++ b/basis/tools/deploy/test/19/resources.txt @@ -0,0 +1 @@ +license.txt