Skip to content

Commit

Permalink
Merge remote-tracking branch 'codecaffine/remove-configuration-check'
Browse files Browse the repository at this point in the history
Conflicts:
	lib/shenzhen/commands/build.rb
  • Loading branch information
enriquez committed Oct 8, 2013
2 parents 26d0d7a + ba9ec07 commit f29ad02
Showing 1 changed file with 1 addition and 19 deletions.
20 changes: 1 addition & 19 deletions lib/shenzhen/commands/build.rb
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,10 @@
FileUtils.mkdir_p(@destination) unless File.directory?(@destination)

determine_workspace_or_project! unless @workspace || @project

determine_configuration! unless @configuration
say_error "Configuration #{@configuration} not found" and abort unless (@xcodebuild_info.build_configurations.include?(@configuration) rescue false)

determine_scheme! unless @scheme
say_error "Scheme #{@scheme} not found" and abort unless (@xcodebuild_info.schemes.include?(@scheme) rescue false)

say_warning "Building \"#{@workspace || @project}\" with Scheme \"#{@scheme}\" and Configuration \"#{@configuration}\"\n" unless options.quiet
say_warning "Building \"#{@workspace || @project}\" with Scheme \"#{@scheme}\"\n" unless options.quiet

log "xcodebuild", (@workspace || @project)

Expand Down Expand Up @@ -121,18 +117,4 @@ def determine_scheme!
end
end

def determine_configuration!
configurations = @xcodebuild_info.build_configurations rescue []
if configurations.nil? or configurations.empty? or configurations.include?("Debug")
@configuration = "Debug"
elsif configurations.length == 1
@configuration = configurations.first
end

if @configuration
say_warning "Configuration was not passed, defaulting to #{@configuration}"
else
@configuration = choose "Select a configuration:", *configurations
end
end
end

0 comments on commit f29ad02

Please sign in to comment.