Re: [patch] Making Ruby Windows bindings sqlite aware

Joe, how does this patch play with your "add copying of bdb and sqlite
dlls to win-tests.py" patch?

- Dan

On Fri, 23 Mar 2007, Joe Swatosh wrote:

> Hi
>
> This patch makes it so that the sqlite and bdb dlls don't have to be on the
> path before starting the ruby bindings tests.
>
> --
> Joe
>
> [[[
> * subversion/bindings/swig/ruby/test/windows_util.rb
> Renamed (add_apr_dll_path_to_dll_wrapper_util) to
> (add_deps_dll_paths_to_dll_wrapper_util) to better reflect what
> it is actually doing, now that it also adds bdb and sqlite directories
> to the path.
> ]]]
>
>
> Index: subversion/bindings/swig/ruby/test/windows_util.rb
> ===================================================================
> --- subversion/bindings/swig/ruby/test/windows_util.rb (revision 24060)
> +++ subversion/bindings/swig/ruby/test/windows_util.rb (working copy)
> @@ -124,7 +124,7 @@
> build_conf = File.join(top_dir, "build.conf")
> File.open(File.join(ext_dir, "#{util_name}.rb" ), 'w') do |util|
> setup_dll_wrapper_util(dll_dir, util)
> - add_apr_dll_path_to_dll_wrapper_util(top_dir, build_type, util)
> + add_deps_dll_paths_to_dll_wrapper_util(top_dir, build_type, util)
> add_svn_dll_path_to_dll_wrapper_util(build_conf,
> subversion_dir, util)
> setup_dll_wrappers(build_conf, ext_dir, dll_dir, util_name) do
> |lib|
> svn_lib_dir = File.join(subversion_dir, "libsvn_#{lib}")
> @@ -154,7 +154,7 @@
> EOC
> end
>
> - def add_apr_dll_path_to_dll_wrapper_util(top_dir, build_type, util)
> + def add_deps_dll_paths_to_dll_wrapper_util(top_dir, build_type, util)
> lines = []
> gen_make_opts = File.join(top_dir, "gen-make.opts")
> lines = File.read(gen_make_opts).to_a if File.exists?(gen_make_opts)
> @@ -169,6 +169,15 @@
> dll_dir = File.expand_path(File.join(top_dir, lib_dir,
> build_type))
> util.puts("add_path.call(#{dll_dir.dump})")
> end
> +
> + lib_dir = config["--with-berkeley-db"]
> + dll_dir = File.expand_path(File.join(top_dir, lib_dir, 'bin'))
> + util.puts("add_path.call(#{dll_dir.dump})")
> +
> + lib_dir = config["--with-sqlite"]
> + dll_dir = File.expand_path(File.join(top_dir, lib_dir))
> + util.puts("add_path.call(#{dll_dir.dump})")
> +
> end
>
> def add_svn_dll_path_to_dll_wrapper_util(build_conf,
> subversion_dir, util)