From 1b089b94c64695aa22f606b8a296211181c9748c Mon Sep 17 00:00:00 2001 From: admercs Date: Tue, 20 Feb 2024 11:57:23 -0800 Subject: [PATCH] update windows build --- LICENSE | 6 ++++-- scripts/build.ps1 | 6 +++--- sublicenses/COSYSLAB_AIRSIM | 14 ++++++++++++++ 3 files changed, 21 insertions(+), 5 deletions(-) create mode 100644 sublicenses/COSYSLAB_AIRSIM diff --git a/LICENSE b/LICENSE index 100be81a..ebcac8fa 100644 --- a/LICENSE +++ b/LICENSE @@ -202,6 +202,8 @@ ------------------------------------------------------------------------------- NOTE -Some of AutonomySim's code is derived from AirSim and AutonomySim. -Both MIT licenses can be found in the `sublicenses` directory. + +Some AutonomySim code is derived from AirSim, Colosseum, and Cosys-Lab AirSim. +Their MIT licenses can be found in the `sublicenses` directory. + ------------------------------------------------------------------------------- diff --git a/scripts/build.ps1 b/scripts/build.ps1 index 99806b54..957d3ec9 100644 --- a/scripts/build.ps1 +++ b/scripts/build.ps1 @@ -49,9 +49,9 @@ param( # Common utilities Import-Module "${PWD}\scripts\utils.psm1" # imports: Add-Directories, Remove-Directories, Invoke-Fail, Test-WorkingDirectory, - # Test-VariableDefined, Get-EnvVariables, Get-ProgramVersion, Get-VersionMajorMinor, - # Get-VersionMajorMinorBuild, Get-WindowsInfo, Get-WindowsVersion, Get-Architecture, - # Get-ArchitectureWidth, Set-ProcessorCount +# Test-VariableDefined, Get-EnvVariables, Get-ProgramVersion, Get-VersionMajorMinor, +# Get-VersionMajorMinorBuild, Get-WindowsInfo, Get-WindowsVersion, Get-Architecture, +# Get-ArchitectureWidth, Set-ProcessorCount # Documentation Import-Module "${PWD}\scripts\build_docs.psm1" # imports: Build-Documentation diff --git a/sublicenses/COSYSLAB_AIRSIM b/sublicenses/COSYSLAB_AIRSIM new file mode 100644 index 00000000..9905d7a1 --- /dev/null +++ b/sublicenses/COSYSLAB_AIRSIM @@ -0,0 +1,14 @@ +The MIT License (MIT) + +MSR Aerial Informatics and Robotics Platform +MSR Aerial Informatics and Robotics Simulator (AirSim) + +Copyright (c) Microsoft Corporation + +All rights reserved. + +MIT License + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the ""Software""), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. +THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.