Fixed some scripts, added missing build.ps1, fixed asset folder name

Author: pijaro

README.md

@@ -26,7 +26,7 @@ The asset can be prepared in two flavors:
 
 #### Platform considerations
 
-Running the Editor or App using this Asset on Ubuntu requires a start script that populates the LD_LIBRARY_PATH. This is due to dynamic plugin loading mechanism used in the ros2cs library.
+Running the Editor or App using this Asset on Ubuntu requires a start script that populates the `LD_LIBRARY_PATH`. This is due to dynamic plugin loading mechanism used in the ros2cs library.
 On Windows, no script is necessary and both Editor and App can be ran the usual way (e.g. with a click or cmd line).
 
 ### Releases
@@ -86,13 +86,15 @@ The project will pull `ros2cs` into the workspace, which also functions independ
 
 > There is a bug with hardcoded include exports in some **ros2 galactic** packages on **Windows**. Easiest workaround is to create a `C:\ci\ws\install\include` directory in your system. More about this bug and proposed workarounds: [github issue](https://github.com/ros2/rclcpp/issues/1688#issuecomment-858467147).
 
+> Sometimes it is required to set NuGet package feed to nuget.org: `dotnet nuget add source --name nuget.org https://api.nuget.org/v3/index.json` in order to resolve some missing packages for `ros2cs` project.
+
 #### Build instructions
 
 *  Clone this project.
 *  If you wish to include custom messages in your build, make sure to put them into `ros2_for_unity_custom_messages.repos` file. You can change this file in your fork or change `custom_messages.repos` in the ros2cs repository fork, it will work either way as the scripts will pull both sources. 
    As an alternative, you can also add your custom messages package directly by copying it to `src/ros2cs/custom_messages` folder after the next step. Any message package in the build tree will be subjected to `.cs` file generator during the build.
 *  You need to source your ROS2 installation (e.g. `source /opt/ros/foxy/setup.bash` on Ubuntu or `C:\dev\ros2_foxy\local_setup.ps1` on Windows) before you proceed, for each new open terminal. On Ubuntu, you can also include this command in your `~/.bashrc` file.
-*  Run 'pull_repositories.sh'. This will pull `ros2cs` as well as your custom messages.
+*  Run `pull_repositories.sh`. This will pull `ros2cs` as well as your custom messages.
 *  Run `build.sh` (Ubuntu) or `build.ps1` (Windows) script.
    * You can build tests by adding `--with-tests` argument to `build` command.
    * It invokes `colcon_build` with `--merge-install` argument to simplify libraries installation.

build.ps1

@@ -0,0 +1,30 @@
+$scriptPath = split-path -parent $MyInvocation.MyCommand.Definition
+
+function Print-Help {
+"
+Usage: 
+build.ps1 [--with-tests]
+
+Options:
+--with-tests - build with tests.
+"
+}
+
+$tests=0
+$msg="Build started."
+if ($args[0] -eq "--with-tests") {
+    $tests=1
+    $msg+=" (with tests)"
+} elseif ($args[0] -eq "--help" -Or $args[0] -eq "-h") {
+    Print-Help
+    exit
+}
+
+$tests_info=0
+$plugin_path=Join-Path -Path $scriptPath -ChildPath "\src\Ros2ForUnity\Plugins\"
+
+Write-Host $msg -ForegroundColor Green
+colcon build --merge-install --event-handlers console_direct+ --cmake-args -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=$tests
+
+Write-Host "Deploying build to $plugin_path" -ForegroundColor Green
+& "$scriptPath\deploy_unity_plugins.ps1" $plugin_path

build.sh

@@ -1,4 +1,6 @@
 #!/bin/bash
+SCRIPT=$(readlink -f $0)
+SCRIPTPATH=`dirname $SCRIPT`
 
 if [ -z "${ROS_DISTRO}" ]; then
     echo "Source your ros2 distro first (Foxy and Galactic are supported)"
@@ -21,4 +23,4 @@ fi
 
 echo $MSG
 #TODO - call ros2cs ./build.sh instead, but with this workspace directory (parametrize the script)
-colcon build --merge-install --event-handlers console_direct+ --cmake-args -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=$TESTS && ./deploy_unity_plugins.sh src/Ros2ForUnity/Plugins/
+colcon build --merge-install --event-handlers console_direct+ --cmake-args -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=$TESTS && $SCRIPTPATH/deploy_unity_plugins.sh $SCRIPTPATH/src/Ros2ForUnity/Plugins/

create_unity_asset.ps1

@@ -3,7 +3,7 @@
 .SYNOPSIS
     Creates a 'unitypackage' from an input asset.
 .DESCRIPTION
-    This script screates a temporary Unity project in "%USERPROFILE%\AppData\Local\Temp" directory, copy input asset and makes an unity package out of it.
+    This script screates a temporary Unity project in "%USERPROFILE%\AppData\Local\Temp" directory, copy input asset and makes an unity package out of it. Valid Unity license is required.
 .PARAMETER unity_path
     Unity editor executable path
 .PARAMETER input_asset
@@ -15,14 +15,23 @@
 #>
 Param (
     [Parameter(Mandatory=$true)][string]$unity_path,
-    [Parameter(Mandatory=$true)][string]$input_asset,
-    [Parameter(Mandatory=$true)][string]$package_name,
+    [Parameter(Mandatory=$false)][string]$input_asset,
+    [Parameter(Mandatory=$false)][string]$package_name="Ros2ForUnity",
     [Parameter(Mandatory=$true)][string]$output_dir
 )
 
 $scriptPath = split-path -parent $MyInvocation.MyCommand.Definition
 $temp_dir = $Env:TEMP
 
+if(-Not $PSBoundParameters.ContainsKey('input_asset')) {
+    $input_asset= Join-Path -Path $scriptPath -ChildPath "\src\Ros2ForUnity"
+}
+
+if(-Not (Test-Path -Path "$output_dir")) {
+    Write-Host "Output dir doesn't exist!" -ForegroundColor red
+    exit 1
+}
+
 & "$unity_path" -version | Tee-Object -Variable unity_version | Out-Null
 
 if ($unity_version -match '^[0-9]{4}\.[0-9]*\.[0-9]*[f]?[0-9]*$') {
@@ -49,7 +58,7 @@ Copy-Item -Path "$input_asset" -Destination "$tmp_project_path\Assets\$package_n
 
 # Creating asset
 Write-Host "Saving unitypackage '$output_dir\$package_name.unitypackage'..."
-& "$unity_path" -projectPath "$tmp_project_path" -exportPackage "$package_name" "$output_dir\$package_name.unitypackage" -batchmode -quit | Out-Null
+& "$unity_path" -projectPath "$tmp_project_path" -exportPackage "Assets\$package_name" "$output_dir\$package_name.unitypackage" -batchmode -quit | Out-Null
 
 # Cleaning up
 Write-Host "Cleaning up temporary project..."

create_unity_asset.sh

@@ -4,14 +4,14 @@ SCRIPT=$(readlink -f $0)
 SCRIPTPATH=`dirname $SCRIPT`
 
 display_usage() {
-  echo "This script creates a temporary Unity project in '/tmp' directory, copy input asset and makes an unity package out of it."
+  echo "This script creates a temporary Unity project in '/tmp' directory, copy input asset and makes an unity package out of it. Valid Unity license is required."
   echo ""
   echo "Usage:" 
-  echo "create_unity_asset.sh -u <UNITY_PATH> -i <INPUT_ASSET> -p <PACKAGE_NAME> -o <OUTPUT_DIR>"
+  echo "create_unity_asset.sh -u <UNITY_PATH> -i [INPUT_ASSET] -p [PACKAGE_NAME] -o <OUTPUT_DIR>"
   echo ""
   echo "UNITY_PATH - Unity editor executable path"
-  echo "INPUT_ASSET - input asset to pack into unity package"
-  echo "PACKAGE_NAME - unity package name"
+  echo "INPUT_ASSET - input asset to pack into unity package, default = './src/Ros2ForUnity'"
+  echo "PACKAGE_NAME - unity package name, default = 'Ros2ForUnity'"
   echo "OUTPUT_DIR - output file directory"
 }
 

pull_repositories.ps1

@@ -0,0 +1,14 @@
+$scriptPath = split-path -parent $MyInvocation.MyCommand.Definition
+
+if (([string]::IsNullOrEmpty($Env:ROS_DISTRO)))
+{
+    Write-Host "Can't detect ROS2 version. Source your ros2 distro first. Foxy and Galactic are supported." -ForegroundColor Red
+    exit
+}
+
+$ros2cs_repos = Join-Path -Path $scriptPath -ChildPath "\ros2cs.repos"
+$custom_repos = Join-Path -Path $scriptPath -ChildPath "\ros2_for_unity_custom_messages.repos"
+vcs import --input $ros2cs_repos
+vcs import --input $custom_repos
+
+& "$scriptPath/src/ros2cs/get_repos.ps1"

pull_repositories.sh

@@ -1,11 +1,15 @@
 #!/bin/bash
 
+SCRIPT=$(readlink -f $0)
+SCRIPTPATH=`dirname $SCRIPT`
+
 if [ -z "${ROS_DISTRO}" ]; then
     echo "Can't detect ROS2 version. Source your ros2 distro first. Foxy and Galactic are supported"
     exit 1
 fi
 
 vcs import < "ros2cs.repos"
 vcs import < "ros2_for_unity_custom_messages.repos"
-cd src/ros2cs
-./get_repos.sh --get-custom-messages
+cd "$SCRIPTPATH/src/ros2cs"
+./get_repos.sh
+cd -

src/Ros2ForUnity/Scripts/ROS2ForUnity.cs

@@ -27,7 +27,7 @@ namespace ROS2
 internal class ROS2ForUnity
 {
     private static bool isInitialized = false;
-    private static string ros2ForUnityAssetFolderName = "ROS2";
+    private static string ros2ForUnityAssetFolderName = "Ros2ForUnity";
 
     enum Platform
     {