You can use '-u' with cvs diff as well. I am going to apply your code since it is a much better stake in the ground than we had.
-Tom On Tue, 21 Mar 2006, Ola Bini defenestrated me: > > Ah, sorry, I'm sitting on a sorry Win32-system. No good diff. > > Here is the file. > > ----- Original Message ----- > From: Thomas E Enebo <[EMAIL PROTECTED]> > Date: Tuesday, March 21, 2006 2:53 pm > Subject: Re: [Jruby-devel] Status of Zlib and Gem > To: [email protected] > > > Can you resend zlib.patch with the '-u' option to diff? I am having > > tourble applying the one you sent. You could even just send the whole > > zlib.rb file since this thing has never really had anything real > > in it yet. > > > > -Tom > > > > On Tue, 21 Mar 2006, Ola Bini defenestrated me: > > > > > Hi! > > > > > > Here comes the patch for zlib.rb and three new source files. > > > Hopefully this is enough for it to work with gems, at least. > > > > > > I am running JRuby from HEAD, so this error doesn't make sense. > > It seems > > > as if the script isn't running in my CWD, which makes it > > impossible to > > > find the needed file. > > > > > > Regards > > > Ola Bini > > > > > > > > > ----- Original Message ----- > > > From: Charles O Nutter <[EMAIL PROTECTED]> > > > Date: Monday, March 20, 2006 11:44 pm > > > Subject: Re: [Jruby-devel] Status of Zlib and Gem > > > To: [email protected] > > > > > > > If you are running with JRuby 0.8.2 you will proably not get > > gems > > > > to run all > > > > the way. If that's the case, you should make sure to use the > > > > current JRuby > > > > in CVS HEAD, which should run gems successfully up to the point > > it > > > > needszlib. > > > > > > > > You may try to send what you have as well, and we can see what > > it > > > > fixes. I > > > > would love to see what you have and give it a try while you're > > > > trying to get > > > > gems working at a basic level. > > > > > > > > - Charlie > > > > > > > > On 3/20/06, Ola Bini <[EMAIL PROTECTED]> wrote: > > > > > > > > > > Cool. 760 new files to serialize. =) > > > > > > > > > > That got me a long way. The snag now seems to be > > > > > Dir.chdir("pkgs/sources") do > > > > > load "sources.gemspec" > > > > > spec = Gem.sources_spec > > > > > gem_file = Gem::Builder.new(spec).build > > > > > Gem::Installer.new(gem_file).install(true, Gem.dir, false) > > > > > end > > > > > where it can't find "sources.gemspec". This is probably due > > to some > > > > > problems with CWD or whatnot. I'll take a closer look on it > > > > tomorrow, if > > > > > you don't have any ideas about it. > > > > > > > > > > Regards > > > > > Ola Bini > > > > > > > > > > ----- Original Message ----- > > > > > From: Thomas E Enebo <[EMAIL PROTECTED]> > > > > > Date: Monday, March 20, 2006 11:30 pm > > > > > Subject: Re: [Jruby-devel] Status of Zlib and Gem > > > > > To: [email protected] > > > > > > > > > > > On Mon, 20 Mar 2006, Ola Bini defenestrated me: > > > > > > > Hi. > > > > > > > > > > > > > > I have now implemented most of the basic functionality in > > > > zlib.rb> > > (Zlib::Inflate, Zlib::Deflate, Zlib::GzipReader > > and > > > > Zlib::GzipWriter> > > have the most basic functionality to make > > it > > > > marginally useful). > > > > > > Sorry> to say, much of the more interesting features in gz are > > > > > > missing from the > > > > > > > java implementation, and I've been unable to find another > > > > > > implementation> right now. > > > > > > > > > > > > > > The good news is that the use of zlib in Gem's is fairly > > > > > > rudimentary. My > > > > > > > thinking was that I should try to install the package and > > see > > > > if it > > > > > > > works, but this fails due to > > > > > > > require 'find' > > > > > > > in post-install.rb. > > > > > > > > > > > > Cool. At this point you should consider copying > > > > /usr/lib/ruby/1.8> > into jruby_home/lib/ruby/1.8. The error > > you > > > > are seeing is the fact > > > > > > that jruby has not yet included find.rb. Copying the > > directory > > > > should> > get you a long ways. > > > > > > > > > > > > -Tom > > > > > > > > > > > > -- > > > > > > + http://www.tc.umn.edu/~enebo +---- mailto:[EMAIL PROTECTED] -- > > --+ > > > > > > | Thomas E Enebo, Protagonist | "Luck favors the prepared > > | > > > > > > | | mind." -Louis Pasteur > > | > > > > > > > > > > > > > > > > > > ------------------------------------------------------- > > > > > > This SF.Net email is sponsored by xPML, a groundbreaking > > scripting> > > > languagethat extends applications into web and > > mobile media. > > > > Attend> > the live webcast > > > > > > and join the prime developer group breaking into this new > > coding> > > > territory!http://sel.as- > > > > > > > > > > > > > > > > > > > > > > > > > > us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642_______________________________________________>> > > Jruby-devel mailing list > > > > > > [email protected] > > > > > > https://lists.sourceforge.net/lists/listinfo/jruby-devel > > > > > > > > > > > > > > > > > > > > > ------------------------------------------------------- > > > > > This SF.Net email is sponsored by xPML, a groundbreaking > > scripting> > > language > > > > > that extends applications into web and mobile media. Attend > > the live > > > > > webcast > > > > > and join the prime developer group breaking into this new coding > > > > > territory! > > > > > http://sel.as- > > > > us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642> > > > > _______________________________________________> Jruby-devel > > > > mailing list > > > > > [email protected] > > > > > https://lists.sourceforge.net/lists/listinfo/jruby-devel > > > > > > > > > > > > > > > > > > > > > -- > > > > Charles Oliver Nutter @ headius.blogspot.com > > > > JRuby Developer @ jruby.sourceforge.net > > > > Application Architect @ www.ventera.com > > > > > > > > > > > > > > > > > > -- > > + http://www.tc.umn.edu/~enebo +---- mailto:[EMAIL PROTECTED] ----+ > > | Thomas E Enebo, Protagonist | "Luck favors the prepared | > > | | mind." -Louis Pasteur | > > > > > > ------------------------------------------------------- > > This SF.Net email is sponsored by xPML, a groundbreaking scripting > > languagethat extends applications into web and mobile media. Attend > > the live webcast > > and join the prime developer group breaking into this new coding > > territory!http://sel.as- > > > us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642_______________________________________________ > > Jruby-devel mailing list > > [email protected] > > https://lists.sourceforge.net/lists/listinfo/jruby-devel > > -- + http://www.tc.umn.edu/~enebo +---- mailto:[EMAIL PROTECTED] ----+ | Thomas E Enebo, Protagonist | "Luck favors the prepared | | | mind." -Louis Pasteur | ------------------------------------------------------- This SF.Net email is sponsored by xPML, a groundbreaking scripting language that extends applications into web and mobile media. Attend the live webcast and join the prime developer group breaking into this new coding territory! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642 _______________________________________________ Jruby-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/jruby-devel
