Javier Jardón pushed to branch master at BuildStream / buildstream
Commits:
-
7ceacfea
by William Salmon at 2018-07-26T14:32:49Z
-
8c9fd9e4
by Javier Jardón at 2018-07-26T15:32:16Z
7 changed files:
- HACKING.rst
- doc/source/examples/flatpak-autotools.rst
- doc/source/format_declaring.rst
- doc/source/format_project.rst
- doc/source/install_docker.rst
- doc/source/install_linux_distro.rst
- doc/source/tutorial/autotools.rst
Changes:
... | ... | @@ -294,7 +294,7 @@ committed with that. |
294 | 294 |
To do this, first ensure you have ``click_man`` installed, possibly
|
295 | 295 |
with::
|
296 | 296 |
|
297 |
- pip install --user click_man
|
|
297 |
+ pip3 install --user click_man
|
|
298 | 298 |
|
299 | 299 |
Then, in the toplevel directory of buildstream, run the following::
|
300 | 300 |
|
... | ... | @@ -450,7 +450,7 @@ To run the tests, just type:: |
450 | 450 |
At the toplevel.
|
451 | 451 |
|
452 | 452 |
When debugging a test, it can be desirable to see the stdout
|
453 |
-and stderr generated by a test, to do this use the --addopts
|
|
453 |
+and stderr generated by a test, to do this use the ``--addopts``
|
|
454 | 454 |
function to feed arguments to pytest as such::
|
455 | 455 |
|
456 | 456 |
./setup.py test --addopts -s
|
... | ... | @@ -530,7 +530,7 @@ tool. |
530 | 530 |
|
531 | 531 |
Python provides `cProfile <https://docs.python.org/3/library/profile.html>`_
|
532 | 532 |
which gives you a list of all functions called during execution and how much
|
533 |
-time was spent in each function. Here is an example of running `bst --help`
|
|
533 |
+time was spent in each function. Here is an example of running ``bst --help``
|
|
534 | 534 |
under cProfile:
|
535 | 535 |
|
536 | 536 |
python3 -m cProfile -o bst.cprofile -- $(which bst) --help
|
... | ... | @@ -58,7 +58,7 @@ it's important to note two things: |
58 | 58 |
* **source**: We only want to extract the ``files/`` directory from the SDK,
|
59 | 59 |
|
60 | 60 |
This is becase Flatpak runtimes dont start at the root of the OSTree checkout,
|
61 |
- instead the actual files start in the ``files//`` subdirectory
|
|
61 |
+ instead the actual files start in the ``files/`` subdirectory
|
|
62 | 62 |
|
63 | 63 |
* **target**: The content we've extracted should be staged at ``/usr``
|
64 | 64 |
|
... | ... | @@ -400,7 +400,7 @@ dependency and that all referenced variables are declared, the following is fine |
400 | 400 |
It should be noted that variable resolution only happens after all
|
401 | 401 |
:ref:`Element Composition <format_composition>` has already taken place.
|
402 | 402 |
|
403 |
- This is to say that overriding ``%{version}`` at a higher priority will effect
|
|
403 |
+ This is to say that overriding ``%{version}`` at a higher priority will affect
|
|
404 | 404 |
the final result of ``%{release-text}``.
|
405 | 405 |
|
406 | 406 |
|
... | ... | @@ -548,7 +548,7 @@ The defaults environment for the build sandbox is defined here. |
548 | 548 |
PATH: /usr/bin:/bin:/usr/sbin:/sbin
|
549 | 549 |
|
550 | 550 |
Additionally, the special ``environment-nocache`` list which specifies
|
551 |
-which environment variables do not effect build output, and are thus
|
|
551 |
+which environment variables do not affect build output, and are thus
|
|
552 | 552 |
not considered in the calculation of artifact keys can be defined here.
|
553 | 553 |
|
554 | 554 |
.. code:: yaml
|
... | ... | @@ -558,7 +558,7 @@ not considered in the calculation of artifact keys can be defined here. |
558 | 558 |
|
559 | 559 |
Note that the ``environment-nocache`` list only exists so that we can
|
560 | 560 |
control parameters such as ``make -j ${MAXJOBS}``, allowing us to control
|
561 |
-the number of jobs for a given build without effecting the resulting
|
|
561 |
+the number of jobs for a given build without affecting the resulting
|
|
562 | 562 |
cache key.
|
563 | 563 |
|
564 | 564 |
|
... | ... | @@ -38,8 +38,8 @@ be able to integrate with Bash tab-completion if you invoke it in this way. |
38 | 38 |
|
39 | 39 |
Two Docker volumes are set up by the ``bst-here`` script:
|
40 | 40 |
|
41 |
- * buildstream-cache -- mounted at ``~/.cache/buildstream``
|
|
42 |
- * buildstream-config -- mounted at ``~/.config/``
|
|
41 |
+ * ``buildstream-cache --`` mounted at ``~/.cache/buildstream``
|
|
42 |
+ * ``buildstream-config --`` mounted at ``~/.config/``
|
|
43 | 43 |
|
44 | 44 |
These are necessary so that your BuildStream cache and configuration files
|
45 | 45 |
persist between invocations of ``bst-here``.
|
... | ... | @@ -77,17 +77,17 @@ setup as described `here <https://backports.debian.org/Instructions/>`_ |
77 | 77 |
|
78 | 78 |
By adding the following line to your sources.list::
|
79 | 79 |
|
80 |
- deb http://ftp.debian.org/debian stretch-backports main
|
|
80 |
+ deb http://deb.debian.org/debian stretch-backports main
|
|
81 | 81 |
|
82 | 82 |
And then running::
|
83 | 83 |
|
84 |
- sudo apt-get update
|
|
84 |
+ sudo apt update
|
|
85 | 85 |
|
86 | 86 |
At this point you should be able to get the system requirements for the default plugins with::
|
87 | 87 |
|
88 |
- sudo apt-get install \
|
|
88 |
+ sudo apt install \
|
|
89 | 89 |
bzr git lzip patch python3-arpy python3-gi
|
90 |
- sudo apt-get install -t stretch-backports \
|
|
90 |
+ sudo apt install -t stretch-backports \
|
|
91 | 91 |
gir1.2-ostree-1.0 ostree
|
92 | 92 |
|
93 | 93 |
Buster or Sid
|
... | ... | @@ -177,8 +177,8 @@ checkout:: |
177 | 177 |
cd /path/to/buildstream
|
178 | 178 |
git pull --rebase
|
179 | 179 |
|
180 |
-If you did not specify the ``-e`` option at install time, you will
|
|
181 |
-need to cleanly reinstall BuildStream::
|
|
180 |
+If you did not specify the ``-e`` option at install time or the dependancies
|
|
181 |
+have changed, you will need to cleanly reinstall BuildStream::
|
|
182 | 182 |
|
183 | 183 |
pip3 uninstall buildstream
|
184 | 184 |
cd /path/to/buildstream
|
... | ... | @@ -109,7 +109,7 @@ changes the output. |
109 | 109 |
|
110 | 110 |
Observe where the variables are declared in the :ref:`builtin defaults
|
111 | 111 |
<project_builtin_defaults>` and :mod:`autotools <elements.autotools>` element
|
112 |
-documentation, and how overriding these affects the resolved set of variables.
|
|
112 |
+documentation, and how overriding these effects the resolved set of variables.
|
|
113 | 113 |
|
114 | 114 |
|
115 | 115 |
Using the project
|