From 02739afc65d741a85af5e1e37c92e275f3bf66a4 Mon Sep 17 00:00:00 2001
From: Ashton Larkin <42042756+adlarkin@users.noreply.github.com>
Date: Mon, 12 Oct 2020 16:23:36 -0400
Subject: [PATCH 1/2] updated source build instructions for ign-gazebo2 (#403)

Signed-off-by: Ashton Larkin <ashton@openrobotics.org>
---
 README.md | 32 +++++++++++++++++++++-----------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index 419543d600..b0474420f2 100644
--- a/README.md
+++ b/README.md
@@ -137,13 +137,7 @@ for dependency installation instructions for each supported operating system.
 
 **[Ubuntu Bionic](http://releases.ubuntu.com/18.04/)**
 
-1. Install third-party libraries:
-
-    ```
-    sudo apt-get -y install cmake build-essential curl cppcheck g++-8 libbenchmark-dev libgflags-dev doxygen ruby-ronn libtinyxml2-dev libtinyxml-dev software-properties-common libeigen3-dev qtdeclarative5-models-plugin
-    ```
-
-2. Install required Ignition libraries:
+1. Enable the Ignition software repositories:
 
     ```
     sudo sh -c 'echo "deb http://packages.osrfoundation.org/gazebo/ubuntu-stable `lsb_release -cs` main" > /etc/apt/sources.list.d/gazebo-stable.list'
@@ -161,8 +155,16 @@ for dependency installation instructions for each supported operating system.
     sudo apt-get update
     ```
 
+2. Install package dependencies:
+
     ```
-    sudo apt-get -y install libignition-cmake2-dev libignition-common3-dev libignition-math6-eigen3-dev libignition-plugin-dev libignition-physics-dev libignition-rendering2-dev libignition-tools-dev libignition-transport7-dev libignition-gui2-dev libignition-msgs4-dev libsdformat8-dev
+    git clone https://github.com/ignitionrobotics/ign-gazebo -b ign-gazebo2
+    ```
+
+    ```
+    export SYSTEM_VERSION=bionic
+    sudo apt -y install \
+      $(sort -u $(find . -iname 'packages-'$SYSTEM_VERSION'.apt' -o -iname 'packages.apt') | tr '\n' ' ')
     ```
 
 ### Building from source
@@ -173,17 +175,21 @@ for dependency installation instructions for each supported operating system.
 
     * Ubuntu
 
+        ```
+        sudo apt-get install g++-8
+        ```
+
         ```
         sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-8 800 --slave /usr/bin/g++ g++ /usr/bin/g++-8 --slave /usr/bin/gcov gcov /usr/bin/gcov-8
         ```
 
-1. Clone the repository.
+3. Clone the repository if you haven't already.
 
     ```
     git clone https://github.com/ignitionrobotics/ign-gazebo -b ign-gazebo2
     ```
 
-2. Configure and  build.
+4. Configure and build.
 
     ```
     cd ign-gazebo
@@ -245,7 +251,7 @@ You can also generate the documentation from a clone of this repository by follo
 
 Follow these steps to run tests and static code analysis in your clone of this repository.
 
-1. Follow the [source install instruction](#source-install).
+1. Follow the [source install instructions](#source-install).
 
 2. Run tests.
 
@@ -255,6 +261,10 @@ Follow these steps to run tests and static code analysis in your clone of this r
 
 3. Static code checker.
 
+    ```
+    sudo apt-get update && sudo apt-get -y install cppcheck
+    ```
+
     ```
     make codecheck
     ```

From 8856e728aece25678750a4b14eadecef17da342c Mon Sep 17 00:00:00 2001
From: Mabel Zhang <mabel@openrobotics.org>
Date: Wed, 21 Oct 2020 16:48:59 -0400
Subject: [PATCH 2/2] document deprecation of playback <path> SDF param (#425)

Signed-off-by: Mabel Zhang <mabel@openrobotics.org>
---
 Migration.md                     | 3 +++
 examples/worlds/log_playback.sdf | 5 +++++
 tutorials/log.md                 | 3 +++
 3 files changed, 11 insertions(+)

diff --git a/Migration.md b/Migration.md
index 5d686ba8bd..d47b4b02be 100644
--- a/Migration.md
+++ b/Migration.md
@@ -32,6 +32,9 @@ Gazebo 2+ for playback. [BitBucket pull request
 #257](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gazebo/pull-requests/257)
 added an SDF message to the start of log files.
 
+* Log playback using `<path>` SDF parameter is deprecated. Use `--playback`
+  command line argument instead.
+
 ## Ignition Gazebo 1.0.2 to 1.1.0
 
 * All headers in `gazebo/network` are no longer installed.
diff --git a/examples/worlds/log_playback.sdf b/examples/worlds/log_playback.sdf
index 56a25e9032..9194fb432f 100644
--- a/examples/worlds/log_playback.sdf
+++ b/examples/worlds/log_playback.sdf
@@ -2,6 +2,9 @@
 <!--
   Log playback demo.
 
+  This file will be removed in Ignition Dome. Use the command line argument
+  for playback instead.
+
   Running this world will playback log files located at /tmp/log.
 
   You can record such a log by running one of the `log_record*.sdf` files,
@@ -15,6 +18,8 @@
     <plugin
       filename='libignition-gazebo-log-system.so'
       name='ignition::gazebo::systems::LogPlayback'>
+      <!-- Deprecation warning: This parameter will be removed in Ignition Dome.
+           Use the command line argument for playback instead. -->
       <path>/tmp/log</path>
     </plugin>
   </world>
diff --git a/tutorials/log.md b/tutorials/log.md
index d120bf2471..16875c7c43 100644
--- a/tutorials/log.md
+++ b/tutorials/log.md
@@ -114,6 +114,9 @@ directory specified to record:
 
 ### From plugin in SDF
 
+This feature is deprecated and will be removed in Ignition Dome.
+Use the command line argument instead.
+
 Alternatively, playback can be specified in an SDF file. See example file
 `examples/worlds/log_playback.sdf`: