Very nice, David, thanks! I had to tweak it a bit to work when you're not running from the tools dir, but I just used it the other day to pull in some 1.8.7 stdlib updates. Works great!
On Tue, Jun 1, 2010 at 5:37 PM, David Calavera <david.calav...@gmail.com> wrote: > Hi, > I'd like to change this procedure a little bit. > Instead of have two separated scripts I've merged both in one. It also > allows us to syncronize the external tests and does the checkout of the > right branch for us. So, to update JRuby's stdlib will be as follows: > 1. clone this repo github.com/jruby/ruby > 2. run the script "sync_ruby" in tools dir providing what you want to sync > (tests|stdlib|all), the version that you want to do checkout (1_8_7|1_9_2) > and the locations of the fork and the JRuby's directory. > > On Wed, May 12, 2010 at 11:29 AM, Charles Oliver Nutter > <head...@headius.com> wrote: >> >> Ruby 1.9.2 has been branched, so I've now also created a >> jruby-ruby_1_9_2 branch in the JRuby fork of Ruby. There's not many >> jruby-specific changes there yet, however, so I expect we'll want to >> examine what we have patched for 1.8.7 stdlib and apply similar >> changes there. >> >> I've done an initial copy of 1.9.2 stdlibs, so the ones that copied >> should be up to date with 1.9.2 head. >> >> On Fri, May 7, 2010 at 10:19 PM, Charles Oliver Nutter >> <head...@headius.com> wrote: >> > FYI, a week or so ago I pushed a new technique for updating stdlib. >> > >> > The jruby account on github now has a fork of github.com/ruby/ruby >> > that includes all our stdlib changes: >> > >> > http://github.com/jruby/ruby >> > >> > The technique to update JRuby's copy of stdlib is as follows: >> > >> > 1. clone this repo >> > 2. check out the appropriate version branch prefixed with jruby-, as >> > in jruby-ruby_1_8_7 >> > 3. run the "copy_stdlib_1_8_7.rb" script in JRuby's tool/ dir, >> > providing the location of the checked-out fork and the location of the >> > JRuby repo >> > >> > The script pulls the stdlib and ext .rb files out of all the >> > appropriate directories in the ruby source and copies them to the >> > appropriate places in our source. The process takes care of all files >> > we originally source from MRI. >> > >> > The merging process, which I have not attempted yet, will go something >> > like this... >> > >> > Given the aforementioned checked-out jruby/ruby fork: >> > >> > 1. add github.com/ruby/ruby's repository to remotes and fetch updates >> > 2. merge into the jruby-ruby_1_8_7 branch any upstream changes, >> > dealing with conflicts in-place >> > 3. commit the result and run the copy script >> > >> > I have not yet set up a branch for 1.9, but our 1.9 stdlib is way >> > behind anway; we'll do that once we update. >> > >> > Hopefully this will prevent us from wiping out any of our stdlib >> > tweaks in the future. >> > >> > - Charlie >> > >> >> --------------------------------------------------------------------- >> To unsubscribe from this list, please visit: >> >> http://xircles.codehaus.org/manage_email >> >> > > --------------------------------------------------------------------- To unsubscribe from this list, please visit: http://xircles.codehaus.org/manage_email
