Will Salmon pushed to branch willsalmon/simpleOutSource at BuildStream / buildstream
Commits:
-
0d5ef0e7
by William Salmon at 2018-09-10T14:00:09Z
5 changed files:
- buildstream/data/projectconfig.yaml
- doc/examples/cmake/elements/hello.bst
- doc/examples/out-of-source-autotool-in-source-tree/elements/hello.bst
- doc/examples/out-of-source-build-helloworld/elements/hello.bst
- tests/format/variables.py
Changes:
| ... | ... | @@ -56,7 +56,7 @@ variables: |
| 56 | 56 |
# vars for build elements.
|
| 57 | 57 |
source-directory: .
|
| 58 | 58 |
source-subdir: .
|
| 59 |
- conf-root: "%{build-root}/%{source-directory}/%{source-subdir}/"
|
|
| 59 |
+ conf-root: "%{source-directory}/%{source-subdir}/"
|
|
| 60 | 60 |
|
| 61 | 61 |
# Indicates the build installation directory in the sandbox
|
| 62 | 62 |
install-root: /buildstream-install
|
| ... | ... | @@ -10,5 +10,5 @@ sources: |
| 10 | 10 |
directory: Source
|
| 11 | 11 |
variables:
|
| 12 | 12 |
command-subdir: build
|
| 13 |
- source-directory: Source
|
|
| 13 |
+ source-directory: "%{build-root}/Source"
|
|
| 14 | 14 |
|
| ... | ... | @@ -11,7 +11,7 @@ sources: |
| 11 | 11 |
ref: 80da43bb5665596ee389e6d8b64b4f122ea4b92a685b1dbd813cd1f0e0c2d83f
|
| 12 | 12 |
url: gnu:automake-1.16.tar.gz
|
| 13 | 13 |
variables:
|
| 14 |
- source-directory: SourB
|
|
| 14 |
+ source-directory: "%{build-root}/SourB"
|
|
| 15 | 15 |
source-subdir: doc/amhello
|
| 16 | 16 |
command-subdir: build
|
| 17 | 17 |
|
| ... | ... | @@ -10,7 +10,7 @@ sources: |
| 10 | 10 |
kind: local
|
| 11 | 11 |
path: files/hello
|
| 12 | 12 |
variables:
|
| 13 |
- source-directory: Source
|
|
| 13 |
+ source-directory: "%{build-root}/Source"
|
|
| 14 | 14 |
source-subdir: .
|
| 15 | 15 |
command-subdir: build
|
| 16 | 16 |
|
| ... | ... | @@ -19,8 +19,7 @@ DATA_DIR = os.path.join( |
| 19 | 19 |
@pytest.mark.parametrize("target,varname,expected", [
|
| 20 | 20 |
('autotools.bst', 'make-install', "make -j1 DESTDIR=\"/buildstream-install\" install"),
|
| 21 | 21 |
('cmake.bst', 'cmake',
|
| 22 |
- "cmake -B_builddir -H\"/buildstream/pony/cmake.bst/././\" -G\"Unix Makefiles\" " +
|
|
| 23 |
- "-DCMAKE_INSTALL_PREFIX:PATH=\"/usr\" \\\n" +
|
|
| 22 |
+ "cmake -B_builddir -H\"././\" -G\"Unix Makefiles\" " + "-DCMAKE_INSTALL_PREFIX:PATH=\"/usr\" \\\n" +
|
|
| 24 | 23 |
"-DCMAKE_INSTALL_LIBDIR=lib "),
|
| 25 | 24 |
('distutils.bst', 'python-install',
|
| 26 | 25 |
"python3 setup.py install --prefix \"/usr\" \\\n" +
|
| ... | ... | @@ -46,8 +45,7 @@ def test_defaults(cli, datafiles, tmpdir, target, varname, expected): |
| 46 | 45 |
@pytest.mark.parametrize("target,varname,expected", [
|
| 47 | 46 |
('autotools.bst', 'make-install', "make -j1 DESTDIR=\"/custom/install/root\" install"),
|
| 48 | 47 |
('cmake.bst', 'cmake',
|
| 49 |
- "cmake -B_builddir -H\"/buildstream/pony/cmake.bst/././\" -G\"Ninja\" " +
|
|
| 50 |
- "-DCMAKE_INSTALL_PREFIX:PATH=\"/opt\" \\\n" +
|
|
| 48 |
+ "cmake -B_builddir -H\"././\" -G\"Ninja\" " + "-DCMAKE_INSTALL_PREFIX:PATH=\"/opt\" \\\n" +
|
|
| 51 | 49 |
"-DCMAKE_INSTALL_LIBDIR=lib "),
|
| 52 | 50 |
('distutils.bst', 'python-install',
|
| 53 | 51 |
"python3 setup.py install --prefix \"/opt\" \\\n" +
|