Fix for Xcode 5.1 and include lcov scripts

Author: Jon Reid

.gitignore

@@ -1,2 +1 @@
 env.sh
-lcov-*

LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright 2012 Jonathan M. Reid
+Copyright 2014 Jonathan M. Reid
 All rights reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of

README.md

@@ -1,7 +1,5 @@
 These scripts provide a simple way to generate HTML reports of the code coverage
 of your Xcode project.  
-For a detailed blog post, see http://qualitycoding.org/xcode-code-coverage/  
-For additional steps needed to get code coverage in iOS 7, see http://qualitycoding.org/ios-7-code-coverage/
 
 
 Installation
@@ -10,14 +8,14 @@ Installation
 1. Fork this repository; you're probably going to want to make your own
 modifications.
 2. Place the XcodeCoverage folder in the same folder as your Xcode project.
-3. [Dowload lcov-1.10](http://downloads.sourceforge.net/ltp/lcov-1.10.tar.gz).
-Place the lcov-1.10 folder inside the XcodeCoverage folder.
-4. Get Xcode's coverage instrumentation by going to Xcode Preferences, into Downloads, and installing Command Line Tools.
-5. In your Xcode project, enable these two build settings at the project level
+3. Depending on your version of Xcode, you may need to get Xcode's coverage
+instrumentation by going to Xcode Preferences, into Downloads, and installing
+Command Line Tools.
+4. In your Xcode project, enable these two build settings at the project level
 for your Debug configuration only:
   * Instrument Program Flow
   * Generate Test Coverage Files
-6. In your main target, add a Run Script build phase to execute
+5. In your main target, add a Run Script build phase to execute
 ``XcodeCoverage/exportenv.sh``
 
 A few people have been tripped up by the last step: Make sure you add the

cleancov

@@ -1,11 +1,11 @@
 #!/bin/sh
 #
-#   Copyright 2012 Jonathan M. Reid. See LICENSE.txt
+#   Copyright 2014 Jonathan M. Reid. See LICENSE.txt
 #   Created by: Jon Reid, http://qualitycoding.org/
 #   Source: https://github.com/jonreid/XcodeCoverage
 #
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 source ${DIR}/envcov.sh
 
-"${LCOV}" --zerocounters -d "${OBJ_DIR}"
+LCOV --zerocounters -d "${OBJ_DIR}"

envcov.sh

@@ -1,5 +1,5 @@
 #
-#   Copyright 2012 Jonathan M. Reid. See LICENSE.txt
+#   Copyright 2014 Jonathan M. Reid. See LICENSE.txt
 #   Created by: Jon Reid, http://qualitycoding.org/
 #   Source: https://github.com/jonreid/XcodeCoverage
 #
@@ -10,6 +10,11 @@ source ${DIR}/env.sh
 # Change the report name if you like:
 LCOV_INFO=Coverage.info
 
-LCOV_PATH=${SRCROOT}/XcodeCoverage/lcov-1.10/bin
-LCOV=${LCOV_PATH}/lcov
+XCODECOVERAGE_PATH="${SRCROOT}/XcodeCoverage"
+LCOV_PATH="${XCODECOVERAGE_PATH}/lcov-1.10/bin"
 OBJ_DIR=${OBJECT_FILE_DIR_normal}/${CURRENT_ARCH}
+
+# Fix for the new LLVM-COV that requires gcov to have a -v paramter
+LCOV() {
+	${LCOV_PATH}/lcov $* --gcov-tool ${XCODECOVERAGE_PATH}/llvm-cov-wrapper
+}

exportenv.sh

@@ -1,5 +1,5 @@
 #
-#   Copyright 2012 Jonathan M. Reid. See LICENSE.txt
+#   Copyright 2014 Jonathan M. Reid. See LICENSE.txt
 #   Created by: Jon Reid, http://qualitycoding.org/
 #   Source: https://github.com/jonreid/XcodeCoverage
 #

getcov

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#   Copyright 2012 Jonathan M. Reid. See LICENSE.txt
+#   Copyright 2014 Jonathan M. Reid. See LICENSE.txt
 #   Created by: Jon Reid, http://qualitycoding.org/
 #   Source: https://github.com/jonreid/XcodeCoverage
 #
@@ -26,13 +26,13 @@ enter_lcov_dir()
 
 gather_coverage()
 {
-    "${LCOV}" --capture -b "${SRCROOT}" -d "${OBJ_DIR}" -o ${LCOV_INFO}
+    LCOV --capture -b "${SRCROOT}" -d "${OBJ_DIR}" -o ${LCOV_INFO}
 }
 
 exclude_data()
 {
-    "${LCOV}" --remove ${LCOV_INFO} "/Applications/Xcode.app/*" -d "${OBJ_DIR}" -o ${LCOV_INFO}
-    "${LCOV}" --remove ${LCOV_INFO} "main.m" -d "${OBJ_DIR}" -o ${LCOV_INFO}
+    LCOV --remove ${LCOV_INFO} "Applications/Xcode.app/*" -d "${OBJ_DIR}" -o ${LCOV_INFO}
+    LCOV --remove ${LCOV_INFO} "main.m" -d "${OBJ_DIR}" -o ${LCOV_INFO}
     # Remove other patterns here...
 }