Skip to content

Commit

Permalink
Remove server side of iphone driver.
Browse files Browse the repository at this point in the history
  • Loading branch information
shs96c committed Dec 9, 2013
1 parent ef9d578 commit 7546f8c
Show file tree
Hide file tree
Showing 111 changed files with 2 additions and 11,890 deletions.
35 changes: 1 addition & 34 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ require 'rake-tasks/dotnet'
require 'rake-tasks/zip'
require 'rake-tasks/c'
require 'rake-tasks/java'
require 'rake-tasks/iphone'
require 'rake-tasks/selenium'
require 'rake-tasks/se-ide'
require 'rake-tasks/ie_code_generator'
Expand Down Expand Up @@ -124,8 +123,6 @@ task :support => [
"//java/client/src/org/openqa/selenium/lift",
"//java/client/src/org/openqa/selenium/support",
]
task :iphone_client => ['//java/client/src/org/openqa/selenium/iphone']
task :iphone => [:iphone_server, :iphone_client]

desc 'Build the standalone server'
task 'selenium-server-standalone' => '//java/server/src/org/openqa/grid/selenium:selenium:uber'
Expand Down Expand Up @@ -175,7 +172,6 @@ task :test_support => [
"//java/client/test/org/openqa/selenium/support:SmallTests:run",
"//java/client/test/org/openqa/selenium/support:LargeTests:run"
]
task :test_iphone => [:test_iphone_server, '//java/client/test/org/openqa/selenium/iphone:test:run']

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


task :build => [:all, :iphone, :remote, :selenium]
task :build => [:all, :remote, :selenium]

desc 'Clean build artifacts.'
task :clean do
rm_rf 'build/'
rm_rf 'iphone/build/'
rm_rf 'iphone/src/objc/atoms.h'
rm_rf 'java/client/build/'
rm_rf 'dist/'
end
Expand Down Expand Up @@ -583,33 +577,6 @@ task :test_selenium_py => [:'selenium-core', :'selenium-server-standalone'] do
end
end

#### iPhone ####
task :iphone_server do
sdk = iPhoneSDK?
if sdk != nil then
puts "Building iWebDriver iphone app."
sh "cd iphone && xcodebuild -sdk #{sdk} ARCHS=i386 -target iWebDriver -configuration Debug", :verbose => false
else
puts "XCode not found. Not building the iphone driver."
end
end

# This does not depend on :iphone_server because the dependancy is specified in xcode
task :test_iphone_server do
sdk = iPhoneSDK?
if sdk != nil then
sh "cd iphone && xcodebuild -sdk #{sdk} ARCHS=i386 -target Tests -configuration Debug"
else
puts "XCode and/or iPhoneSDK not found. Not testing iphone_server."
end
end

file "iphone/src/objc/atoms.h" => ["//iphone:atoms"] do |task|
puts "Writing: #{task}"
cp "build/iphone/atoms.h", "iphone/src/objc/atoms.h"
end
task :iphone_atoms => ["iphone/src/objc/atoms.h"]

file "cpp/iedriver/sizzle.h" => [ "//third_party/js/sizzle:sizzle:header" ] do
cp "build/third_party/js/sizzle/sizzle.h", "cpp/iedriver/sizzle.h"
end
Expand Down
34 changes: 0 additions & 34 deletions iphone/Info.plist

This file was deleted.

123 changes: 0 additions & 123 deletions iphone/RunIPhoneUnitTest.sh

This file was deleted.

77 changes: 0 additions & 77 deletions iphone/Settings.bundle/Root.plist

This file was deleted.

7 changes: 0 additions & 7 deletions iphone/Settings.bundle/en.lproj/Root.strings

This file was deleted.

20 changes: 0 additions & 20 deletions iphone/Tests-Info.plist

This file was deleted.

2 changes: 1 addition & 1 deletion iphone/build.desc
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ js_fragment_header(name = "atoms",
"//javascript/webdriver/atoms/fragments:get_text:ios",
"//javascript/webdriver/atoms/fragments:is_selected:ios",
],
out = "iphone/src/objc/atoms.h",
out = "build/iphone/atoms.h",
utf8 = "true")
Loading

0 comments on commit 7546f8c

Please sign in to comment.