Will Salmon pushed to branch willsalmon/simpleOutSource at BuildStream / buildstream
Commits:
-
c2c7c24e
by William Salmon at 2018-10-02T09:47:40Z
5 changed files:
- buildstream/plugins/elements/distutils.yaml
- buildstream/plugins/elements/meson.yaml
- buildstream/plugins/elements/pip.yaml
- buildstream/plugins/elements/qmake.yaml
- tests/format/variables.py
Changes:
| ... | ... | @@ -8,7 +8,7 @@ variables: |
| 8 | 8 |
|
| 9 | 9 |
python-build: |
|
| 10 | 10 |
|
| 11 |
- %{python} setup.py build
|
|
| 11 |
+ %{python} %{conf-root}/setup.py build
|
|
| 12 | 12 |
|
| 13 | 13 |
install-args: |
|
| 14 | 14 |
|
| ... | ... | @@ -17,7 +17,7 @@ variables: |
| 17 | 17 |
|
| 18 | 18 |
python-install: |
|
| 19 | 19 |
|
| 20 |
- %{python} setup.py install %{install-args}
|
|
| 20 |
+ %{python} %{conf-root}/setup.py install %{install-args}
|
|
| 21 | 21 |
|
| 22 | 22 |
|
| 23 | 23 |
config:
|
| ... | ... | @@ -28,7 +28,7 @@ variables: |
| 28 | 28 |
--mandir=%{mandir} \
|
| 29 | 29 |
--infodir=%{infodir} %{meson-extra} %{meson-global} %{meson-local}
|
| 30 | 30 |
|
| 31 |
- meson: meson %{build-dir} %{meson-args}
|
|
| 31 |
+ meson: meson %{conf-root} %{build-dir} %{meson-args}
|
|
| 32 | 32 |
|
| 33 | 33 |
ninja: |
|
| 34 | 34 |
ninja -j ${NINJAJOBS} -C %{build-dir}
|
| ... | ... | @@ -14,7 +14,7 @@ config: |
| 14 | 14 |
#
|
| 15 | 15 |
install-commands:
|
| 16 | 16 |
- |
|
| 17 |
- %{pip} install --no-deps --root=%{install-root} --prefix=%{prefix} .
|
|
| 17 |
+ %{pip} install --no-deps --root=%{install-root} --prefix=%{prefix} %{conf-root}
|
|
| 18 | 18 |
|
| 19 | 19 |
# Commands for stripping debugging information out of
|
| 20 | 20 |
# installed binaries
|
| ... | ... | @@ -2,7 +2,7 @@ |
| 2 | 2 |
|
| 3 | 3 |
variables:
|
| 4 | 4 |
|
| 5 |
- qmake: qmake -makefile
|
|
| 5 |
+ qmake: qmake -makefile %{conf-root}
|
|
| 6 | 6 |
make: make
|
| 7 | 7 |
make-install: make -j1 INSTALL_ROOT="%{install-root}" install
|
| 8 | 8 |
|
| ... | ... | @@ -22,7 +22,7 @@ DATA_DIR = os.path.join( |
| 22 | 22 |
"cmake -B_builddir -H\".\" -G\"Unix Makefiles\" " + "-DCMAKE_INSTALL_PREFIX:PATH=\"/usr\" \\\n" +
|
| 23 | 23 |
"-DCMAKE_INSTALL_LIBDIR=lib "),
|
| 24 | 24 |
('distutils.bst', 'python-install',
|
| 25 |
- "python3 setup.py install --prefix \"/usr\" \\\n" +
|
|
| 25 |
+ "python3 ./setup.py install --prefix \"/usr\" \\\n" +
|
|
| 26 | 26 |
"--root \"/buildstream-install\""),
|
| 27 | 27 |
('makemaker.bst', 'configure', "perl Makefile.PL PREFIX=/buildstream-install/usr"),
|
| 28 | 28 |
('modulebuild.bst', 'configure', "perl Build.PL --prefix \"/buildstream-install/usr\""),
|
| ... | ... | @@ -48,7 +48,7 @@ def test_defaults(cli, datafiles, tmpdir, target, varname, expected): |
| 48 | 48 |
"cmake -B_builddir -H\".\" -G\"Ninja\" " + "-DCMAKE_INSTALL_PREFIX:PATH=\"/opt\" \\\n" +
|
| 49 | 49 |
"-DCMAKE_INSTALL_LIBDIR=lib "),
|
| 50 | 50 |
('distutils.bst', 'python-install',
|
| 51 |
- "python3 setup.py install --prefix \"/opt\" \\\n" +
|
|
| 51 |
+ "python3 ./setup.py install --prefix \"/opt\" \\\n" +
|
|
| 52 | 52 |
"--root \"/custom/install/root\""),
|
| 53 | 53 |
('makemaker.bst', 'configure', "perl Makefile.PL PREFIX=/custom/install/root/opt"),
|
| 54 | 54 |
('modulebuild.bst', 'configure', "perl Build.PL --prefix \"/custom/install/root/opt\""),
|