From b82bf3cb1155e89e56842891b697963bdb45e62b Mon Sep 17 00:00:00 2001 From: Peter Johnson Date: Sat, 2 Jan 2021 09:37:03 -0800 Subject: [PATCH] Update license (#183) --- LICENSE.md | 24 +++++++++++++++++++ LICENSE.txt | 24 ------------------- deps/examples/cpp-multiCameraServer/main.cpp | 9 +++---- .../src/main/java/Main.java | 9 +++---- .../multiCameraServer.py | 10 ++++---- deps/tools/configServer/src/Application.cpp | 9 +++---- deps/tools/configServer/src/Application.h | 9 +++---- deps/tools/configServer/src/DataHistory.h | 9 +++---- .../configServer/src/MyHttpConnection.cpp | 9 +++---- .../tools/configServer/src/MyHttpConnection.h | 9 +++---- .../configServer/src/NetworkSettings.cpp | 9 +++---- deps/tools/configServer/src/NetworkSettings.h | 9 +++---- deps/tools/configServer/src/RomiStatus.cpp | 9 +++---- deps/tools/configServer/src/RomiStatus.h | 9 +++---- deps/tools/configServer/src/SystemStatus.cpp | 9 +++---- deps/tools/configServer/src/SystemStatus.h | 9 +++---- deps/tools/configServer/src/UploadHelper.cpp | 9 +++---- deps/tools/configServer/src/UploadHelper.h | 9 +++---- .../tools/configServer/src/VisionSettings.cpp | 9 +++---- deps/tools/configServer/src/VisionSettings.h | 9 +++---- deps/tools/configServer/src/VisionStatus.cpp | 9 +++---- deps/tools/configServer/src/VisionStatus.h | 9 +++---- .../configServer/src/WebSocketHandlers.cpp | 9 +++---- .../configServer/src/WebSocketHandlers.h | 9 +++---- deps/tools/configServer/src/main.cpp | 9 +++---- .../src/multiCameraServer.cpp | 9 +++---- stage4/01-sys-tweaks/01-run.sh | 4 ++-- 27 files changed, 99 insertions(+), 170 deletions(-) create mode 100644 LICENSE.md delete mode 100644 LICENSE.txt diff --git a/LICENSE.md b/LICENSE.md new file mode 100644 index 0000000000..3d5a824cad --- /dev/null +++ b/LICENSE.md @@ -0,0 +1,24 @@ +Copyright (c) 2009-2021 FIRST and other WPILib contributors +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + * Neither the name of FIRST, WPILib, nor the names of other WPILib + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY FIRST AND OTHER WPILIB CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY NONINFRINGEMENT AND FITNESS FOR A PARTICULAR +PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL FIRST OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/LICENSE.txt b/LICENSE.txt deleted file mode 100644 index 5776141e4f..0000000000 --- a/LICENSE.txt +++ /dev/null @@ -1,24 +0,0 @@ -Copyright (c) 2009-2019 FIRST -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - * Neither the name of the FIRST nor the - names of its contributors may be used to endorse or promote products - derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY FIRST AND CONTRIBUTORS``AS IS'' AND ANY -EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY NONINFRINGEMENT AND FITNESS FOR A PARTICULAR -PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL FIRST OR CONTRIBUTORS BE LIABLE FOR -ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/deps/examples/cpp-multiCameraServer/main.cpp b/deps/examples/cpp-multiCameraServer/main.cpp index fb44453005..158db2a84e 100644 --- a/deps/examples/cpp-multiCameraServer/main.cpp +++ b/deps/examples/cpp-multiCameraServer/main.cpp @@ -1,9 +1,6 @@ -/*----------------------------------------------------------------------------*/ -/* Copyright (c) 2018 FIRST. All Rights Reserved. */ -/* Open Source Software - may be modified and shared by FRC teams. The code */ -/* must be accompanied by the FIRST BSD license file in the root directory of */ -/* the project. */ -/*----------------------------------------------------------------------------*/ +// Copyright (c) FIRST and other WPILib contributors. +// Open Source Software; you can modify and/or share it under the terms of +// the WPILib BSD license file in the root directory of this project. #include #include diff --git a/deps/examples/java-multiCameraServer/src/main/java/Main.java b/deps/examples/java-multiCameraServer/src/main/java/Main.java index 41ac5b870c..d2f4d8f2fa 100644 --- a/deps/examples/java-multiCameraServer/src/main/java/Main.java +++ b/deps/examples/java-multiCameraServer/src/main/java/Main.java @@ -1,9 +1,6 @@ -/*----------------------------------------------------------------------------*/ -/* Copyright (c) 2018 FIRST. All Rights Reserved. */ -/* Open Source Software - may be modified and shared by FRC teams. The code */ -/* must be accompanied by the FIRST BSD license file in the root directory of */ -/* the project. */ -/*----------------------------------------------------------------------------*/ +// Copyright (c) FIRST and other WPILib contributors. +// Open Source Software; you can modify and/or share it under the terms of +// the WPILib BSD license file in the root directory of this project. import java.io.IOException; import java.nio.file.Files; diff --git a/deps/examples/python-multiCameraServer/multiCameraServer.py b/deps/examples/python-multiCameraServer/multiCameraServer.py index cd7bd1058e..9c2ea20381 100755 --- a/deps/examples/python-multiCameraServer/multiCameraServer.py +++ b/deps/examples/python-multiCameraServer/multiCameraServer.py @@ -1,10 +1,8 @@ #!/usr/bin/env python3 -#---------------------------------------------------------------------------- -# Copyright (c) 2018 FIRST. All Rights Reserved. -# Open Source Software - may be modified and shared by FRC teams. The code -# must be accompanied by the FIRST BSD license file in the root directory of -# the project. -#---------------------------------------------------------------------------- + +# Copyright (c) FIRST and other WPILib contributors. +# Open Source Software; you can modify and/or share it under the terms of +# the WPILib BSD license file in the root directory of this project. import json import time diff --git a/deps/tools/configServer/src/Application.cpp b/deps/tools/configServer/src/Application.cpp index e45dd54b12..dd4a7f6f44 100644 --- a/deps/tools/configServer/src/Application.cpp +++ b/deps/tools/configServer/src/Application.cpp @@ -1,9 +1,6 @@ -/*----------------------------------------------------------------------------*/ -/* Copyright (c) 2018 FIRST. All Rights Reserved. */ -/* Open Source Software - may be modified and shared by FRC teams. The code */ -/* must be accompanied by the FIRST BSD license file in the root directory of */ -/* the project. */ -/*----------------------------------------------------------------------------*/ +// Copyright (c) FIRST and other WPILib contributors. +// Open Source Software; you can modify and/or share it under the terms of +// the WPILib BSD license file in the root directory of this project. #include "Application.h" diff --git a/deps/tools/configServer/src/Application.h b/deps/tools/configServer/src/Application.h index e0ec20a48d..6d7ced5492 100644 --- a/deps/tools/configServer/src/Application.h +++ b/deps/tools/configServer/src/Application.h @@ -1,9 +1,6 @@ -/*----------------------------------------------------------------------------*/ -/* Copyright (c) 2018 FIRST. All Rights Reserved. */ -/* Open Source Software - may be modified and shared by FRC teams. The code */ -/* must be accompanied by the FIRST BSD license file in the root directory of */ -/* the project. */ -/*----------------------------------------------------------------------------*/ +// Copyright (c) FIRST and other WPILib contributors. +// Open Source Software; you can modify and/or share it under the terms of +// the WPILib BSD license file in the root directory of this project. #ifndef RPICONFIGSERVER_APPLICATION_H_ #define RPICONFIGSERVER_APPLICATION_H_ diff --git a/deps/tools/configServer/src/DataHistory.h b/deps/tools/configServer/src/DataHistory.h index aa3368493e..e18f90c51b 100644 --- a/deps/tools/configServer/src/DataHistory.h +++ b/deps/tools/configServer/src/DataHistory.h @@ -1,9 +1,6 @@ -/*----------------------------------------------------------------------------*/ -/* Copyright (c) 2018 FIRST. All Rights Reserved. */ -/* Open Source Software - may be modified and shared by FRC teams. The code */ -/* must be accompanied by the FIRST BSD license file in the root directory of */ -/* the project. */ -/*----------------------------------------------------------------------------*/ +// Copyright (c) FIRST and other WPILib contributors. +// Open Source Software; you can modify and/or share it under the terms of +// the WPILib BSD license file in the root directory of this project. #ifndef RPICONFIGSERVER_DATAHISTORY_H_ #define RPICONFIGSERVER_DATAHISTORY_H_ diff --git a/deps/tools/configServer/src/MyHttpConnection.cpp b/deps/tools/configServer/src/MyHttpConnection.cpp index 4457fbc3b2..cbeefb8f75 100644 --- a/deps/tools/configServer/src/MyHttpConnection.cpp +++ b/deps/tools/configServer/src/MyHttpConnection.cpp @@ -1,9 +1,6 @@ -/*----------------------------------------------------------------------------*/ -/* Copyright (c) 2018 FIRST. All Rights Reserved. */ -/* Open Source Software - may be modified and shared by FRC teams. The code */ -/* must be accompanied by the FIRST BSD license file in the root directory of */ -/* the project. */ -/*----------------------------------------------------------------------------*/ +// Copyright (c) FIRST and other WPILib contributors. +// Open Source Software; you can modify and/or share it under the terms of +// the WPILib BSD license file in the root directory of this project. #include "MyHttpConnection.h" diff --git a/deps/tools/configServer/src/MyHttpConnection.h b/deps/tools/configServer/src/MyHttpConnection.h index 44a0905163..4fa5f4792d 100644 --- a/deps/tools/configServer/src/MyHttpConnection.h +++ b/deps/tools/configServer/src/MyHttpConnection.h @@ -1,9 +1,6 @@ -/*----------------------------------------------------------------------------*/ -/* Copyright (c) 2018 FIRST. All Rights Reserved. */ -/* Open Source Software - may be modified and shared by FRC teams. The code */ -/* must be accompanied by the FIRST BSD license file in the root directory of */ -/* the project. */ -/*----------------------------------------------------------------------------*/ +// Copyright (c) FIRST and other WPILib contributors. +// Open Source Software; you can modify and/or share it under the terms of +// the WPILib BSD license file in the root directory of this project. #ifndef RPICONFIGSERVER_MYHTTPCONNECTION_H_ #define RPICONFIGSERVER_MYHTTPCONNECTION_H_ diff --git a/deps/tools/configServer/src/NetworkSettings.cpp b/deps/tools/configServer/src/NetworkSettings.cpp index d03f90d89e..b9f414301a 100644 --- a/deps/tools/configServer/src/NetworkSettings.cpp +++ b/deps/tools/configServer/src/NetworkSettings.cpp @@ -1,9 +1,6 @@ -/*----------------------------------------------------------------------------*/ -/* Copyright (c) 2018 FIRST. All Rights Reserved. */ -/* Open Source Software - may be modified and shared by FRC teams. The code */ -/* must be accompanied by the FIRST BSD license file in the root directory of */ -/* the project. */ -/*----------------------------------------------------------------------------*/ +// Copyright (c) FIRST and other WPILib contributors. +// Open Source Software; you can modify and/or share it under the terms of +// the WPILib BSD license file in the root directory of this project. #include "NetworkSettings.h" diff --git a/deps/tools/configServer/src/NetworkSettings.h b/deps/tools/configServer/src/NetworkSettings.h index e106d827ac..75e06804b2 100644 --- a/deps/tools/configServer/src/NetworkSettings.h +++ b/deps/tools/configServer/src/NetworkSettings.h @@ -1,9 +1,6 @@ -/*----------------------------------------------------------------------------*/ -/* Copyright (c) 2018 FIRST. All Rights Reserved. */ -/* Open Source Software - may be modified and shared by FRC teams. The code */ -/* must be accompanied by the FIRST BSD license file in the root directory of */ -/* the project. */ -/*----------------------------------------------------------------------------*/ +// Copyright (c) FIRST and other WPILib contributors. +// Open Source Software; you can modify and/or share it under the terms of +// the WPILib BSD license file in the root directory of this project. #ifndef RPICONFIGSERVER_NETWORKSETTINGS_H_ #define RPICONFIGSERVER_NETWORKSETTINGS_H_ diff --git a/deps/tools/configServer/src/RomiStatus.cpp b/deps/tools/configServer/src/RomiStatus.cpp index 979127af97..f3c6d94306 100644 --- a/deps/tools/configServer/src/RomiStatus.cpp +++ b/deps/tools/configServer/src/RomiStatus.cpp @@ -1,9 +1,6 @@ -/*----------------------------------------------------------------------------*/ -/* Copyright (c) 2018 FIRST. All Rights Reserved. */ -/* Open Source Software - may be modified and shared by FRC teams. The code */ -/* must be accompanied by the FIRST BSD license file in the root directory of */ -/* the project. */ -/*----------------------------------------------------------------------------*/ +// Copyright (c) FIRST and other WPILib contributors. +// Open Source Software; you can modify and/or share it under the terms of +// the WPILib BSD license file in the root directory of this project. #include "RomiStatus.h" diff --git a/deps/tools/configServer/src/RomiStatus.h b/deps/tools/configServer/src/RomiStatus.h index 1f0007296c..296a8bafd1 100644 --- a/deps/tools/configServer/src/RomiStatus.h +++ b/deps/tools/configServer/src/RomiStatus.h @@ -1,9 +1,6 @@ -/*----------------------------------------------------------------------------*/ -/* Copyright (c) 2018 FIRST. All Rights Reserved. */ -/* Open Source Software - may be modified and shared by FRC teams. The code */ -/* must be accompanied by the FIRST BSD license file in the root directory of */ -/* the project. */ -/*----------------------------------------------------------------------------*/ +// Copyright (c) FIRST and other WPILib contributors. +// Open Source Software; you can modify and/or share it under the terms of +// the WPILib BSD license file in the root directory of this project. #ifndef RPICONFIGSERVER_ROMISTATUS_H_ #define RPICONFIGSERVER_ROMISTATUS_H_ diff --git a/deps/tools/configServer/src/SystemStatus.cpp b/deps/tools/configServer/src/SystemStatus.cpp index 8874b8262a..de9114a785 100644 --- a/deps/tools/configServer/src/SystemStatus.cpp +++ b/deps/tools/configServer/src/SystemStatus.cpp @@ -1,9 +1,6 @@ -/*----------------------------------------------------------------------------*/ -/* Copyright (c) 2018 FIRST. All Rights Reserved. */ -/* Open Source Software - may be modified and shared by FRC teams. The code */ -/* must be accompanied by the FIRST BSD license file in the root directory of */ -/* the project. */ -/*----------------------------------------------------------------------------*/ +// Copyright (c) FIRST and other WPILib contributors. +// Open Source Software; you can modify and/or share it under the terms of +// the WPILib BSD license file in the root directory of this project. #include "SystemStatus.h" diff --git a/deps/tools/configServer/src/SystemStatus.h b/deps/tools/configServer/src/SystemStatus.h index cdaf957641..8a8540f93d 100644 --- a/deps/tools/configServer/src/SystemStatus.h +++ b/deps/tools/configServer/src/SystemStatus.h @@ -1,9 +1,6 @@ -/*----------------------------------------------------------------------------*/ -/* Copyright (c) 2018 FIRST. All Rights Reserved. */ -/* Open Source Software - may be modified and shared by FRC teams. The code */ -/* must be accompanied by the FIRST BSD license file in the root directory of */ -/* the project. */ -/*----------------------------------------------------------------------------*/ +// Copyright (c) FIRST and other WPILib contributors. +// Open Source Software; you can modify and/or share it under the terms of +// the WPILib BSD license file in the root directory of this project. #ifndef RPICONFIGSERVER_SYSTEMSTATUS_H_ #define RPICONFIGSERVER_SYSTEMSTATUS_H_ diff --git a/deps/tools/configServer/src/UploadHelper.cpp b/deps/tools/configServer/src/UploadHelper.cpp index 4aae8a72c6..cb230460ba 100644 --- a/deps/tools/configServer/src/UploadHelper.cpp +++ b/deps/tools/configServer/src/UploadHelper.cpp @@ -1,9 +1,6 @@ -/*----------------------------------------------------------------------------*/ -/* Copyright (c) 2019 FIRST. All Rights Reserved. */ -/* Open Source Software - may be modified and shared by FRC teams. The code */ -/* must be accompanied by the FIRST BSD license file in the root directory of */ -/* the project. */ -/*----------------------------------------------------------------------------*/ +// Copyright (c) FIRST and other WPILib contributors. +// Open Source Software; you can modify and/or share it under the terms of +// the WPILib BSD license file in the root directory of this project. #include "UploadHelper.h" diff --git a/deps/tools/configServer/src/UploadHelper.h b/deps/tools/configServer/src/UploadHelper.h index fb0b3061be..a3bf29a094 100644 --- a/deps/tools/configServer/src/UploadHelper.h +++ b/deps/tools/configServer/src/UploadHelper.h @@ -1,9 +1,6 @@ -/*----------------------------------------------------------------------------*/ -/* Copyright (c) 2019 FIRST. All Rights Reserved. */ -/* Open Source Software - may be modified and shared by FRC teams. The code */ -/* must be accompanied by the FIRST BSD license file in the root directory of */ -/* the project. */ -/*----------------------------------------------------------------------------*/ +// Copyright (c) FIRST and other WPILib contributors. +// Open Source Software; you can modify and/or share it under the terms of +// the WPILib BSD license file in the root directory of this project. #ifndef RPICONFIGSERVER_UPLOADHELPER_H_ #define RPICONFIGSERVER_UPLOADHELPER_H_ diff --git a/deps/tools/configServer/src/VisionSettings.cpp b/deps/tools/configServer/src/VisionSettings.cpp index bcd96f1089..7c7c5ba377 100644 --- a/deps/tools/configServer/src/VisionSettings.cpp +++ b/deps/tools/configServer/src/VisionSettings.cpp @@ -1,9 +1,6 @@ -/*----------------------------------------------------------------------------*/ -/* Copyright (c) 2018 FIRST. All Rights Reserved. */ -/* Open Source Software - may be modified and shared by FRC teams. The code */ -/* must be accompanied by the FIRST BSD license file in the root directory of */ -/* the project. */ -/*----------------------------------------------------------------------------*/ +// Copyright (c) FIRST and other WPILib contributors. +// Open Source Software; you can modify and/or share it under the terms of +// the WPILib BSD license file in the root directory of this project. #include "VisionSettings.h" diff --git a/deps/tools/configServer/src/VisionSettings.h b/deps/tools/configServer/src/VisionSettings.h index 2437b6e60b..0ec0b37181 100644 --- a/deps/tools/configServer/src/VisionSettings.h +++ b/deps/tools/configServer/src/VisionSettings.h @@ -1,9 +1,6 @@ -/*----------------------------------------------------------------------------*/ -/* Copyright (c) 2018 FIRST. All Rights Reserved. */ -/* Open Source Software - may be modified and shared by FRC teams. The code */ -/* must be accompanied by the FIRST BSD license file in the root directory of */ -/* the project. */ -/*----------------------------------------------------------------------------*/ +// Copyright (c) FIRST and other WPILib contributors. +// Open Source Software; you can modify and/or share it under the terms of +// the WPILib BSD license file in the root directory of this project. #ifndef RPICONFIGSERVER_VISIONSETTINGS_H_ #define RPICONFIGSERVER_VISIONSETTINGS_H_ diff --git a/deps/tools/configServer/src/VisionStatus.cpp b/deps/tools/configServer/src/VisionStatus.cpp index 6b0e949da8..8651fd3e5f 100644 --- a/deps/tools/configServer/src/VisionStatus.cpp +++ b/deps/tools/configServer/src/VisionStatus.cpp @@ -1,9 +1,6 @@ -/*----------------------------------------------------------------------------*/ -/* Copyright (c) 2018 FIRST. All Rights Reserved. */ -/* Open Source Software - may be modified and shared by FRC teams. The code */ -/* must be accompanied by the FIRST BSD license file in the root directory of */ -/* the project. */ -/*----------------------------------------------------------------------------*/ +// Copyright (c) FIRST and other WPILib contributors. +// Open Source Software; you can modify and/or share it under the terms of +// the WPILib BSD license file in the root directory of this project. #include "VisionStatus.h" diff --git a/deps/tools/configServer/src/VisionStatus.h b/deps/tools/configServer/src/VisionStatus.h index c9fcd1d98a..3265ca0651 100644 --- a/deps/tools/configServer/src/VisionStatus.h +++ b/deps/tools/configServer/src/VisionStatus.h @@ -1,9 +1,6 @@ -/*----------------------------------------------------------------------------*/ -/* Copyright (c) 2018 FIRST. All Rights Reserved. */ -/* Open Source Software - may be modified and shared by FRC teams. The code */ -/* must be accompanied by the FIRST BSD license file in the root directory of */ -/* the project. */ -/*----------------------------------------------------------------------------*/ +// Copyright (c) FIRST and other WPILib contributors. +// Open Source Software; you can modify and/or share it under the terms of +// the WPILib BSD license file in the root directory of this project. #ifndef RPICONFIGSERVER_VISIONSTATUS_H_ #define RPICONFIGSERVER_VISIONSTATUS_H_ diff --git a/deps/tools/configServer/src/WebSocketHandlers.cpp b/deps/tools/configServer/src/WebSocketHandlers.cpp index 1e113dd514..797bdb68bd 100644 --- a/deps/tools/configServer/src/WebSocketHandlers.cpp +++ b/deps/tools/configServer/src/WebSocketHandlers.cpp @@ -1,9 +1,6 @@ -/*----------------------------------------------------------------------------*/ -/* Copyright (c) 2018 FIRST. All Rights Reserved. */ -/* Open Source Software - may be modified and shared by FRC teams. The code */ -/* must be accompanied by the FIRST BSD license file in the root directory of */ -/* the project. */ -/*----------------------------------------------------------------------------*/ +// Copyright (c) FIRST and other WPILib contributors. +// Open Source Software; you can modify and/or share it under the terms of +// the WPILib BSD license file in the root directory of this project. #include "WebSocketHandlers.h" diff --git a/deps/tools/configServer/src/WebSocketHandlers.h b/deps/tools/configServer/src/WebSocketHandlers.h index 4b438a36d2..fdab6732cd 100644 --- a/deps/tools/configServer/src/WebSocketHandlers.h +++ b/deps/tools/configServer/src/WebSocketHandlers.h @@ -1,9 +1,6 @@ -/*----------------------------------------------------------------------------*/ -/* Copyright (c) 2018 FIRST. All Rights Reserved. */ -/* Open Source Software - may be modified and shared by FRC teams. The code */ -/* must be accompanied by the FIRST BSD license file in the root directory of */ -/* the project. */ -/*----------------------------------------------------------------------------*/ +// Copyright (c) FIRST and other WPILib contributors. +// Open Source Software; you can modify and/or share it under the terms of +// the WPILib BSD license file in the root directory of this project. #ifndef RPICONFIGSERVER_WEBSOCKETHANDLERS_H_ #define RPICONFIGSERVER_WEBSOCKETHANDLERS_H_ diff --git a/deps/tools/configServer/src/main.cpp b/deps/tools/configServer/src/main.cpp index abc83f8c9e..f1acfb59d7 100644 --- a/deps/tools/configServer/src/main.cpp +++ b/deps/tools/configServer/src/main.cpp @@ -1,9 +1,6 @@ -/*----------------------------------------------------------------------------*/ -/* Copyright (c) 2018 FIRST. All Rights Reserved. */ -/* Open Source Software - may be modified and shared by FRC teams. The code */ -/* must be accompanied by the FIRST BSD license file in the root directory of */ -/* the project. */ -/*----------------------------------------------------------------------------*/ +// Copyright (c) FIRST and other WPILib contributors. +// Open Source Software; you can modify and/or share it under the terms of +// the WPILib BSD license file in the root directory of this project. #include #include diff --git a/deps/tools/multiCameraServer/src/multiCameraServer.cpp b/deps/tools/multiCameraServer/src/multiCameraServer.cpp index 187c9555f6..6591c2ca46 100644 --- a/deps/tools/multiCameraServer/src/multiCameraServer.cpp +++ b/deps/tools/multiCameraServer/src/multiCameraServer.cpp @@ -1,9 +1,6 @@ -/*----------------------------------------------------------------------------*/ -/* Copyright (c) 2018 FIRST. All Rights Reserved. */ -/* Open Source Software - may be modified and shared by FRC teams. The code */ -/* must be accompanied by the FIRST BSD license file in the root directory of */ -/* the project. */ -/*----------------------------------------------------------------------------*/ +// Copyright (c) FIRST and other WPILib contributors. +// Open Source Software; you can modify and/or share it under the terms of +// the WPILib BSD license file in the root directory of this project. #include #include diff --git a/stage4/01-sys-tweaks/01-run.sh b/stage4/01-sys-tweaks/01-run.sh index 2e5b981597..0b2400c3ec 100755 --- a/stage4/01-sys-tweaks/01-run.sh +++ b/stage4/01-sys-tweaks/01-run.sh @@ -60,7 +60,7 @@ export PKG_CONFIG_LIBDIR=${ROOTFS_DIR}/usr/lib/arm-linux-gnueabihf/pkgconfig:${R sh -c "cd ${BASE_DIR}/deps && tar cf - examples" | \ sh -c "cd ${ROOTFS_DIR}/home/${FIRST_USER_NAME} && tar xf -" for dir in ${ROOTFS_DIR}/home/${FIRST_USER_NAME}/examples/*; do - cp "${BASE_DIR}/LICENSE.txt" "${dir}/" + cp "${BASE_DIR}/LICENSE.md" "${dir}/" done chown -R 1000:1000 "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/examples" @@ -68,7 +68,7 @@ rm -rf "${STAGE_WORK_DIR}/examples" sh -c "cd ${BASE_DIR}/deps && tar cf - examples" | \ sh -c "cd ${STAGE_WORK_DIR} && tar xf -" for dir in ${STAGE_WORK_DIR}/examples/*; do - cp "${BASE_DIR}/LICENSE.txt" "${dir}/" + cp "${BASE_DIR}/LICENSE.md" "${dir}/" done # build zips