From 68233f58b41af22bfaf658a29480479dd9cffabf Mon Sep 17 00:00:00 2001 From: Ivan Grokhotkov Date: Wed, 20 Oct 2021 22:13:11 +0200 Subject: [PATCH] version: starting v5.0.0 development --- .../esp_common/include/esp_idf_version.h | 22 ++++++------------- make/version.mk | 4 ++-- tools/ci/check_copyright_ignore.txt | 1 - tools/cmake/version.cmake | 4 ++-- 4 files changed, 11 insertions(+), 20 deletions(-) diff --git a/components/esp_common/include/esp_idf_version.h b/components/esp_common/include/esp_idf_version.h index 7637b814b6..7f0e1535b6 100644 --- a/components/esp_common/include/esp_idf_version.h +++ b/components/esp_common/include/esp_idf_version.h @@ -1,16 +1,8 @@ -// Copyright 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: 2019-2021 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Apache-2.0 + */ #pragma once @@ -19,9 +11,9 @@ extern "C" { #endif /** Major version number (X.x.x) */ -#define ESP_IDF_VERSION_MAJOR 4 +#define ESP_IDF_VERSION_MAJOR 5 /** Minor version number (x.X.x) */ -#define ESP_IDF_VERSION_MINOR 4 +#define ESP_IDF_VERSION_MINOR 0 /** Patch version number (x.x.X) */ #define ESP_IDF_VERSION_PATCH 0 diff --git a/make/version.mk b/make/version.mk index 91c6f8398b..f11b024e6a 100644 --- a/make/version.mk +++ b/make/version.mk @@ -1,3 +1,3 @@ -IDF_VERSION_MAJOR := 4 -IDF_VERSION_MINOR := 4 +IDF_VERSION_MAJOR := 5 +IDF_VERSION_MINOR := 0 IDF_VERSION_PATCH := 0 diff --git a/tools/ci/check_copyright_ignore.txt b/tools/ci/check_copyright_ignore.txt index 3c9984eea4..c2128cbc80 100644 --- a/tools/ci/check_copyright_ignore.txt +++ b/tools/ci/check_copyright_ignore.txt @@ -741,7 +741,6 @@ components/esp_common/include/esp_bit_defs.h components/esp_common/include/esp_check.h components/esp_common/include/esp_compiler.h components/esp_common/include/esp_err.h -components/esp_common/include/esp_idf_version.h components/esp_common/include/esp_types.h components/esp_common/src/esp_err_to_name.c components/esp_common/test/test_attr.c diff --git a/tools/cmake/version.cmake b/tools/cmake/version.cmake index b3f00aea36..072964b97f 100644 --- a/tools/cmake/version.cmake +++ b/tools/cmake/version.cmake @@ -1,5 +1,5 @@ -set(IDF_VERSION_MAJOR 4) -set(IDF_VERSION_MINOR 4) +set(IDF_VERSION_MAJOR 5) +set(IDF_VERSION_MINOR 0) set(IDF_VERSION_PATCH 0) set(ENV{IDF_VERSION} "${IDF_VERSION_MAJOR}.${IDF_VERSION_MINOR}.${IDF_VERSION_PATCH}")