From 8fdf7f7c8198f6b7dbfb947d6292ed0be8dc2790 Mon Sep 17 00:00:00 2001 From: MattesGroeger Date: Tue, 17 Sep 2013 10:29:21 +0200 Subject: [PATCH] Removed unused coveralls shell script --- .travis.yml | 2 +- Rakefile | 70 ++++++++++++++++++++++++--------------------- script/coveralls.sh | 56 ------------------------------------ 3 files changed, 38 insertions(+), 90 deletions(-) delete mode 100755 script/coveralls.sh diff --git a/.travis.yml b/.travis.yml index f4f4948..1ec0dfa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,4 +6,4 @@ before_install: - brew install xctool --HEAD script: rake build --trace after_success: - - rake report --trace + - rake coveralls --trace diff --git a/Rakefile b/Rakefile index 00e1af2..7204682 100644 --- a/Rakefile +++ b/Rakefile @@ -20,45 +20,17 @@ task :build do end desc 'Report code coverage of main target to coveralls.io' -task :report do - scheme = scheme_for_name("") - settings = build_settings_per_target(workspace, scheme)[scheme] - gcov_dir = "#{settings['OBJECT_FILE_DIR_normal']}/#{settings['CURRENT_ARCH']}" - - generate_gcov(gcov_dir) - copy_gcov_to_project_dir(gcov_dir) +task :coveralls do + dir = gcov_dir + + generate_gcov(dir) + copy_gcov_to_project_dir(dir) send_report([scheme_for_name("Example"), scheme_for_name("Tests"), "Pods"]) remove_gcov_dir end task :default => :build -def generate_gcov(gcov_dir) - puts "generate gcov files..." - command = "cd #{gcov_dir}" - Dir["#{gcov_dir}/*.gcda"].each do |file| - command << " && gcov-4.2 '#{file}' -o '#{gcov_dir}'" - end - `#{command}` -end - -def copy_gcov_to_project_dir(gcov_dir) - `cp -r '#{gcov_dir}' gcov` -end - -def send_report(excludes) - puts "send report..." - command = "coveralls --verbose" - excludes.each do |exclude| - command << " -e '#{exclude}'" - end - `#{command}` -end - -def remove_gcov_dir - `rm -r gcov` -end - def buildAndLogScheme(name, is_test = false) scheme = workspace.gsub(".xcworkspace", name) result = compile(workspace, scheme, is_test) @@ -96,6 +68,38 @@ def compile(workspace, scheme, is_test) end end +def gcov_dir + scheme = scheme_for_name("") + settings = build_settings_per_target(workspace, scheme)[scheme] + "#{settings['OBJECT_FILE_DIR_normal']}/#{settings['CURRENT_ARCH']}" +end + +def generate_gcov(gcov_dir) + puts "generate gcov files..." + command = "cd #{gcov_dir}" + Dir["#{gcov_dir}/*.gcda"].each do |file| + command << " && gcov-4.2 '#{file}' -o '#{gcov_dir}'" + end + `#{command}` +end + +def copy_gcov_to_project_dir(gcov_dir) + `cp -r '#{gcov_dir}' gcov` +end + +def send_report(excludes) + puts "send report..." + command = "coveralls --verbose" + excludes.each do |exclude| + command << " -e '#{exclude}'" + end + `#{command}` +end + +def remove_gcov_dir + `rm -r gcov` +end + def build_settings_per_target(workspace, scheme) settings = `xctool -workspace #{workspace} -scheme #{scheme} -configuration Release -sdk iphonesimulator -showBuildSettings` current_target = "" diff --git a/script/coveralls.sh b/script/coveralls.sh deleted file mode 100755 index a9cddb6..0000000 --- a/script/coveralls.sh +++ /dev/null @@ -1,56 +0,0 @@ -#!/bin/bash - -trim() -{ - trimmed=$1 - trimmed=${trimmed%% } - trimmed=${trimmed## } - - echo $trimmed -} - -# declare BUILT_PRODUCTS_DIR CURRENT_ARCH OBJECT_FILE_DIR_normal SRCROOT OBJROOT -declare -r xctoolVars=$(xctool -workspace MGBenchmark.xcworkspace -scheme MGBenchmarkTests -sdk iphonesimulator -configuration Release -showBuildSettings | egrep '(BUILT_PRODUCTS_DIR)|(CURRENT_ARCH)|(OBJECT_FILE_DIR_normal)|(SRCROOT)|(OBJROOT)' | egrep -v 'Pods') -while read line; do - declare key=$(echo "${line}" | cut -d "=" -f1) - declare value=$(echo "${line}" | cut -d "=" -f2) - printf -v "`trim ${key}`" "`trim ${value}`" # https://sites.google.com/a/tatsuo.jp/programming/Home/bash/hentai-bunpou-saisoku-masuta -done < <( echo "${xctoolVars}" ) - -declare -r gcov_dir="${OBJECT_FILE_DIR_normal}/${CURRENT_ARCH}/" - -## ====== - -generateGcov() -{ - # doesn't set output dir to gcov... - cd "${gcov_dir}" - for file in ${gcov_dir}/*.gcda - do - gcov-4.2 "${file}" -o "${gcov_dir}" - done - cd - -} - -copyGcovToProjectDir() -{ - cp -r "${gcov_dir}" gcov -} - -removeGcov(){ - rm -r gcov -} - -main() -{ - -# generate + copy - generateGcov - copyGcovToProjectDir -# post - coveralls ${@+"$@"} -# clean up - removeGcov -} - -main ${@+"$@"}