From cba94fededfa43d50263f63c47b4763653d394b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= Date: Wed, 28 Oct 2009 17:37:38 +0100 Subject: [PATCH] Restructuring: Updated the Visual Studio project files. They are now generated by qmake --- cli/cli.pro | 2 +- cli/cppcheck.vcproj | 232 ++++++++++++++++++++ {lib => cli}/resource.h | 0 cppcheck.sln | 23 +- cppcheck.vcproj | 368 -------------------------------- gui/gui.pro | 2 +- lib/lib.pri | 2 - test/test.vcproj | 263 +++++++++++++++++++++++ testrunner.sln | 20 -- testrunner.vcproj | 455 ---------------------------------------- 10 files changed, 514 insertions(+), 853 deletions(-) create mode 100755 cli/cppcheck.vcproj rename {lib => cli}/resource.h (100%) delete mode 100644 cppcheck.vcproj create mode 100755 test/test.vcproj delete mode 100644 testrunner.sln delete mode 100644 testrunner.vcproj diff --git a/cli/cli.pro b/cli/cli.pro index a990736cce2..536337268d2 100644 --- a/cli/cli.pro +++ b/cli/cli.pro @@ -17,7 +17,7 @@ HEADERS += cppcheckexecutor.cpp \ win32 { CONFIG += embed_manifest_exe console RC_FILE = cppcheck.rc - HEADERS += ../lib/resource.h + HEADERS += resource.h LIBS += -lshlwapi } diff --git a/cli/cppcheck.vcproj b/cli/cppcheck.vcproj new file mode 100755 index 00000000000..42fb591fd3a --- /dev/null +++ b/cli/cppcheck.vcproj @@ -0,0 +1,232 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/lib/resource.h b/cli/resource.h similarity index 100% rename from lib/resource.h rename to cli/resource.h diff --git a/cppcheck.sln b/cppcheck.sln index d6d87c590f4..e5b13d0dbb9 100644 --- a/cppcheck.sln +++ b/cppcheck.sln @@ -1,7 +1,10 @@ - Microsoft Visual Studio Solution File, Format Version 10.00 # Visual C++ Express 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cppcheck", "cppcheck.vcproj", "{ECA5D746-4926-48BA-A372-FC888498531F}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cppcheck", "cli\cppcheck.vcproj", "{7D0D241B-E144-3FAC-ABD3-8D1BBA4B600A}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test", "test\test.vcproj", "{BA98E531-D8B3-39CB-8171-064854404B81}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gui", "gui\gui.vcproj", "{90DD0565-D4DF-3B1A-A053-7947FB35F90D}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -9,10 +12,18 @@ Global Release|Win32 = Release|Win32 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {ECA5D746-4926-48BA-A372-FC888498531F}.Debug|Win32.ActiveCfg = Debug|Win32 - {ECA5D746-4926-48BA-A372-FC888498531F}.Debug|Win32.Build.0 = Debug|Win32 - {ECA5D746-4926-48BA-A372-FC888498531F}.Release|Win32.ActiveCfg = Release|Win32 - {ECA5D746-4926-48BA-A372-FC888498531F}.Release|Win32.Build.0 = Release|Win32 + {7D0D241B-E144-3FAC-ABD3-8D1BBA4B600A}.Debug|Win32.ActiveCfg = Debug|Win32 + {7D0D241B-E144-3FAC-ABD3-8D1BBA4B600A}.Debug|Win32.Build.0 = Debug|Win32 + {7D0D241B-E144-3FAC-ABD3-8D1BBA4B600A}.Release|Win32.ActiveCfg = Release|Win32 + {7D0D241B-E144-3FAC-ABD3-8D1BBA4B600A}.Release|Win32.Build.0 = Release|Win32 + {BA98E531-D8B3-39CB-8171-064854404B81}.Debug|Win32.ActiveCfg = Debug|Win32 + {BA98E531-D8B3-39CB-8171-064854404B81}.Debug|Win32.Build.0 = Debug|Win32 + {BA98E531-D8B3-39CB-8171-064854404B81}.Release|Win32.ActiveCfg = Release|Win32 + {BA98E531-D8B3-39CB-8171-064854404B81}.Release|Win32.Build.0 = Release|Win32 + {90DD0565-D4DF-3B1A-A053-7947FB35F90D}.Debug|Win32.ActiveCfg = Debug|Win32 + {90DD0565-D4DF-3B1A-A053-7947FB35F90D}.Debug|Win32.Build.0 = Debug|Win32 + {90DD0565-D4DF-3B1A-A053-7947FB35F90D}.Release|Win32.ActiveCfg = Release|Win32 + {90DD0565-D4DF-3B1A-A053-7947FB35F90D}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/cppcheck.vcproj b/cppcheck.vcproj deleted file mode 100644 index cf613a3a91c..00000000000 --- a/cppcheck.vcproj +++ /dev/null @@ -1,368 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/gui/gui.pro b/gui/gui.pro index 7ec80f95c51..30a1260c26e 100644 --- a/gui/gui.pro +++ b/gui/gui.pro @@ -67,7 +67,7 @@ SOURCES += main.cpp \ win32 { RC_FILE = cppcheck-gui.rc - HEADERS += ../lib/resource.h + HEADERS += ../cli/resource.h LIBS += -lshlwapi } diff --git a/lib/lib.pri b/lib/lib.pri index 4800be1797d..dc0e575158e 100644 --- a/lib/lib.pri +++ b/lib/lib.pri @@ -17,12 +17,10 @@ HEADERS += $$PWD/check.h \ $$PWD/filelister.h \ $$PWD/mathlib.h \ $$PWD/preprocessor.h \ - $$PWD/resource.h \ $$PWD/settings.h \ $$PWD/token.h \ $$PWD/tokenize.h -# no main.cpp here SOURCES += $$PWD/checkautovariables.cpp \ $$PWD/checkbufferoverrun.cpp \ $$PWD/checkclass.cpp \ diff --git a/test/test.vcproj b/test/test.vcproj new file mode 100755 index 00000000000..685f3568496 --- /dev/null +++ b/test/test.vcproj @@ -0,0 +1,263 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/testrunner.sln b/testrunner.sln deleted file mode 100644 index c97d9d2a600..00000000000 --- a/testrunner.sln +++ /dev/null @@ -1,20 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual C++ Express 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testrunner", "testrunner.vcproj", "{ABA515EF-1C57-4980-8E40-2C937D212C9D}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Release|Win32 = Release|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {ABA515EF-1C57-4980-8E40-2C937D212C9D}.Debug|Win32.ActiveCfg = Debug|Win32 - {ABA515EF-1C57-4980-8E40-2C937D212C9D}.Debug|Win32.Build.0 = Debug|Win32 - {ABA515EF-1C57-4980-8E40-2C937D212C9D}.Release|Win32.ActiveCfg = Release|Win32 - {ABA515EF-1C57-4980-8E40-2C937D212C9D}.Release|Win32.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/testrunner.vcproj b/testrunner.vcproj deleted file mode 100644 index 1f39b06ccfa..00000000000 --- a/testrunner.vcproj +++ /dev/null @@ -1,455 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -