Skip to content

Commit 7546f8c

Browse files
committedDec 9, 2013
Remove server side of iphone driver.
1 parent ef9d578 commit 7546f8c

File tree

111 files changed

+2
-11890
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

111 files changed

+2
-11890
lines changed
 

Diff for: ‎Rakefile

+1-34
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ require 'rake-tasks/dotnet'
3535
require 'rake-tasks/zip'
3636
require 'rake-tasks/c'
3737
require 'rake-tasks/java'
38-
require 'rake-tasks/iphone'
3938
require 'rake-tasks/selenium'
4039
require 'rake-tasks/se-ide'
4140
require 'rake-tasks/ie_code_generator'
@@ -124,8 +123,6 @@ task :support => [
124123
"//java/client/src/org/openqa/selenium/lift",
125124
"//java/client/src/org/openqa/selenium/support",
126125
]
127-
task :iphone_client => ['//java/client/src/org/openqa/selenium/iphone']
128-
task :iphone => [:iphone_server, :iphone_client]
129126

130127
desc 'Build the standalone server'
131128
task 'selenium-server-standalone' => '//java/server/src/org/openqa/grid/selenium:selenium:uber'
@@ -175,7 +172,6 @@ task :test_support => [
175172
"//java/client/test/org/openqa/selenium/support:SmallTests:run",
176173
"//java/client/test/org/openqa/selenium/support:LargeTests:run"
177174
]
178-
task :test_iphone => [:test_iphone_server, '//java/client/test/org/openqa/selenium/iphone:test:run']
179175

180176
# TODO(simon): test-core should go first, but it's changing the least for now.
181177
task :test_selenium => [ :'test-rc', :'test-v1-emulation', :'test-core']
@@ -254,13 +250,11 @@ if (python?)
254250
end
255251

256252

257-
task :build => [:all, :iphone, :remote, :selenium]
253+
task :build => [:all, :remote, :selenium]
258254

259255
desc 'Clean build artifacts.'
260256
task :clean do
261257
rm_rf 'build/'
262-
rm_rf 'iphone/build/'
263-
rm_rf 'iphone/src/objc/atoms.h'
264258
rm_rf 'java/client/build/'
265259
rm_rf 'dist/'
266260
end
@@ -583,33 +577,6 @@ task :test_selenium_py => [:'selenium-core', :'selenium-server-standalone'] do
583577
end
584578
end
585579

586-
#### iPhone ####
587-
task :iphone_server do
588-
sdk = iPhoneSDK?
589-
if sdk != nil then
590-
puts "Building iWebDriver iphone app."
591-
sh "cd iphone && xcodebuild -sdk #{sdk} ARCHS=i386 -target iWebDriver -configuration Debug", :verbose => false
592-
else
593-
puts "XCode not found. Not building the iphone driver."
594-
end
595-
end
596-
597-
# This does not depend on :iphone_server because the dependancy is specified in xcode
598-
task :test_iphone_server do
599-
sdk = iPhoneSDK?
600-
if sdk != nil then
601-
sh "cd iphone && xcodebuild -sdk #{sdk} ARCHS=i386 -target Tests -configuration Debug"
602-
else
603-
puts "XCode and/or iPhoneSDK not found. Not testing iphone_server."
604-
end
605-
end
606-
607-
file "iphone/src/objc/atoms.h" => ["//iphone:atoms"] do |task|
608-
puts "Writing: #{task}"
609-
cp "build/iphone/atoms.h", "iphone/src/objc/atoms.h"
610-
end
611-
task :iphone_atoms => ["iphone/src/objc/atoms.h"]
612-
613580
file "cpp/iedriver/sizzle.h" => [ "//third_party/js/sizzle:sizzle:header" ] do
614581
cp "build/third_party/js/sizzle/sizzle.h", "cpp/iedriver/sizzle.h"
615582
end

Diff for: ‎iphone/Info.plist

-34
This file was deleted.

0 commit comments

Comments
 (0)