From 57f47a844c22a37c63892190eb2c7b3951b512a9 Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Wed, 30 Sep 2020 12:33:22 +0200 Subject: [PATCH 1/4] Use https for key download Signed-off-by: Jose Luis Rivero --- tutorials/02_installation.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tutorials/02_installation.md b/tutorials/02_installation.md index da8cf5c46..53db97931 100644 --- a/tutorials/02_installation.md +++ b/tutorials/02_installation.md @@ -22,7 +22,7 @@ sudo sh -c 'echo "deb http://packages.osrfoundation.org/gazebo/ubuntu-stable `ls Setup keys: ``` -wget http://packages.osrfoundation.org/gazebo.key -O - | sudo apt-key add - +wget https://packages.osrfoundation.org/gazebo.key -O - | sudo apt-key add - ``` Install Ignition Transport, `apt-get` can be used to install `ignition-transport`: From 8b5ac8de1a8f8d77c83304bca2fda813976b2f9f Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Wed, 30 Sep 2020 12:33:44 +0200 Subject: [PATCH 2/4] Update versions to modern ones Signed-off-by: Jose Luis Rivero --- tutorials/02_installation.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tutorials/02_installation.md b/tutorials/02_installation.md index 53db97931..f79efdd34 100644 --- a/tutorials/02_installation.md +++ b/tutorials/02_installation.md @@ -31,7 +31,7 @@ Install Ignition Transport, `apt-get` can be used to install `ignition-transport $ sudo apt install libignition-transport<#>-dev ``` -Be sure to replace `<#>` with a number value, such as `1` or `2`, depending on +Be sure to replace `<#>` with a number value, such as `8` or `9`, depending on which version you need. ## Mac OS X From 4945d0de5d7d86794af9d7ca096af3b9663eeb30 Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Wed, 30 Sep 2020 12:34:53 +0200 Subject: [PATCH 3/4] Remove first person from instructions Signed-off-by: Jose Luis Rivero --- tutorials/02_installation.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tutorials/02_installation.md b/tutorials/02_installation.md index f79efdd34..14dcf58d3 100644 --- a/tutorials/02_installation.md +++ b/tutorials/02_installation.md @@ -42,7 +42,7 @@ tap](https://github.com/osrf/homebrew-simulation). Ignition Transport is straightforward to install on Mac OS X 10.9 (Mavericks) or higher. Installation on older versions requires changing the default standard library and rebuilding dependencies due to the use of c++11. For -purposes of this documentation, I will assume OS X 10.9 or greater is in +purposes of this documentation, Assuming OS X 10.9 or greater is in use. Here are the instructions: Install homebrew, which should also prompt you to install the XCode From 08c1df622d47b1803fd2931b9dc683c42ae81843 Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Wed, 30 Sep 2020 12:40:16 +0200 Subject: [PATCH 4/4] Update Windows: dependencies, Visual Studio and Windows versions. Signed-off-by: Jose Luis Rivero --- tutorials/02_installation.md | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/tutorials/02_installation.md b/tutorials/02_installation.md index 14dcf58d3..2ab3d212a 100644 --- a/tutorials/02_installation.md +++ b/tutorials/02_installation.md @@ -59,11 +59,11 @@ brew tap osrf/simulation brew install ignition-transport9 ``` -## Windows +## Windows 64bits -At this moment, compilation has been tested on Windows 7 and 8.1 and is +At this moment, compilation has been tested on Windows 8.1 and 10 and is supported when using [Visual Studio -2013](https://www.visualstudio.com/downloads/). Patches for other +2019](https://www.visualstudio.com/downloads/). Patches for other versions are welcome. This installation procedure uses pre-compiled binaries in a local @@ -84,13 +84,12 @@ cd ign-ws Download the following dependencies into that directory: * [cppzmq](http://packages.osrfoundation.org/win32/deps/cppzmq-noarch.zip) - * [Protobuf 2.6.0 (32-bit)](http://packages.osrfoundation.org/win32/deps/protobuf-2.6.0-win32-vc12.zip) - * [Protobuf 2.6.0 (64-bit)](http://packages.osrfoundation.org/win32/deps/protobuf-2.6.0-win64-vc12.zip) + * [Protobuf 3.4.1 (https://s3.amazonaws.com/osrf-distributions/win32/deps/protobuf-3.4.1-vc15-x64-dll-MD.zip) + * [sqlite] 3.22.0 (https://s3.amazonaws.com/osrf-distributions/win32/deps/sqlite-3.22.0-vc15-Win64-dll-MD.zip) Choose one of these options: - * [ZeroMQ 4.0.4 (32-bit)](http://packages.osrfoundation.org/win32/deps/zeromq-4.0.4-x86.zip) - * [ZeroMQ 4.0.4 (64-bit)](http://packages.osrfoundation.org/win32/deps/zeromq-4.0.4-amd64.zip) + * [ZeroMQ 4.2.3](https://s3.amazonaws.com/osrf-distributions/win32/deps/libzmq-4.2.3_cppzmq-4.2.2_vc15-x64-dll-MD.zip) Unzip each of them. The Windows unzip utility will likely create an incorrect directory structure, where a directory with the name of the @@ -120,7 +119,7 @@ mkdir build In a Windows Command Prompt, load your compiler setup, e.g.: ``` -"C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" amd64 +"C:\Program Files (x86)\Microsoft Visual Studio 19.0\VC\vcvarsall.bat" x86_amd64 ``` In the Windows Command Prompt, configure and build: @@ -157,7 +156,7 @@ cd ign-transport In a Windows Command Prompt, load your compiler setup, e.g.: ``` -"C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" amd64 +"C:\Program Files (x86)\Microsoft Visual Studio 19.0\VC\vcvarsall.bat" x86_amd64 ``` Configure and build: @@ -180,7 +179,7 @@ the path, even if it contains spaces. E.g., if you're working in `C:\My Stuff\ign-ws`: ``` -set PATH %PATH%;C:\My Stuff\ign-ws\ZeroMQ 4.0.4\bin +set PATH %PATH%;C:\My Stuff\ign-ws\ZeroMQ 4.2.3\bin ``` Now build the examples: