preparing for release

12 views
Skip to first unread message

Jon

unread,
May 22, 2012, 9:17:05 AM5/22/12
to theco...@googlegroups.com
Please update the patch branches with any needed updates as I'm planning a maintenance release later this week.

Other than upstream updates to ruby_1_9_3, the only other updates I'm aware of are the one's Yura pushed a few weeks ago.

Thanks, Jon

---
Fail fast. Fail often. Fail publicly. Learn. Adapt. Repeat.
http://thecodeshop.github.com | http://jonforums.github.com/
twitter: @jonforums

Jon

unread,
May 26, 2012, 10:56:34 AM5/26/12
to theco...@googlegroups.com
> Please update the patch branches with any needed updates as I'm planning a maintenance release later this week.
>
> Other than upstream updates to ruby_1_9_3, the only other updates I'm aware of are the one's Yura pushed a few weeks ago.


I just pushed a throwaway testing branch at https://github.com/thecodeshop/ruby/tree/test-tcs_1_9_3

Please test against various Windows and *nix platforms and reply with any issues. If all looks good I plan to release within 24-36 hours.

Hiroshi: FYI, I fixed this trivial conflict when rebasing `win-file/ruby_1_9_3` on `ruby_1_9_3` by including both forward declarations.

diff --cc include/ruby/win32.h
index b46c202,9c714aa..0000000
--- a/include/ruby/win32.h
+++ b/include/ruby/win32.h
@@@ -304,9 -305,10 +304,14 @@@ extern int rb_w32_ustati64(const char *
extern int rb_w32_access(const char *, int);
extern int rb_w32_uaccess(const char *, int);
extern char rb_w32_fd_is_text(int);
++<<<<<<< HEAD
+extern int rb_w32_fstati64(int, struct stati64 *);
++||||||| merged common ancestors
++=======
+ extern void rb_w32_init_file();
++>>>>>>> Apply fenix integration patch and resolve conflicts

#ifdef __BORLANDC__
-extern int rb_w32_fstati64(int, struct stati64 *);
extern off_t _lseeki64(int, off_t, int);
extern FILE *rb_w32_fopen(const char *, const char *);


Thanks.

Jon
Reply all
Reply to author
Forward
0 new messages