Skip to content
This repository has been archived by the owner on Aug 24, 2019. It is now read-only.

Replace oclint-xcodebuild by xcpretty #25

Merged
merged 3 commits into from
Apr 21, 2017
+2 −3
Merged

Replace oclint-xcodebuild by xcpretty #25

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3948373
Replace oclint-xcodebuild by xcpretty
davidy4ng Mar 28, 2017
e84077e
fix : XCPRETTY_CMD usage
davidy4ng Mar 28, 2017
bc54b5a
Fix XCPRETTY_CMD usage
davidy4ng Mar 28, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions src/main/shell/run-sonar.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,6 @@ echo "Running run-sonar.sh..."
# xctool, oclint installed
testIsInstalled xcodebuild
testIsInstalled oclint
testIsInstalled oclint-xcodebuild

# sonar-project.properties in current directory
if [ ! -f sonar-project.properties ]; then
Expand Down Expand Up @@ -244,8 +243,8 @@ if [[ ! -z "$destinationSimulator" ]]; then
buildCmd+=(-destination "$destinationSimulator" -destination-timeout 360)
fi
runCommand xcodebuild.log "${buildCmd[@]}"
oclint-xcodebuild # Transform the xcodebuild.log file into a compile_command.json file

#oclint-xcodebuild # Transform the xcodebuild.log file into a compile_command.json file
cat xcodebuild.log | $XCPRETTY_CMD -r json-compilation-database -o compile_commands.json

# Unit tests and coverage
if [ "$testScheme" = "" ]; then
Expand Down