From a3f984e521a89fdb7193fc57902f071aaeb65f89 Mon Sep 17 00:00:00 2001 From: Koichiro IWAO Date: Thu, 24 Jun 2021 16:45:32 +0900 Subject: [PATCH 1/4] Add warning about build number and 4.x clients compatibilty See also: https://github.com/SoftEtherVPN/SoftEtherVPN/issues/1392#issuecomment-867348281 --- CMakeLists.txt | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1445ee92..b9a2a616 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,6 +6,14 @@ if ("${BUILD_NUMBER}" STREQUAL "") set(BUILD_NUMBER "0") endif() +if (BUILD_NUMBER LESS 5180) + message(WARNING + "Setting BUILD_NUMBER to the value less than 5180 will lose compatibility with " + "SoftEtherVPN Stable Edition 4.x. Set to a value greater than or equal to 5180 " + "if you are likely to connect from 4.x clients." + "\nSee also: https://github.com/SoftEtherVPN/SoftEtherVPN/issues/1392#issuecomment-867348281") +endif() + project("SoftEther VPN" VERSION "5.02.${BUILD_NUMBER}" LANGUAGES C From 79d1ade09d6dfb6130a834e85ca1815bbba9a046 Mon Sep 17 00:00:00 2001 From: metalefty Date: Thu, 24 Jun 2021 16:58:12 +0900 Subject: [PATCH 2/4] Revise warning message Co-authored-by: Davide Beatrici --- CMakeLists.txt | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b9a2a616..b1267438 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,10 +8,9 @@ endif() if (BUILD_NUMBER LESS 5180) message(WARNING - "Setting BUILD_NUMBER to the value less than 5180 will lose compatibility with " - "SoftEtherVPN Stable Edition 4.x. Set to a value greater than or equal to 5180 " - "if you are likely to connect from 4.x clients." - "\nSee also: https://github.com/SoftEtherVPN/SoftEtherVPN/issues/1392#issuecomment-867348281") + "Setting BUILD_NUMBER to a value less than 5180 will break compatibility with client binaries distributed by SoftEther Corporation.\n" + "Set to a value greater than or equal to 5180 if you want such clients to work properly.\n" + "For detailed info: https://github.com/SoftEtherVPN/SoftEtherVPN/issues/1392#issuecomment-867348281" endif() project("SoftEther VPN" From c1370987bfc047ee307a1330307bfa379ee6ea96 Mon Sep 17 00:00:00 2001 From: Koichiro IWAO Date: Thu, 24 Jun 2021 17:04:28 +0900 Subject: [PATCH 3/4] Add missing parenthesis close and adjust line break --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b1267438..0ff31161 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,9 +8,9 @@ endif() if (BUILD_NUMBER LESS 5180) message(WARNING - "Setting BUILD_NUMBER to a value less than 5180 will break compatibility with client binaries distributed by SoftEther Corporation.\n" + "Setting BUILD_NUMBER to a value less than 5180 will break compatibility with client binaries distributed by SoftEther Corporation. " "Set to a value greater than or equal to 5180 if you want such clients to work properly.\n" - "For detailed info: https://github.com/SoftEtherVPN/SoftEtherVPN/issues/1392#issuecomment-867348281" + "For detailed info: https://github.com/SoftEtherVPN/SoftEtherVPN/issues/1392#issuecomment-867348281") endif() project("SoftEther VPN" From e3f0837bd1dc10454a07fa85d507db5c34d9e42b Mon Sep 17 00:00:00 2001 From: Koichiro IWAO Date: Thu, 24 Jun 2021 17:12:21 +0900 Subject: [PATCH 4/4] Set default build number to 5180 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0ff31161..a6edcc0f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.10) set(BUILD_NUMBER CACHE STRING "The number of the current build.") if ("${BUILD_NUMBER}" STREQUAL "") - set(BUILD_NUMBER "0") + set(BUILD_NUMBER "5180") endif() if (BUILD_NUMBER LESS 5180)