You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Kouhei Sutou <ko...@cozmixng.org> on 2007/03/16 07:14:34 UTC

[PATCH] build/win32/make_dist.sh supports the Ruby bindings

Hi,

Joe and I are workking on the Ruby bindings for Windows.
Now, the Ruby bindings can be built on Windows thanks to Joe's great
work.

I wrote a patch to make a .zip for the Ruby bindings.

[[
Support making the Ruby bindings binary archive for Windows.

*  build/win32/make_dist.py
  (_disttree): Add the Ruby bindings related files.
  (_make_dist): Archive the Ruby bindings related files.
]]

Thanks,
--
kou

Re: [PATCH] build/win32/make_dist.sh supports the Ruby bindings

Posted by Kouhei Sutou <ko...@cozmixng.org>.
Hi,

In <ae...@mail.gmail.com>
  "Re: [PATCH] build/win32/make_dist.sh supports the Ruby bindings" on Sat, 17 Mar 2007 09:42:50 -0700,
  "Joe Swatosh" <jo...@gmail.com> wrote:

> > > ===================================================================
> > > --- build/win32/make_dist.py  (revision 23865)
> > > +++ build/win32/make_dist.py  (working copy)
> > > @@ -260,6 +260,21 @@
> > >                                     '%(bindsrc)s/java/javahl/classes'),
> > >                          ),
> > >
> > > +             'ruby': None,
> > > +             'ruby/lib': None,
> > > +             'ruby/lib/svn': FileGlob('%(bindsrc)s/swig/ruby/svn/*.rb'),
> 
> 
> These three lines deleted:
> > > +             'ruby/ext': None,
> > > +             'ruby/ext/svn': None,
> > > +             'ruby/ext/svn/ext':
> 
> And the ext directory living right under svn:
>                   'ruby/lib/svn/ext':

Normally, extension libraries are installed into
.../site_ruby/VERSION/ARCHITECTURE/ and ruby scripts are
installed into .../site_ruby/VERSION/.

For example:
  VERSION: 1.8
  ARCHITECTURE: i386-msvcrt

In my plan, user installs the Ruby bindings like the
following:

  * Copies ruby/lib/* into .../site_ruby/1.8/
  * Copies ruby/ext/* into .../site_ruby/1.8/i386-msvcrt/

> Plus the .rb files to dink the windows path for thr process and
> require the corresponding dll directly.

It's not needed. I already put the mechanism into svn/util.rb.


Thanks,
--
kou

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

Re: [PATCH] build/win32/make_dist.sh supports the Ruby bindings

Posted by Joe Swatosh <jo...@gmail.com>.
Hi,

I'm probably naive but I would have expected something more like

On 3/16/07, Daniel Rall <dl...@collab.net> wrote:
> Looks good to me.  Someone on Windows want to test this out?
>
> On Fri, 16 Mar 2007, Kouhei Sutou wrote:
>


> > ===================================================================
> > --- build/win32/make_dist.py  (revision 23865)
> > +++ build/win32/make_dist.py  (working copy)
> > @@ -260,6 +260,21 @@
> >                                     '%(bindsrc)s/java/javahl/classes'),
> >                          ),
> >
> > +             'ruby': None,
> > +             'ruby/lib': None,
> > +             'ruby/lib/svn': FileGlob('%(bindsrc)s/swig/ruby/svn/*.rb'),


These three lines deleted:
> > +             'ruby/ext': None,
> > +             'ruby/ext/svn': None,
> > +             'ruby/ext/svn/ext':

And the ext directory living right under svn:
                  'ruby/lib/svn/ext':
Plus the .rb files to dink the windows path for thr process and
require the corresponding dll directly.

> > +               (FileGlob('%(binddir)s/swig/ruby/*.dll'),
> > +                FileGlob('%(binddir)s/swig/ruby/*.pdb'),
> > +                FileGlob('%(binddir)s/swig/ruby/libsvn_swig_ruby/*.dll'),
> > +                FileGlob('%(binddir)s/swig/ruby/libsvn_swig_ruby/*.pdb'),
> > +                FileGlob('%(blddir)s/libsvn_*/*.dll'),
> > +                File('%(@apr)s/%(aprrel)s/libapr.dll'),
> > +                File('%(@apr-iconv)s/%(aprrel)s/libapriconv.dll'),
> > +                File('%(@apr-util)s/%(aprrel)s/libaprutil.dll')),
> > +
> >               'share': None,
> >               'share/locale': InstallMoFiles('%(srcdir)s/%(svnrel)s/mo'),
> >               }
> > @@ -399,6 +414,8 @@
> >      _make_zip('_pdb',    ('',), '-i "*.pdb"')
> >      _make_zip('_pl',     ('/README.txt', '/perl'), xpdb)
> >      _make_zip('_py',     ('/README.txt', '/python'), xpdb)
> > +    _make_zip('_rb',     ('/README.txt', '/ruby', '/licenses', '/share/locale'),
> > +              xpdb)
> >
> >    except:
> >      traceback.print_exc(None, _stderr)
>
> > ---------------------------------------------------------------------
> > To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
> > For additional commands, e-mail: dev-help@subversion.tigris.org
>
>

As I said, I'm probably missing something, but if ext is a subdir of
ruby/svn and it contains the path setting .rb files forwarding to the
.dll files, then as long as the top ruby directory is on the uses
loadpath (or specified with -I) wouldn't everything "just work"  :-)

--
Joe

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

Re: [PATCH] build/win32/make_dist.sh supports the Ruby bindings

Posted by Daniel Rall <dl...@collab.net>.
Looks good to me.  Someone on Windows want to test this out?

On Fri, 16 Mar 2007, Kouhei Sutou wrote:

> Hi,
> 
> Joe and I are workking on the Ruby bindings for Windows.
> Now, the Ruby bindings can be built on Windows thanks to Joe's great
> work.
> 
> I wrote a patch to make a .zip for the Ruby bindings.
> 
> [[
> Support making the Ruby bindings binary archive for Windows.
> 
> *  build/win32/make_dist.py
>  (_disttree): Add the Ruby bindings related files.
>  (_make_dist): Archive the Ruby bindings related files.
> ]]
> 
> Thanks,
> --
> kou

> [-- octet-filter file type: "RCS/CVS diff output text" --]
> 
> [-- Statistics (lines words chars):  35 83 1525 /tmp/svn-make_dist-supports-ruby.diff --]
> 
> Index: build/win32/make_dist.py
> ===================================================================
> --- build/win32/make_dist.py	(revision 23865)
> +++ build/win32/make_dist.py	(working copy)
> @@ -260,6 +260,21 @@
>                                     '%(bindsrc)s/java/javahl/classes'),
>                          ),
>  
> +             'ruby': None,
> +             'ruby/lib': None,
> +             'ruby/lib/svn': FileGlob('%(bindsrc)s/swig/ruby/svn/*.rb'),
> +             'ruby/ext': None,
> +             'ruby/ext/svn': None,
> +             'ruby/ext/svn/ext':
> +               (FileGlob('%(binddir)s/swig/ruby/*.dll'),
> +                FileGlob('%(binddir)s/swig/ruby/*.pdb'),
> +                FileGlob('%(binddir)s/swig/ruby/libsvn_swig_ruby/*.dll'),
> +                FileGlob('%(binddir)s/swig/ruby/libsvn_swig_ruby/*.pdb'),
> +                FileGlob('%(blddir)s/libsvn_*/*.dll'),
> +                File('%(@apr)s/%(aprrel)s/libapr.dll'),
> +                File('%(@apr-iconv)s/%(aprrel)s/libapriconv.dll'),
> +                File('%(@apr-util)s/%(aprrel)s/libaprutil.dll')),
> +
>               'share': None,
>               'share/locale': InstallMoFiles('%(srcdir)s/%(svnrel)s/mo'),
>               }
> @@ -399,6 +414,8 @@
>      _make_zip('_pdb',    ('',), '-i "*.pdb"')
>      _make_zip('_pl',     ('/README.txt', '/perl'), xpdb)
>      _make_zip('_py',     ('/README.txt', '/python'), xpdb)
> +    _make_zip('_rb',     ('/README.txt', '/ruby', '/licenses', '/share/locale'),
> +              xpdb)
>  
>    except:
>      traceback.print_exc(None, _stderr)

> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: dev-help@subversion.tigris.org