2 ➡️ 3

Signed-off-by: Louise Poubel <[email protected]>

.github/workflows/ci.yml

@@ -11,7 +11,7 @@ jobs:
         uses: actions/checkout@v2
       - name: Compile and test
         id: ci
-        uses: ignition-tooling/action-ignition-ci@master
+        uses: ignition-tooling/action-ignition-ci@bionic
         with:
           codecov-token: ${{ secrets.CODECOV_TOKEN }}
   focal-ci:

Migration.md

@@ -5,4 +5,11 @@ Deprecated code produces compile-time warnings. These warning serve as
 notification to users that their code should be upgraded. The next major
 release will remove the deprecated code.
 
+## Ignition Launch 2.2.2
+
+- Environment variable `IGN_LAUNCH_CONFIG_PATH` started to be treated as a path
+  list (colon-separated on Linux, semicolon-separated on Windows). Before, only
+  a single path could be set here, and setting a path list would break the whole
+  launch file lookup functionality.
+
 ## Ignition Launch 0.X to N.M

README.md

@@ -9,10 +9,10 @@
 
 Build | Status
 -- | --
-Test coverage | [![codecov](https://codecov.io/gh/ignitionrobotics/ign-launch/branch/master/graph/badge.svg)](https://codecov.io/gh/ignitionrobotics/ign-launch)
-Ubuntu Bionic | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=ignition_launch-ci-master-bionic-amd64)](https://build.osrfoundation.org/job/ignition_launch-ci-master-bionic-amd64)
-Homebrew      | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=ignition_launch-ci-master-homebrew-amd64)](https://build.osrfoundation.org/job/ignition_launch-ci-master-homebrew-amd64)
-Windows       | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=ignition_launch-ci-master-windows7-amd64)](https://build.osrfoundation.org/job/ignition_launch-ci-master-windows7-amd64)
+Test coverage | [![codecov](https://codecov.io/gh/ignitionrobotics/ign-launch/branch/ign-launch3/graph/badge.svg)](https://codecov.io/gh/ignitionrobotics/ign-launch)
+Ubuntu Bionic | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=ignition_launch-ci-ign-launch3-bionic-amd64)](https://build.osrfoundation.org/job/ignition_launch-ci-ign-launch3-bionic-amd64)
+Homebrew      | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=ignition_launch-ci-ign-launch3-homebrew-amd64)](https://build.osrfoundation.org/job/ignition_launch-ci-ign-launch3-homebrew-amd64)
+Windows       | [![Build Status](https://build.osrfoundation.org/job/ign_launch-ign-3-win/badge/icon)](https://build.osrfoundation.org/job/ign_launch-ign-3-win/)
 
 Ignition Launch, a component of [Ignition
 Robotics](https://ignitionrobotics.org), provides a command line interface
@@ -137,7 +137,7 @@ necessary prerequisites followed by building from source.
 
 # Usage
 
-Sample launch configuration files are in the [examples directory](https://github.com/ignitionrobotics/ign-launch/blob/master/examples/).
+Sample launch configuration files are in the [examples directory](https://github.com/ignitionrobotics/ign-launch/blob/ign-launch3/examples/).
 
 **Example**
 
@@ -244,18 +244,17 @@ ign-launch
 
 # Contributing
 
-Please see
-[CONTRIBUTING.md](https://github.com/ignitionrobotics/ign-gazebo/blob/master/CONTRIBUTING.md).
+Please see the [contribution guide](https://ignitionrobotics.org/docs/all/contributing).
 
 # Code of Conduct
 
 Please see
-[CODE_OF_CONDUCT.md](https://github.com/ignitionrobotics/ign-gazebo/blob/master/CODE_OF_CONDUCT.md).
+[CODE_OF_CONDUCT.md](https://github.com/ignitionrobotics/ign-gazebo/blob/main/CODE_OF_CONDUCT.md).
 
 # Versioning
 
 This library uses [Semantic Versioning](https://semver.org/). Additionally, this library is part of the [Ignition Robotics project](https://ignitionrobotics.org) which periodically releases a versioned set of compatible and complimentary libraries. See the [Ignition Robotics website](https://ignitionrobotics.org) for version and release information.
 
 # License
 
-This library is licensed under [Apache 2.0](https://www.apache.org/licenses/LICENSE-2.0). See also the [LICENSE](https://github.com/ignitionrobotics/ign-launch/blob/master/LICENSE) file.
+This library is licensed under [Apache 2.0](https://www.apache.org/licenses/LICENSE-2.0). See also the [LICENSE](https://github.com/ignitionrobotics/ign-launch/blob/main/LICENSE) file.

bitbucket-pipelines.yml

@@ -44,7 +44,7 @@ pipelines:
           # # Ignition msgs (uncomment if a specific branch is needed)
           # - apt install -y
           #   libprotobuf-dev protobuf-compiler libprotoc-dev
-          # - git clone http://github.com/ignitionrobotics/ign-msgs -b master
+          # - git clone http://github.com/ignitionrobotics/ign-msgs
           # - cd ign-msgs
           # - mkdir build
           # - cd build
@@ -54,7 +54,7 @@ pipelines:
           # # Ignition transport (uncomment if a specific branch is needed)
           # - apt install -y
           #   libzmq3-dev uuid-dev libsqlite3-dev
-          # - git clone http://github.com/ignitionrobotics/ign-transport -b master
+          # - git clone http://github.com/ignitionrobotics/ign-transport
           # - cd ign-transport
           # - mkdir build
           # - cd build
@@ -65,7 +65,7 @@ pipelines:
           # - apt install -y
           #   libxml2-utils
           #   libtinyxml-dev
-          # - git clone http://github.com/osrf/sdformat -b master
+          # - git clone http://github.com/osrf/sdformat
           # - cd sdformat
           # - mkdir build
           # - cd build
@@ -119,15 +119,15 @@ pipelines:
           # - make install
           # - cd ../..
           # Ignition Sensors from source
-          - git clone https://github.com/ignitionrobotics/ign-sensors -b master
+          - git clone https://github.com/ignitionrobotics/ign-sensors
           - cd ign-sensors
           - mkdir build
           - cd build
           - cmake .. -DBUILD_TESTING=false
           - make install
           - cd ../..
           # Ignition Gazebo from source
-          - git clone https://github.com/ignitionrobotics/ign-gazebo -b master
+          - git clone https://github.com/ignitionrobotics/ign-gazebo
           - cd ign-gazebo
           - mkdir build
           - cd build

plugins/websocket_server/WebsocketServer.hh

@@ -130,7 +130,7 @@ namespace ignition
     ///
     /// `ign launch -v 4 websocket.ign`
     ///
-    /// 3. Open the [index.html](https://github.com/ignitionrobotics/ign-launch/blob/master/plugins/websocket_server/index.html) webpage.
+    /// 3. Open the [index.html](https://github.com/ignitionrobotics/ign-launch/blob/ign-launch3/plugins/websocket_server/index.html) webpage.
     ///
     class WebsocketServer : public ignition::launch::Plugin
     {

src/cmdlaunch.rb.in

@@ -159,26 +159,35 @@ class Cmd
       end
 
       if options.key?('file')
-        # Check if the passed in file exists. 
+        # Check if the passed in file exists.
+        path = ''
         if File.exists?(options['file'])
           path = options['file']
+        end
         # If not, then first check the IGN_LAUNCH_CONFIG_PATH environment
         # variable, then the configuration path from the launch library.
-        else
+        if path.empty?
           configPathEnv = ENV['IGN_LAUNCH_CONFIG_PATH']
-          if !configPathEnv.nil? &&
-              File.exists?(File.join(configPathEnv, options['file']))
-            path = File.join(configPathEnv, options['file'])
-          # get the configuration path from the launch library.
-          else
-            Importer.extern 'char *configPath()'
-            path = File.join(Importer.configPath().to_s, options['file'])
-            if !File.exists?(path) 
-              puts "Unable to find file " + options['file']
-              exit(-1)
+          if !configPathEnv.nil?
+            configPaths = configPathEnv.split(File::PATH_SEPARATOR)
+            for configPath in configPaths
+              filePath = File.join(configPath, options['file'])
+              if File.exists?(filePath)
+                path = filePath
+                break
+              end
             end
           end
         end
+        # get the configuration path from the launch library.
+        if path.empty?
+          Importer.extern 'char *configPath()'
+          path = File.join(Importer.configPath().to_s, options['file'])
+        end
+        if path.empty? or !File.exists?(path)
+          puts "Unable to find file " + options['file']
+          exit(-1)
+        end
 
         # ERB parse the file with the variable bindings
         begin

tutorials.md.in

@@ -6,6 +6,8 @@ Ignition @IGN_DESIGNATION_CAP@ library and how to use the library effectively.
 
 **Tutorials**
 
+1. \subpage basics "Ignition launch tutorial"
+
 ## License
 
 The code associated with this documentation is licensed under an [Apache 2.0 License](https://www.apache.org/licenses/LICENSE-2.0).

tutorials/tutorial.md

@@ -1,4 +1,4 @@
-# Ignition launch tutorial
+\page basics Ignition launch tutorial
 
 Ignition Launch is used to run and manage plugins and programs. A configuration script can be used to specify which programs and plugins to execute. Alternatively, individual programs and plugins can be run from the command line.
 
@@ -55,3 +55,17 @@ The [worldName] command line argument is optional. If left blank, or not specifi
 Example to load `the shapes.sdf`:
 
 `ign launch gazebo_plugins.ign worldName:=shapes`
+
+## Launch file lookup
+
+There is a lookup process happening if the specified file is not an absolute
+path. It searches for a file with the given name in paths as follows:
+
+1. current directory
+1. all paths specified in environment variable `IGN_LAUNCH_CONFIG_PATH`
+1. a hardcoded install location (usually
+   `/usr/share/ignition/ignition-launchN/configs/`)
+
+The `IGN_LAUNCH_CONFIG_PATH` environment variable can contain either a single
+path or a path list (_new since 2.2.2_). Path list is a colon-separated (on
+UNIX) or semicolon-separated (on Windows) list of absolute paths.