From 28a94328d4f03a057411d69bcae82572385b8dd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Brudn=C3=BD?= Date: Mon, 17 May 2021 03:41:32 +0200 Subject: [PATCH 1/2] console: update copyright notice --- components/console/commands.c | 18 +++++------------- components/console/esp_console.h | 18 +++++------------- components/console/esp_console_repl.c | 18 +++++------------- components/console/split_argv.c | 18 +++++------------- components/console/test/test_console.c | 5 +++++ 5 files changed, 25 insertions(+), 52 deletions(-) diff --git a/components/console/commands.c b/components/console/commands.c index 251fa92343..77654a30c2 100644 --- a/components/console/commands.c +++ b/components/console/commands.c @@ -1,16 +1,8 @@ -// Copyright 2016-2019 Espressif Systems (Shanghai) PTE LTD -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +/* + * SPDX-FileCopyrightText: 2016-2021 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Apache-2.0 + */ #include #include diff --git a/components/console/esp_console.h b/components/console/esp_console.h index 29aab8b4fb..a0b7cbf178 100644 --- a/components/console/esp_console.h +++ b/components/console/esp_console.h @@ -1,16 +1,8 @@ -// Copyright 2016-2019 Espressif Systems (Shanghai) PTE LTD -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +/* + * SPDX-FileCopyrightText: 2016-2021 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Apache-2.0 + */ #pragma once #ifdef __cplusplus diff --git a/components/console/esp_console_repl.c b/components/console/esp_console_repl.c index 19dd9d85ab..66963bde13 100644 --- a/components/console/esp_console_repl.c +++ b/components/console/esp_console_repl.c @@ -1,16 +1,8 @@ -// Copyright 2016-2020 Espressif Systems (Shanghai) PTE LTD -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +/* + * SPDX-FileCopyrightText: 2016-2021 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Apache-2.0 + */ #include #include diff --git a/components/console/split_argv.c b/components/console/split_argv.c index e762b0abae..d2e3bd0846 100644 --- a/components/console/split_argv.c +++ b/components/console/split_argv.c @@ -1,16 +1,8 @@ -// Copyright 2016-2017 Espressif Systems (Shanghai) PTE LTD -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +/* + * SPDX-FileCopyrightText: 2016-2021 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Apache-2.0 + */ #include #include diff --git a/components/console/test/test_console.c b/components/console/test/test_console.c index b634a6c204..eab793dce7 100644 --- a/components/console/test/test_console.c +++ b/components/console/test/test_console.c @@ -1,3 +1,8 @@ +/* + * SPDX-FileCopyrightText: 2021 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Apache-2.0 + */ #include #include #include "sdkconfig.h" From 71170dd5bc67bd9eb9414a95103b225c3bdfe0e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Brudn=C3=BD?= Date: Mon, 17 May 2021 03:43:02 +0200 Subject: [PATCH 2/2] cxx: update copyright notice --- components/cxx/cxx_exception_stubs.cpp | 5 +++++ components/cxx/cxx_guards.cpp | 18 +++++------------- components/cxx/test/test_cxx.cpp | 5 +++++ components/cxx/test/test_initialization.cpp | 5 +++++ components/cxx/test/test_rtti.cpp | 5 +++++ components/cxx/test/test_stack_check_cxx.cpp | 5 +++++ 6 files changed, 30 insertions(+), 13 deletions(-) diff --git a/components/cxx/cxx_exception_stubs.cpp b/components/cxx/cxx_exception_stubs.cpp index 01b6f5884d..a652ace2e3 100644 --- a/components/cxx/cxx_exception_stubs.cpp +++ b/components/cxx/cxx_exception_stubs.cpp @@ -1,3 +1,8 @@ +/* + * SPDX-FileCopyrightText: 2021 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Apache-2.0 + */ #include #include #include diff --git a/components/cxx/cxx_guards.cpp b/components/cxx/cxx_guards.cpp index 8580a26cc9..17d53b27ef 100644 --- a/components/cxx/cxx_guards.cpp +++ b/components/cxx/cxx_guards.cpp @@ -1,16 +1,8 @@ -// Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +/* + * SPDX-FileCopyrightText: 2015-2021 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Apache-2.0 + */ #include #include diff --git a/components/cxx/test/test_cxx.cpp b/components/cxx/test/test_cxx.cpp index 03ee89075e..7050538b15 100644 --- a/components/cxx/test/test_cxx.cpp +++ b/components/cxx/test/test_cxx.cpp @@ -1,3 +1,8 @@ +/* + * SPDX-FileCopyrightText: 2021 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Apache-2.0 + */ #include #include #include diff --git a/components/cxx/test/test_initialization.cpp b/components/cxx/test/test_initialization.cpp index 6d5ced3061..3c0a2f5367 100644 --- a/components/cxx/test/test_initialization.cpp +++ b/components/cxx/test/test_initialization.cpp @@ -1,3 +1,8 @@ +/* + * SPDX-FileCopyrightText: 2021 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Apache-2.0 + */ #include #include #include diff --git a/components/cxx/test/test_rtti.cpp b/components/cxx/test/test_rtti.cpp index c3174c9366..252b9ad872 100644 --- a/components/cxx/test/test_rtti.cpp +++ b/components/cxx/test/test_rtti.cpp @@ -1,3 +1,8 @@ +/* + * SPDX-FileCopyrightText: 2021 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Apache-2.0 + */ #include #include "unity.h" diff --git a/components/cxx/test/test_stack_check_cxx.cpp b/components/cxx/test/test_stack_check_cxx.cpp index cb6e5a7701..86f179be28 100644 --- a/components/cxx/test/test_stack_check_cxx.cpp +++ b/components/cxx/test/test_stack_check_cxx.cpp @@ -1,3 +1,8 @@ +/* + * SPDX-FileCopyrightText: 2021 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Apache-2.0 + */ #include "unity.h" #if CONFIG_COMPILER_STACK_CHECK