summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Maw <richard.maw@gmail.com>2014-07-18 15:10:25 (GMT)
committerRichard Maw <richard.maw@codethink.co.uk>2014-07-22 14:55:27 (GMT)
commitfc5bb595b123db557d2b10a8d570d25e14119686 (patch)
tree43ef4512d031383af62433df2578395693fb515b
parente86eae318a83a429a0f27954866217ebf2efa6a5 (diff)
downloadmorph-fc5bb595b123db557d2b10a8d570d25e14119686.tar.gz
yarns: Make test-chunk use files from its source repo
It is entirely possible that we could accidentally give chunks that use morphologies from the definitions repository, the definitions repository to build from, rather than the source repository.
-rw-r--r--yarns/implementations.yarn19
1 files changed, 16 insertions, 3 deletions
diff --git a/yarns/implementations.yarn b/yarns/implementations.yarn
index ce229d6..5b5b172 100644
--- a/yarns/implementations.yarn
+++ b/yarns/implementations.yarn
@@ -156,7 +156,7 @@ another to hold a chunk.
# autotools configuration, they go into /libexec.
- |
- install -D /dev/null "$DESTDIR/$PREFIX/libexec/test-bin"
+ install -D test-bin "$DESTDIR/$PREFIX/libexec/test-bin"
# As well as run-time libraries, there's development files. For C
# this is headers, which describe the API of the libraries, which
@@ -169,7 +169,7 @@ another to hold a chunk.
# `-m` option.
- |
- install -D -m 644 /dev/null "$DESTDIR/$PREFIX/include/test.h"
+ install -D -m 644 test.h "$DESTDIR/$PREFIX/include/test.h"
# `pkg-config` is a standard way to locate libraries and get the
# compiler flags needed to build with the library. It's also used
@@ -179,7 +179,7 @@ another to hold a chunk.
- |
for pkgdir in lib lib32 lib64 share; do
- install -D -m 644 /dev/null \
+ install -D -m 644 test.pc \
"$DESTDIR/$PREFIX/$pkgdir/pkgconfig/test.pc"
done
@@ -241,6 +241,19 @@ another to hold a chunk.
run_in "$DATADIR/gits/morphs" git tag -a "test-tag" -m "Tagging test-tag"
run_in "$DATADIR/gits/test-chunk" git init .
+ cat > "$DATADIR/gits/test-chunk/test-bin" <<'EOF'
+ #!/bin/sh
+ echo Hello World
+ EOF
+ cat > "$DATADIR/gits/test-chunk/test.h" <<'EOF'
+ int foo(void);
+ EOF
+ cat > "$DATADIR/gits/test-chunk/test.pc" <<'EOF'
+ prefix=/usr
+ includedir=${prefix}/include
+ Name: test
+ Cflags: -I{includedir}
+ EOF
run_in "$DATADIR/gits/test-chunk" git add .
run_in "$DATADIR/gits/test-chunk" git commit --allow-empty -m Initial.