You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by hw...@apache.org on 2010/01/11 15:00:21 UTC
svn commit: r897863 - in /subversion/branches/1.6.x: ./ CHANGES STATUS
subversion/bindings/swig/ruby/test/windows_util.rb
Author: hwright
Date: Mon Jan 11 14:00:21 2010
New Revision: 897863
URL: http://svn.apache.org/viewvc?rev=897863&view=rev
Log:
Merge r888715, r895514 from trunk:
* r888715, r895514
Make the dll dependencies right when testing the Ruby bindings on
windows. (r888715 lets r895514 merge cleanly).
Justification:
Explicit is better than implicit.
Votes:
+1: joeswatosh, rhuijben
Modified:
subversion/branches/1.6.x/ (props changed)
subversion/branches/1.6.x/CHANGES (props changed)
subversion/branches/1.6.x/STATUS
subversion/branches/1.6.x/subversion/bindings/swig/ruby/test/windows_util.rb
Propchange: subversion/branches/1.6.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 11 14:00:21 2010
@@ -52,4 +52,4 @@
/subversion/branches/tc_url_rev:870696-870828
/subversion/branches/tree-conflicts:864636-869499
/subversion/branches/tree-conflicts-notify:870271-870353
-/subversion/trunk:875976,875980-875981,876054-876056,876092,876175,876299,876306,876427,876440,876450,876507,876571,879093,879688,880274-880275,880370,880474,880525-880526,881905,884842,886164,886197,888979,889081,889840,895653
+/subversion/trunk:875976,875980-875981,876054-876056,876092,876175,876299,876306,876427,876440,876450,876507,876571,879093,879688,880274-880275,880370,880474,880525-880526,881905,884842,886164,886197,888715,888979,889081,889840,895514,895653
Propchange: subversion/branches/1.6.x/CHANGES
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 11 14:00:21 2010
@@ -51,4 +51,4 @@
/subversion/branches/tc_url_rev/CHANGES:870696-870828
/subversion/branches/tree-conflicts/CHANGES:864636-869499
/subversion/branches/tree-conflicts-notify/CHANGES:870271-870353
-/subversion/trunk/CHANGES:875962-893519,895653
+/subversion/trunk/CHANGES:875962-893519,895514,895653
Modified: subversion/branches/1.6.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x/STATUS?rev=897863&r1=897862&r2=897863&view=diff
==============================================================================
--- subversion/branches/1.6.x/STATUS (original)
+++ subversion/branches/1.6.x/STATUS Mon Jan 11 14:00:21 2010
@@ -201,11 +201,3 @@
+1: joeswatosh (as a partial committer, not sure if I can vote in the
main body of the Subversion code. It solves the bindings segfault,
the new tests pass, and the diff looks good to me).
-
- * r888715, r895514
- Make the dll dependencies right when testing the Ruby bindings on
- windows. (r888715 lets r895514 merge cleanly).
- Justification:
- Explicit is better than implicit.
- Votes:
- +1: joeswatosh, rhuijben
Modified: subversion/branches/1.6.x/subversion/bindings/swig/ruby/test/windows_util.rb
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x/subversion/bindings/swig/ruby/test/windows_util.rb?rev=897863&r1=897862&r2=897863&view=diff
==============================================================================
--- subversion/branches/1.6.x/subversion/bindings/swig/ruby/test/windows_util.rb (original)
+++ subversion/branches/1.6.x/subversion/bindings/swig/ruby/test/windows_util.rb Mon Jan 11 14:00:21 2010
@@ -79,7 +79,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|
@@ -94,7 +94,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
@@ -219,7 +219,8 @@
["apr-util", build_type],
["apr-iconv", build_type],
["berkeley-db", "bin"],
- ["sqlite", "bin"],
+ ["libintl", "bin"],
+ ["sasl", "lib"],
].each do |lib, sub_dir|
lib_dir = Pathname.new(gen_make_opts["--with-#{lib}"])
dll_dir = lib_dir + sub_dir