merge contributions from github

This commit is contained in:
Laurent Sansonetti
2012-09-26 16:20:29 +02:00
parent 4eb9622857
commit f87379dbb5
2 changed files with 2 additions and 2 deletions

View File

@@ -97,7 +97,7 @@ task :simulator => ['build:simulator'] do
sim = File.join(App.config.bindir, 'sim')
debug = (ENV['debug'] ? 1 : (App.config.spec_mode ? '0' : '2'))
App.info 'Simulate', app
at_exit { system("stty echo") } # Just in case the simulator launcher crashes and leaves the terminal without echo.
at_exit { system("stty echo") } if $stdout.tty? # Just in case the simulator launcher crashes and leaves the terminal without echo.
sh "#{env} #{sim} #{debug} #{family_int} #{target} \"#{xcode}\" \"#{app}\""
end

View File

@@ -666,7 +666,7 @@ EOS
dict['application-identifier'] ||= seed_id + '.' + identifier
else
# Required for gdb.
dict['get-task-allow'] ||= true
dict['get-task-allow'] = true if dict['get-task-allow'].nil?
end
Motion::PropertyList.to_s(dict)
end