From 0cc3de60d6282d22108ea59f169a0749be5e59ea Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Mon, 25 Feb 2013 10:13:34 +0000 Subject: Add 'prefix' property for chunks within strata Morph no longer supports setting the prefix using the --prefix argument / setting. This was only used in tests and during bootstrap. If a chunk build-depends on a chunk within a stratum which has a custom prefix, that prefix is appended to the PATH in the build environment. --- tests.build/build-system-python-distutils.script | 25 +++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) (limited to 'tests.build/build-system-python-distutils.script') diff --git a/tests.build/build-system-python-distutils.script b/tests.build/build-system-python-distutils.script index cebb9f84..a0469528 100755 --- a/tests.build/build-system-python-distutils.script +++ b/tests.build/build-system-python-distutils.script @@ -51,7 +51,30 @@ git add hello.morph git commit --quiet -m 'convert hello into a python project' -"$SRCDIR/scripts/test-morph" build-morphology --prefix= \ + +# Set 'prefix' of hello to something custom +cd "$DATADIR/morphs-repo" +cat < hello-stratum.morph +{ + "name": "hello-stratum", + "kind": "stratum", + "chunks": [ + { + "name": "hello", + "repo": "test:chunk-repo", + "ref": "farrokh", + "build-depends": [], + "build-mode": "test", + "prefix": "" + } + ] +} +EOF +git add hello-stratum.morph +git commit -q -m "Set custom install prefix for hello" + + +"$SRCDIR/scripts/test-morph" build-morphology \ test:morphs-repo master hello-system for chunk in "$DATADIR/cache/artifacts/"*.chunk.* -- cgit v1.2.1