Skip to content

Commit c18efc9

Browse files
authored
Merge pull request ros2#865 from ros2/windows_src_update
Updates Windows installation from source
2 parents 62ff4b3 + 267381b commit c18efc9

File tree

2 files changed

+9
-15
lines changed

2 files changed

+9
-15
lines changed

source/Installation/Foxy/Windows-Development-Setup.rst

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -131,15 +131,6 @@ You could set it permanently with ``setx -m Qt5_DIR C:\Qt\5.15.0\msvc2019_64`` i
131131

132132
This path might change based on which MSVC version you're using or if you installed it to a different directory.
133133

134-
RQt dependencies
135-
~~~~~~~~~~~~~~~~
136-
137-
.. code-block:: bash
138-
139-
> pip install -U pydot PyQt5
140-
141-
Follow the steps for `Installing Graphviz <Foxy_windows-install-binary-installing-rqt-dependencies>` on the Binary Installation page.
142-
143134
Get the ROS 2 code
144135
------------------
145136

@@ -199,7 +190,7 @@ To build the ``\dev\ros2_foxy`` folder tree:
199190

200191
.. note::
201192

202-
If you are doing a debug build use ``python_d path\to\colcon_executable`` ``colcon``.
193+
If you are doing a debug build use ``python_d path\to\colcon_executable build --cmake-args -DCMAKE_BUILD_TYPE=Debug``.
203194
See `Extra stuff for debug mode`_ for more info on running Python code in debug builds on Windows.
204195

205196
Environment setup
@@ -326,7 +317,7 @@ If you want to be able to run all the tests in Debug mode, you'll need to instal
326317
.. code-block:: bash
327318
328319
> python_d
329-
> import _ctypes
320+
>>> import _ctypes
330321
331322
* Once you have verified the operation of ``python_d``, it is necessary to reinstall a few dependencies with the debug-enabled libraries:
332323
@@ -341,8 +332,8 @@ If you want to be able to run all the tests in Debug mode, you'll need to instal
341332
342333
> python_d
343334
# No import errors should appear when executing the following lines
344-
> from lxml import etree
345-
> import numpy
335+
>>> from lxml import etree
336+
>>> import numpy
346337
347338
* When you wish to return to building release binaries, it is necessary to uninstall the debug variants and use the release variants:
348339
@@ -351,11 +342,12 @@ If you want to be able to run all the tests in Debug mode, you'll need to instal
351342
> python -m pip uninstall numpy lxml
352343
> python -m pip install numpy lxml
353344
354-
* To create executables python scripts(.exe), python_d should be used to invoke colcon
345+
* To create executables python scripts(.exe), python_d should be used to invoke colcon, along with the corresponding CMake build type.
346+
If you installed colcon using pip, the path to the colcon executable can be found with ``pip show colcon-core``.
355347
356348
.. code-block:: bash
357349
358-
> python_d path\to\colcon_executable build
350+
> python_d path\to\colcon_executable build --merge-install --cmake-args -DCMAKE_BUILD_TYPE=Debug
359351
360352
* Hooray, you're done!
361353

source/Installation/Foxy/Windows-Install-Binary.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,8 @@ To run rqt_graph, you'll need `Graphviz <https://graphviz.gitlab.io/>`__.
166166
167167
> choco install graphviz
168168
169+
You will need to append the Graphviz bin folder ``C:\Program Files (x86)\GraphvizX.XX\bin`` to your PATH, by navigating to "Edit the system environment variables" as described above.
170+
169171
Downloading ROS 2
170172
-----------------
171173

0 commit comments

Comments
 (0)