Hi kou, DJ
On 4/7/07, Kouhei Sutou <kou@cozmixng.org> wrote:
> Hi DJ,
>
> >
>
> What about the attached patch?
>
I'm sorry it's taken so long for me to get to this. I had a few issues:
The zip file db-4.4.20-win32.zip that I've been using doesn't contain a
license file.
I couldn't run make_gem.rb unless sqlite3.dll and libdb44.dll where on the
path.
Once the gem was created, I couldn't run the tests because sqlite3.dll and
libdb44.dll where not on the path
To deal with the first issue I took the license file from db-4.4.20.zip that I
found on Oracle's web site.
I addressed the second two issues with the patch below. Most of the tests run,
but the Client and WC tests get sideways with:
Assertion failed: is_canonical(base, blen), file D:\SVN\src-
trunk\subversion\libsvn_subr\path.c, line 115
I haven't really looked into it yet, but I'm tired of waiting to give feedback.
[[[
Make the ruby bindings stand alone by adding missing dlls. Make sure make_gem
can run when dlls aren't alread on path.
* build/win32/make_dist.py
(_disttree): Add Berkeley DB and SQLite to the ruby/ext/svn/ext required
files list.
* build/win32/make_gem.rb
add ruby/ext/svn/ext to the path so the require of svn/core will succeed.
]]]
Index: build/win32/make_dist.py
===================================================================
--- build/win32/make_dist.py (revision 24695)
+++ build/win32/make_dist.py (working copy)
@@ -271,6 +271,8 @@
FileGlob('%(binddir)s/swig/ruby/libsvn_swig_ruby/*.dll'),
FileGlob('%(binddir)s/swig/ruby/libsvn_swig_ruby/*.pdb'),
FileGlob('%(blddir)s/libsvn_*/*.dll'),
+ File('%(@berkeley-db)s/bin/libdb%(bdbver)s.dll'),
+ File('%(@sqlite)s/bin/sqlite3.dll'),
File('%(@apr)s/%(aprrel)s/libapr.dll'),
File('%(@apr-iconv)s/%(aprrel)s/libapriconv.dll'),
File('%(@apr-util)s/%(aprrel)s/libaprutil.dll')),
Index: build/win32/make_gem.rb
===================================================================
--- build/win32/make_gem.rb (revision 24695)
+++ build/win32/make_gem.rb (working copy)
@@ -35,6 +35,9 @@
base_dir = File.expand_path(dir)
$LOAD_PATH.unshift(File.join(base_dir, "ext"))
$LOAD_PATH.unshift(File.join(base_dir, "lib"))
+ svn_ext_path_win = File.join(base_dir, "ext","svn","ext")
+ svn_ext_path_win.gsub!(File::SEPARATOR, File::ALT_SEPARATOR)
+ ENV['path'] = "#{svn_ext_path_win};#{ENV['path']}"
end
require 'svn/core'
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sun Apr 22 23:31:03 2007