You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Joe Swatosh <jo...@gmail.com> on 2006/12/31 19:17:00 UTC
[PATCH] Copy dll's from the correct directory for Windows Ruby binding tests
Hi All,
Fiddly little fix.
[[[
Copy the dll's from the correct directory to the .ext directory for test.
* subversion/bindings/swig/ruby/test/run-test.rb
Copy the dlls from the correct directory
]]]
Index: subversion/bindings/swig/ruby/test/run-test.rb
===================================================================
--- subversion/bindings/swig/ruby/test/run-test.rb (revision 22844)
+++ subversion/bindings/swig/ruby/test/run-test.rb (working copy)
@@ -15,7 +15,8 @@
if /cygwin|mingw|mswin32|bccwin32/.match(RUBY_PLATFORM)
ext_svn_ext_dir = File.join(ext_svn_dir, "ext")
FileUtils.mkdir_p(ext_svn_ext_dir)
- FileUtils.cp(Dir.glob(File.join(base_dir, "*.dll"), ext_svn_ext_dir))
+ dlls_dir = base_dir.split(File::SEPARATOR).insert(-5,'Release').join(File::SEPARATOR)
+ FileUtils.cp(Dir.glob(File.join(dlls_dir, "*.dll")), ext_svn_ext_dir)
else
ENV["PATH"] = "#{File.join(top_dir, 'subversion',
'svnserve')}:#{ENV['PATH']}"
FileUtils.ln_sf(File.join(base_dir, ".libs"), File.join(ext_svn_dir, "ext"))
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH] Copy dll's from the correct directory for Windows Ruby binding tests
Posted by Joe Swatosh <jo...@gmail.com>.
Hi Hyrum,
On 2/12/07, Hyrum K. Wright <hy...@mail.utexas.edu> wrote:
> Ping...
>
> I know this is an old one, but did anybody get a chance to look at this
> patch?
Thanks for keeping track of this. It has been addressed in a
different way. kou added a windows_util.rb in r23318 handles this.
Thanks
--
Joe
>
> -Hyrum
>
> Joe Swatosh wrote:
> > Hi All,
> >
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH] Copy dll's from the correct directory for Windows Ruby
binding tests
Posted by "Hyrum K. Wright" <hy...@mail.utexas.edu>.
Ping...
I know this is an old one, but did anybody get a chance to look at this
patch?
-Hyrum
Joe Swatosh wrote:
> Hi All,
>
> Fiddly little fix.
>
> [[[
>
> Copy the dll's from the correct directory to the .ext directory for test.
>
> * subversion/bindings/swig/ruby/test/run-test.rb
> Copy the dlls from the correct directory
>
> ]]]
>
> Index: subversion/bindings/swig/ruby/test/run-test.rb
> ===================================================================
> --- subversion/bindings/swig/ruby/test/run-test.rb (revision 22844)
> +++ subversion/bindings/swig/ruby/test/run-test.rb (working copy)
> @@ -15,7 +15,8 @@
> if /cygwin|mingw|mswin32|bccwin32/.match(RUBY_PLATFORM)
> ext_svn_ext_dir = File.join(ext_svn_dir, "ext")
> FileUtils.mkdir_p(ext_svn_ext_dir)
> - FileUtils.cp(Dir.glob(File.join(base_dir, "*.dll"), ext_svn_ext_dir))
> + dlls_dir =
> base_dir.split(File::SEPARATOR).insert(-5,'Release').join(File::SEPARATOR)
> + FileUtils.cp(Dir.glob(File.join(dlls_dir, "*.dll")), ext_svn_ext_dir)
> else
> ENV["PATH"] = "#{File.join(top_dir, 'subversion',
> 'svnserve')}:#{ENV['PATH']}"
> FileUtils.ln_sf(File.join(base_dir, ".libs"), File.join(ext_svn_dir,
> "ext"))