diff --git a/CMakeLists.txt b/CMakeLists.txt
index cfe46dc26a3..91f4ee23119 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -92,9 +92,16 @@ add_custom_target(copy_addons ALL
"${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/addons"
COMMENT "Copying addons files to ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}")
+add_custom_target(remove_unsigned_platforms ALL
+ ${CMAKE_COMMAND} -E remove -f
+ "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/platforms/unix32-unsigned.xml"
+ "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/platforms/unix64-unsigned.xml"
+ COMMENT "Removing unsigned platforms files from ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}")
+
add_custom_target(copy_platforms ALL
${CMAKE_COMMAND} -E copy_directory "${PROJECT_SOURCE_DIR}/platforms"
"${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/platforms"
+ DEPENDS remove_unsigned_platforms
COMMENT "Copying platforms files to ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}")
if(USE_BUNDLED_TINYXML2)
diff --git a/cli/cmdlineparser.cpp b/cli/cmdlineparser.cpp
index 2343652fa61..6235ebccca7 100644
--- a/cli/cmdlineparser.cpp
+++ b/cli/cmdlineparser.cpp
@@ -1608,18 +1608,6 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
mLogger.printError(errstr);
return Result::Fail;
}
-
- // TODO: remove
- // these are loaded via external files and thus have Settings::PlatformFile set instead.
- // override the type so they behave like the regular platforms.
- if (platform == "unix32-unsigned") {
- mSettings.platform.type = Platform::Type::Unix32;
- mLogger.printMessage("The platform 'unix32-unsigned' has been deprecated and will be removed in Cppcheck 2.19. Please use '--platform=unix32 --funsigned-char' instead");
- }
- else if (platform == "unix64-unsigned") {
- mSettings.platform.type = Platform::Type::Unix64;
- mLogger.printMessage("The platform 'unix64-unsigned' has been deprecated and will be removed in Cppcheck 2.19. Please use '--platform=unix64 --funsigned-char' instead");
- }
}
if (defaultSign != '\0')
diff --git a/lib/cppcheck.vcxproj b/lib/cppcheck.vcxproj
index 3d830e2894c..003fa5bed6d 100644
--- a/lib/cppcheck.vcxproj
+++ b/lib/cppcheck.vcxproj
@@ -280,7 +280,9 @@
xcopy "$(SolutionDir)addons/*.py" "$(OutDir)addons" /E /I /D /Y
xcopy "$(SolutionDir)addons/*.json" "$(OutDir)addons" /E /I /D /Y
xcopy "$(SolutionDir)cfg" "$(OutDir)cfg" /E /I /D /Y
-xcopy "$(SolutionDir)platforms" "$(OutDir)platforms" /E /I /D /Y
+xcopy "$(SolutionDir)platforms" "$(OutDir)platforms" /E /I /D /Y
+del /q "$(OutDir)platforms/unix32-unsigned.xml"
+del /q "$(OutDir)platforms/unix64-unsigned.xml"
@@ -313,7 +315,9 @@ xcopy "$(SolutionDir)platforms" "$(OutDir)platforms" /E /I /D /Y
xcopy "$(SolutionDir)addons/*.py" "$(OutDir)addons" /E /I /D /Y
xcopy "$(SolutionDir)addons/*.json" "$(OutDir)addons" /E /I /D /Y
xcopy "$(SolutionDir)cfg" "$(OutDir)cfg" /E /I /D /Y
-xcopy "$(SolutionDir)platforms" "$(OutDir)platforms" /E /I /D /Y
+xcopy "$(SolutionDir)platforms" "$(OutDir)platforms" /E /I /D /Y
+del /q "$(OutDir)platforms/unix32-unsigned.xml"
+del /q "$(OutDir)platforms/unix64-unsigned.xml"
@@ -354,7 +358,9 @@ xcopy "$(SolutionDir)platforms" "$(OutDir)platforms" /E /I /D /Y
xcopy "$(SolutionDir)addons/*.py" "$(OutDir)addons" /E /I /D /Y
xcopy "$(SolutionDir)addons/*.json" "$(OutDir)addons" /E /I /D /Y
xcopy "$(SolutionDir)cfg" "$(OutDir)cfg" /E /I /D /Y
-xcopy "$(SolutionDir)platforms" "$(OutDir)platforms" /E /I /D /Y
+xcopy "$(SolutionDir)platforms" "$(OutDir)platforms" /E /I /D /Y
+del /q "$(OutDir)platforms/unix32-unsigned.xml"
+del /q "$(OutDir)platforms/unix64-unsigned.xml"
@@ -396,7 +402,9 @@ xcopy "$(SolutionDir)platforms" "$(OutDir)platforms" /E /I /D /Y
xcopy "$(SolutionDir)addons/*.py" "$(OutDir)addons" /E /I /D /Y
xcopy "$(SolutionDir)addons/*.json" "$(OutDir)addons" /E /I /D /Y
xcopy "$(SolutionDir)cfg" "$(OutDir)cfg" /E /I /D /Y
-xcopy "$(SolutionDir)platforms" "$(OutDir)platforms" /E /I /D /Y
+xcopy "$(SolutionDir)platforms" "$(OutDir)platforms" /E /I /D /Y
+del /q "$(OutDir)platforms/unix32-unsigned.xml"
+del /q "$(OutDir)platforms/unix64-unsigned.xml"
diff --git a/platforms/unix32-unsigned.xml b/platforms/unix32-unsigned.xml
deleted file mode 100644
index b2a56502ef7..00000000000
--- a/platforms/unix32-unsigned.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
- 8
- unsigned
-
- 1
- 2
- 4
- 4
- 8
- 4
- 8
- 12
- 4
- 4
- 2
-
-
diff --git a/platforms/unix64-unsigned.xml b/platforms/unix64-unsigned.xml
deleted file mode 100644
index 818c2841580..00000000000
--- a/platforms/unix64-unsigned.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
- 8
- unsigned
-
- 1
- 2
- 4
- 8
- 8
- 4
- 8
- 16
- 8
- 8
- 4
-
-
diff --git a/releasenotes.txt b/releasenotes.txt
index 9cdf8ceb1df..8fc3a653294 100644
--- a/releasenotes.txt
+++ b/releasenotes.txt
@@ -18,4 +18,5 @@ Deprecations:
Other:
- Removed deprecated support for builds with Qt5.
- Added make variables `CXXOPTS` and `LDOPTS` to extend existing `CXXFLAGS` and `LDFLAGS`.
+- Removed deprecated platforms `unix32-unsigned` and `unix64-unsigned`.
-
diff --git a/test/testcmdlineparser.cpp b/test/testcmdlineparser.cpp
index 3527ff6cc76..f0de4d18e81 100644
--- a/test/testcmdlineparser.cpp
+++ b/test/testcmdlineparser.cpp
@@ -1766,9 +1766,8 @@ class TestCmdlineParser : public TestFixture {
REDIRECT;
const char * const argv[] = {"cppcheck", "--platform=unix32-unsigned", "file.cpp"};
ASSERT(settings->platform.set(Platform::Type::Unspecified));
- ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
- ASSERT_EQUALS(Platform::Type::Unix32, settings->platform.type);
- ASSERT_EQUALS("cppcheck: The platform 'unix32-unsigned' has been deprecated and will be removed in Cppcheck 2.19. Please use '--platform=unix32 --funsigned-char' instead\n", logger->str());
+ ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
+ ASSERT_EQUALS("cppcheck: error: unrecognized platform: 'unix32-unsigned'.\n", logger->str());
}
void platformUnix64() {
@@ -1783,9 +1782,8 @@ class TestCmdlineParser : public TestFixture {
REDIRECT;
const char * const argv[] = {"cppcheck", "--platform=unix64-unsigned", "file.cpp"};
ASSERT(settings->platform.set(Platform::Type::Unspecified));
- ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parseFromArgs(argv));
- ASSERT_EQUALS(Platform::Type::Unix64, settings->platform.type);
- ASSERT_EQUALS("cppcheck: The platform 'unix64-unsigned' has been deprecated and will be removed in Cppcheck 2.19. Please use '--platform=unix64 --funsigned-char' instead\n", logger->str());
+ ASSERT_EQUALS_ENUM(CmdLineParser::Result::Fail, parseFromArgs(argv));
+ ASSERT_EQUALS("cppcheck: error: unrecognized platform: 'unix64-unsigned'.\n", logger->str());
}
void platformNative() {
diff --git a/win_installer/cppcheck.wxs b/win_installer/cppcheck.wxs
index 6215077384d..7b5cc45614a 100644
--- a/win_installer/cppcheck.wxs
+++ b/win_installer/cppcheck.wxs
@@ -149,8 +149,6 @@
-
-