From 9d1b93fb95dd9726af60900f34395c8ac0708a9b Mon Sep 17 00:00:00 2001 From: Ian G Date: Wed, 10 Apr 2013 17:30:52 -0700 Subject: [PATCH 1/4] target name can include spaces and +s, parse until "OF PROJECT" --- lib/xcode_build/translations/cleaning.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/xcode_build/translations/cleaning.rb b/lib/xcode_build/translations/cleaning.rb index 500791c..d4e3b0e 100644 --- a/lib/xcode_build/translations/cleaning.rb +++ b/lib/xcode_build/translations/cleaning.rb @@ -46,8 +46,8 @@ def cleaning? def notify_clean_started(line) @cleaning = true - target = line.match(/TARGET (\w+)/)[1] project = line.match(/PROJECT (\w+)/)[1] + target = line.match(/TARGET ([\w\+ ]+) OF PROJECT/)[1] if line =~ /DEFAULT CONFIGURATION \((\w+)\)/ configuration = $1 From 385980638227ecfd7a7c876bfe03a21d162d3879 Mon Sep 17 00:00:00 2001 From: Ian G Date: Wed, 10 Apr 2013 17:32:43 -0700 Subject: [PATCH 2/4] project can include spaces and +s, parse until WITH --- lib/xcode_build/translations/cleaning.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/xcode_build/translations/cleaning.rb b/lib/xcode_build/translations/cleaning.rb index d4e3b0e..34f746b 100644 --- a/lib/xcode_build/translations/cleaning.rb +++ b/lib/xcode_build/translations/cleaning.rb @@ -46,8 +46,8 @@ def cleaning? def notify_clean_started(line) @cleaning = true - project = line.match(/PROJECT (\w+)/)[1] target = line.match(/TARGET ([\w\+ ]+) OF PROJECT/)[1] + project = line.match(/OF PROJECT ([\w\+ ]+) WITH/)[1] if line =~ /DEFAULT CONFIGURATION \((\w+)\)/ configuration = $1 From 456522d9bc3225aba05d447fc4b954ad8960e696 Mon Sep 17 00:00:00 2001 From: Ian G Date: Thu, 11 Apr 2013 15:53:06 -0700 Subject: [PATCH 3/4] target and project changes brought to building translation --- lib/xcode_build/translations/building.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/xcode_build/translations/building.rb b/lib/xcode_build/translations/building.rb index b66f355..78f9729 100644 --- a/lib/xcode_build/translations/building.rb +++ b/lib/xcode_build/translations/building.rb @@ -60,9 +60,9 @@ def building? def notify_build_started(line) @building = true - target = line.match(/TARGET ([\w\-\.]+)/)[1] - project = line.match(/PROJECT ([\w\-\.]+)/)[1] - + target = line.match(/TARGET ([\w\+ ]+) OF PROJECT/)[1] + project = line.match(/OF PROJECT ([\w\+ ]+) WITH/)[1] + if line =~ /DEFAULT CONFIGURATION \((\w+)\)/ configuration = $1 default = true From 24ebbff9d92ec7184ad41853b23931d7f8d0a1d0 Mon Sep 17 00:00:00 2001 From: Ian G Date: Thu, 11 Apr 2013 16:56:21 -0700 Subject: [PATCH 4/4] include "." and "-" characters in target and project names --- lib/xcode_build/translations/building.rb | 4 ++-- lib/xcode_build/translations/cleaning.rb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/xcode_build/translations/building.rb b/lib/xcode_build/translations/building.rb index 78f9729..5c5a7b2 100644 --- a/lib/xcode_build/translations/building.rb +++ b/lib/xcode_build/translations/building.rb @@ -60,8 +60,8 @@ def building? def notify_build_started(line) @building = true - target = line.match(/TARGET ([\w\+ ]+) OF PROJECT/)[1] - project = line.match(/OF PROJECT ([\w\+ ]+) WITH/)[1] + target = line.match(/TARGET ([\w\+\-\. ]+) OF PROJECT/)[1] + project = line.match(/OF PROJECT ([\w\+\-\. ]+) WITH/)[1] if line =~ /DEFAULT CONFIGURATION \((\w+)\)/ configuration = $1 diff --git a/lib/xcode_build/translations/cleaning.rb b/lib/xcode_build/translations/cleaning.rb index 34f746b..bf3caa9 100644 --- a/lib/xcode_build/translations/cleaning.rb +++ b/lib/xcode_build/translations/cleaning.rb @@ -46,7 +46,7 @@ def cleaning? def notify_clean_started(line) @cleaning = true - target = line.match(/TARGET ([\w\+ ]+) OF PROJECT/)[1] + target = line.match(/TARGET ([\w\+\-\. ]+) OF PROJECT/)[1] project = line.match(/OF PROJECT ([\w\+ ]+) WITH/)[1] if line =~ /DEFAULT CONFIGURATION \((\w+)\)/