Author: joeswatosh
Date: Wed Dec 9 07:04:07 2009
New Revision: 888715
URL: http://svn.apache.org/viewvc?rev=888715&view=rev
Log:
SQLite as a dll dependency is long gone. Remove it from the Windows
bindings tests for Ruby.
* subversion/bindings/swig/ruby/test/windows_util.rb
(SvnTestUtil::Windows::Svnserve#setup_svnserve): Don't attempt to copy
SQLite.dll for use the the svnserve created to test the Svn::Client
bindings.
(SvnTestUtil::Windows::SetupEnvironment#add_depended_dll_path_to_dll_
wrapper_util): Don't add a path to SQLite.dll in the generated wrappers
for requiring Svn modules.
Modified:
subversion/trunk/subversion/bindings/swig/ruby/test/windows_util.rb
Modified: subversion/trunk/subversion/bindings/swig/ruby/test/windows_util.rb
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/swig/ruby/test/windows_util.rb?rev=888715&r1=888714&r2=888715&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/swig/ruby/test/windows_util.rb
(original)
+++ subversion/trunk/subversion/bindings/swig/ruby/test/windows_util.rb Wed Dec
9 07:04:07 2009
@@ -98,7 +98,7 @@
libaprutil#{apr_major_version}.dll
libapr#{apr_major_version}.dll
libapriconv#{apr_major_version}.dll
- sqlite3.dll libdb44.dll libdb44d.dll)
+ libdb44.dll libdb44d.dll)
ENV["PATH"].split(";").each do |path|
found_targets = []
targets.each do |target|
@@ -113,7 +113,7 @@
end
# Remove optional targets instead of raising below. If they are
really
# needed, svnserve won't start anyway.
- targets -= %W[libapriconv#{apr_major_version}.dll sqlite3.dll]
+ targets -= %W[libapriconv#{apr_major_version}.dll]
unless targets.empty?
raise "can't find libraries to work svnserve: #{targets.join(' ')}"
end
@@ -238,7 +238,6 @@
["apr-util", build_type],
["apr-iconv", build_type],
["berkeley-db", "bin"],
- ["sqlite", "bin"],
].each do |lib, sub_dir|
lib_dir = Pathname.new(gen_make_opts["--with-#{lib}"])
dll_dir = lib_dir + sub_dir
