Permalink
Browse files

remove references to commonwatir

  • Loading branch information...
1 parent 0c73f9e commit 44563c17a1ce083a973370689b4b95739c63aca9 Hugh McGowan committed Mar 28, 2012
View
@@ -2,7 +2,7 @@ require 'rubygems'
require 'rake/clean'
require 'fileutils'
-projects = ['watir-classic', 'commonwatir']
+projects = ['watir-classic']
def launch_subrake(cmd)
system("#{Gem.ruby} -S rake #{cmd}")
@@ -1,6 +1,5 @@
#!/usr/bin/env ruby
$root = File.expand_path(File.join(File.dirname(__FILE__), '..', '..'))
$watir_lib = File.join($root, 'watir-classic', 'lib')
-$watir_common_lib = File.join($root, 'commonwatir', 'lib')
-$libs = "-I #{$watir_lib} -I #{$watir_common_lib}"
-exec "irb.bat #{$libs} -r rubygems -r irb/completion -r watir/irb-history -r watir --simple-prompt --readline"
+$libs = "-I #{$watir_lib}"
+exec "irb.bat #{$libs} -r rubygems -r irb/completion -r watir-classic/irb-history -r watir --simple-prompt --readline"
@@ -5,9 +5,3 @@
Watir::Browser.support :name => 'ie', :class => 'Watir::IE',
:library => 'watir-classic/ie', :gem => 'watir-classic',
:options => [:speed, :visible, :zero_based_indexing]
-
-Watir::Browser.support :name => 'firefox', :class => 'FireWatir::Firefox',
- :library => 'firewatir'
-
-Watir::Browser.support :name => 'safari', :class => 'Watir::Safari',
- :library => 'safariwatir'
View
@@ -13,14 +13,14 @@
Rake::RDocTask.new('rdoc') do |rdoc|
rdoc.rdoc_dir = 'rdoc'
rdoc.options += $WATIR_RDOC_OPTIONS
- rdoc.rdoc_files.include('lib/watir/ie.rb')
+ rdoc.rdoc_files.include('lib/watir-classic/ie.rb')
$WATIR_EXTRA_RDOC_FILES.each do |file|
rdoc.rdoc_files.include(file)
end
- rdoc.rdoc_files.include('lib/watir/contrib/*.rb')
- rdoc.rdoc_files.include('lib/watir/dialogs/*.rb')
- rdoc.rdoc_files.include('lib/watir/*.rb')
- rdoc.rdoc_files.exclude('lib/watir/camel_case.rb')
+ rdoc.rdoc_files.include('lib/watir-classic/contrib/*.rb')
+ rdoc.rdoc_files.include('lib/watir-classic/dialogs/*.rb')
+ rdoc.rdoc_files.include('lib/watir-classic/*.rb')
+ rdoc.rdoc_files.exclude('lib/watir-classic/camel_case.rb')
end
Rake::TestTask.new do |t|
@@ -6,7 +6,7 @@ def append_to_load_path path
$LOAD_PATH.unshift File.expand_path(path)
end
-# use local development versions of watir, firewatir, commonwatir if available
+# use local development versions of watir
topdir = File.join(File.dirname(__FILE__), '..')
$watir_dev_lib = File.join(topdir, 'lib')
commonwatir_dir = "commonwatir#{File.exist?('VERSION') ? "-#{File.read('VERSION').strip}" : ""}"
@@ -36,7 +36,6 @@ spec = Gem::Specification.new do |s|
s.add_dependency 'win32-process', '>= 0.5.5'
s.add_dependency 'windows-pr', '>= 0.6.6'
- s.add_dependency 'commonwatir', '= ' + version
s.add_dependency 'nokogiri'
s.add_dependency 'ffi', '~>1.0'
s.add_dependency 'rautomation', '~>0.7.2'

0 comments on commit 44563c1

Please sign in to comment.