Switch StaticAnalysisTest build test to use the new build system CPPCHECK module...

diff --git a/BuildTests/BoardDriverTest/makefile b/BuildTests/BoardDriverTest/makefile
index 1d1be86..252b3f8 100644 (file)
--- a/BuildTests/BoardDriverTest/makefile
+++ b/BuildTests/BoardDriverTest/makefile
@@ -59,4 +59,8 @@ clean:
        $(MAKE) -s -f makefile.test clean ARCH=UC3\r
 \r
 %:\r
        $(MAKE) -s -f makefile.test clean ARCH=UC3\r
 \r
 %:\r

-       
\ No newline at end of file
+\r
+.PHONY: all begin end makeboardlist testboards clean\r
+\r
+# Include LUFA build script makefiles\r
+include $(LUFA_ROOT_PATH)/LUFA/Build/lufa.core.in\r

diff --git a/BuildTests/BootloaderTest/makefile b/BuildTests/BootloaderTest/makefile
index 08b7590..635c5c6 100644 (file)
--- a/BuildTests/BootloaderTest/makefile
+++ b/BuildTests/BootloaderTest/makefile
@@ -54,4 +54,8 @@ clean:
        rm -f BuildMakefile\r
 \r
 %:\r
        rm -f BuildMakefile\r
 \r
 %:\r

-       
\ No newline at end of file
+\r
+.PHONY: all begin end testbootloaders clean\r
+\r
+# Include LUFA build script makefiles\r
+include $(LUFA_ROOT_PATH)/LUFA/Build/lufa.core.in\r

diff --git a/BuildTests/ModuleTest/makefile b/BuildTests/ModuleTest/makefile
index 170c930..6cdd575 100644 (file)
--- a/BuildTests/ModuleTest/makefile
+++ b/BuildTests/ModuleTest/makefile
@@ -51,4 +51,8 @@ clean:
        $(MAKE) -s -f makefile.test clean ARCH=UC3\r
 \r
 %:\r
        $(MAKE) -s -f makefile.test clean ARCH=UC3\r
 \r
 %:\r

-       
\ No newline at end of file
+\r
+.PHONY: all arch_avr8 arch_xmega arch_uc3 begin end\r
+\r
+# Include LUFA build script makefiles\r
+include $(LUFA_ROOT_PATH)/LUFA/Build/lufa.core.in\r

diff --git a/BuildTests/SingleUSBModeTest/makefile b/BuildTests/SingleUSBModeTest/makefile
index 93027d9..98e2d25 100644 (file)
--- a/BuildTests/SingleUSBModeTest/makefile
+++ b/BuildTests/SingleUSBModeTest/makefile
@@ -37,4 +37,8 @@ clean:
        $(MAKE) -s -f makefile.test clean ARCH=UC3\r
 \r
 %:\r
        $(MAKE) -s -f makefile.test clean ARCH=UC3\r
 \r
 %:\r

-       
\ No newline at end of file
+\r
+.PHONY: begin end compile clean\r
+\r
+# Include LUFA build script makefiles\r
+include $(LUFA_ROOT_PATH)/LUFA/Build/lufa.core.in\r

diff --git a/BuildTests/StaticAnalysisTest/makefile b/BuildTests/StaticAnalysisTest/makefile
index 1578412..6f138af 100644 (file)
--- a/BuildTests/StaticAnalysisTest/makefile
+++ b/BuildTests/StaticAnalysisTest/makefile
@@ -8,30 +8,16 @@
 \r
 # Static anlysis of the entire LUFA source tree, using the free cross-platform "cppcheck" tool.\r
 \r
 \r
 # Static anlysis of the entire LUFA source tree, using the free cross-platform "cppcheck" tool.\r
 \r

-# Path to the root of the LUFA tree to scan\r
-LUFA_ROOT_PATH    = ../..\r
+LUFA_ROOT_PATH = ../..\r

 \r
 \r

-# Filenames or directories (including fragments) to exclude from the analysis\r
-EXCLUDE_LIST      = FATFs/            \\r
+CPPCHECK_EXCLUDES = FATFs/            \\r

                     PetiteFATFs/      \\r
                     uip/\r
                     PetiteFATFs/      \\r
                     uip/\r

+CPPCHECK_INCLUDES = $(LUFA_ROOT_PATH)/LUFA/CodeTemplates/   \\r
+                    $(LUFA_ROOT_PATH)/Projects/AVRISP-MKII/\r
+CPPCHECK_PATH     = $(LUFA_ROOT_PATH)\r

 \r
 \r

-# Output message template for found warnings and errors\r
-MESSAGE_TEMPLATE  = "{file}:{line}: {severity} ({id}): {message}"\r
-\r
-# Checks to suppress so that generated warnings are discarded\r
-SUPPRESS_WARNINGS = variableScope     \\r
-                    missingInclude\r
-\r
-# Extra paths to search for include files\r
-INCLUDE_PATHS     = $(LUFA_ROOT_PATH)/LUFA/CodeTemplates/      \\r
-                                       $(LUFA_ROOT_PATH)/Projects/AVRISP-MKII/\r
-\r
-# Configuration options to pass to cppcheck\r
-CPPCHECK_OPTIONS  = --template=$(MESSAGE_TEMPLATE) $(INCLUDE_PATHS:%=-I%) $(EXCLUDE_LIST:%=-i%) --inline-suppr --force --error-exitcode=1 --std=c99\r
-\r
-\r
-all: begin staticcheck end\r
+all: begin cppcheck-config cppcheck end\r

 \r
 begin:\r
        @echo Executing build test "StaticAnalysisTest".\r
 \r
 begin:\r
        @echo Executing build test "StaticAnalysisTest".\r


@@ -41,9 +27,10 @@ end:
        @echo Build test "StaticAnalysisTest" complete.\r
        @echo\r
 \r
        @echo Build test "StaticAnalysisTest" complete.\r
        @echo\r
 \r

-staticcheck:\r
-       cppcheck --quiet $(CPPCHECK_OPTIONS) --check-config $(LUFA_ROOT_PATH)\r
-       cppcheck --quiet $(CPPCHECK_OPTIONS) --enable=all $(SUPPRESS_WARNINGS:%=--suppress=%) $(LUFA_ROOT_PATH)\r
-\r

 %:\r
 %:\r

-       
\ No newline at end of file
+\r
+.PHONY: all begin end\r
+\r
+# Include LUFA build script makefiles\r
+include $(LUFA_ROOT_PATH)/LUFA/Build/lufa.core.in\r
+include $(LUFA_ROOT_PATH)/LUFA/Build/lufa.cppcheck.in
\ No newline at end of file