Merge pull request #221 from swift-nav/checkoutput-diff-change

improve checkoutput script, doxygen

Author: scottswift

checks/checkoutput.sh

@@ -1,2 +1,3 @@
-#echo "HEY: git diff $1 | $2 --no-tree - > check_output.txt"
-git diff $1 | $2 --no-tree - > check_output.txt
+unset GIT_DIR
+cmd="$(git rev-parse --show-toplevel)/checks/checkpatch.pl"
+git diff origin/master --staged | eval "\"$cmd\"" --no-tree - > style_check_output.txt

checks/pre-commit

@@ -1,3 +1,3 @@
 echo "precommit running. checking build located at ${subdir}."
 cd "${subdir}"
-make check-coverage
+make check-style

docs/CMakeLists.txt

@@ -14,18 +14,18 @@ if (BUILD_DOCUMENTATION)
   add_subdirectory(diagrams)
 
   configure_file(Doxyfile.in
-    ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
+    "${CMAKE_CURRENT_BINARY_DIR}/Doxyfile"
     @ONLY
   )
 
   add_custom_target(docs
-    ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
-    COMMENT "Building Doxygen documentation"
+    ${DOXYGEN_EXECUTABLE} "${CMAKE_CURRENT_BINARY_DIR}/Doxyfile"
+    COMMENT "Building Doxygen documentation\nWriting warnings/errors to WARN_LOGFILE"
     DEPENDS diagrams Doxyfile.in
   )
 
   set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES
-		${CMAKE_CURRENT_BINARY_DIR}/html
+		"${CMAKE_CURRENT_BINARY_DIR}/html"
   )
 
 endif (BUILD_DOCUMENTATION)

docs/Doxyfile.in

@@ -52,7 +52,7 @@ PROJECT_LOGO           =
 # If a relative path is entered, it will be relative to the location
 # where doxygen was started. If left blank the current directory will be used.
 
-OUTPUT_DIRECTORY       = @CMAKE_CURRENT_BINARY_DIR@
+OUTPUT_DIRECTORY       = "@CMAKE_CURRENT_BINARY_DIR@"
 
 # If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
 # 4096 sub-directories (in 2 levels) under the output directory of each output
@@ -140,7 +140,7 @@ FULL_PATH_NAMES        = YES
 # relative paths, which will be relative from the directory where doxygen is
 # started.
 
-STRIP_FROM_PATH        = @PROJECT_SOURCE_DIR@
+STRIP_FROM_PATH        = "@PROJECT_SOURCE_DIR@"
 
 # The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
 # the path mentioned in the documentation of a class, which tells
@@ -655,9 +655,9 @@ WARN_LOGFILE           = doxygen_warnings.txt
 # directories like "/usr/src/myproject". Separate the files or directories
 # with spaces.
 
-INPUT                  = @PROJECT_SOURCE_DIR@/src/ \
-                         @PROJECT_SOURCE_DIR@/include/ \
-                         @PROJECT_SOURCE_DIR@/docs/
+INPUT                  = "@PROJECT_SOURCE_DIR@/src/" \
+                         "@PROJECT_SOURCE_DIR@/include/" \
+                         "@PROJECT_SOURCE_DIR@/docs/"
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
@@ -767,7 +767,7 @@ EXAMPLE_RECURSIVE      = NO
 # directories that contain image that are included in the documentation (see
 # the \image command).
 
-IMAGE_PATH             = @CMAKE_CURRENT_BINARY_DIR@/diagrams/
+IMAGE_PATH             = "@CMAKE_CURRENT_BINARY_DIR@/diagrams/"
 
 # The INPUT_FILTER tag can be used to specify a program that doxygen should
 # invoke to filter for each input file. Doxygen will invoke the filter program

src/CMakeLists.txt

@@ -69,11 +69,9 @@ install(FILES ${libswiftnav_HEADERS} DESTINATION include/libswiftnav)
 MESSAGE("${PROJECT_SOURCE_DIR}")
 
 add_custom_command(
-  OUTPUT checkpatch_output.txt
+  OUTPUT checkpatch
   DEPENDS ${libswiftnav_SRCS}
   VERBATIM
-  COMMAND "${PROJECT_SOURCE_DIR}/checks/checkoutput.sh"
-    "${PROJECT_SOURCE_DIR}/src/*.c"
-    "${PROJECT_SOURCE_DIR}/checks/checkpatch.pl")
+  COMMAND "${PROJECT_SOURCE_DIR}/checks/checkoutput.sh")
 
-add_custom_target(checkpatch DEPENDS checkpatch_output.txt) 
+add_custom_target(checkpatch DEPENDS checkpatch)