Commit graph

605 commits

Author SHA1 Message Date
yugui
59dc7d4c96 merges r24389 from trunk into ruby_1_9_1.
--
	* win32/win32.c (has_redirection): need to execute shell if commandline
	  includes newline.  cf. [ruby-core:24560]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@24465 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-08-08 15:33:32 +00:00
yugui
2fd6766226 merges r24367 from trunk into ruby_1_9_1.
--
	* win32/win32.c (rb_w32_connect): return value was broken when some
	  error occurred.
	  [ruby-core:24234]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@24460 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-08-08 15:32:23 +00:00
yugui
7508774fd7 merges r24116 from trunk into ruby_1_9_1.
--
	* win32/Makefile.sub (LIBPATHFLAG): path is already quoted in mkmf.rb.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@24124 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-07-15 12:01:29 +00:00
yugui
22365d9c50 merges r23655 from trunk into ruby_1_9_1.
--
* Makefile.in, win32/Makefile.sub (RMALL): need for distclean-rdoc.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@23778 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-06-21 09:13:35 +00:00
yugui
1662bee468 * win32/Makefile.sub: fixes build failures on win32.
fixed by usa.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@23411 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-05-12 05:36:34 +00:00
yugui
aa9e93f93e * win32/Makefile.sub: fixes a mistake in merging r22822.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@23409 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-05-12 04:45:31 +00:00
yugui
f3fa74cb9b merges r22822 from trunk into ruby_1_9_1.
--
* win32/Makefile.sub (LDFLAGS): always prepends -link.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@23407 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-05-12 04:16:31 +00:00
yugui
318d48df7b merges r22870 from trunk into ruby_1_9_1.
--
* win32/Makefile.sub (LDFLAGS): moved -link to TRY_LINK, LINK_SO
  and so on.  based on a patch by Charlie Savage at
  [ruby-core:22794]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@23179 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-04-12 14:02:46 +00:00
yugui
7a54bfe2e0 merges r22869 from trunk into ruby_1_9_1.
--
* win32/Makefile.sub (config.h): passes LDFLAGS to rbconfig.rb so
  that extconf.rb could refer it.  [ruby-core:22725]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@23178 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-04-12 14:02:36 +00:00
yugui
59429eebd0 merges r22777 from trunk into ruby_1_9_1.
--
* win32/Makefile.sub (miniruby.exe): workaround for a failure of
  mt.exe on Windows 7 beta.  [ruby-talk:330284]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@23175 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-04-12 14:02:09 +00:00
yugui
1314730548 merges r22769 from trunk into ruby_1_9_1.
--
* win32/README.win32 (Requirement): VC++ 5.0 is not supported
  already.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@23174 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-04-12 14:02:02 +00:00
yugui
c2109f71a6 merges r22592 from trunk into ruby_1_9_1.
--
* common.mk (main): split from exts and makes main program after
  building exts with miniruby, to get rid of overwriting running
  program.  [ruby-core:22339]

* Makefile.in, win32/Makefile.sub (RUNCMD, MKMAIN_CMD): macros to
  run script file.

* ext/extmk.rb (parse_args): added --command-output option which
  creates script file to make main program.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@22737 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-03-03 11:40:11 +00:00
yugui
de16edce97 merges r22025 from trunk into ruby_1_9_1.
* win32/mkexports.rb: shouldn't export DllMain.
	  reported at 1233686068/21

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@22510 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-02-22 09:47:21 +00:00
yugui
6311c5a8e4 merges r21795 from trunk into ruby_1_9_1.
* cygwin/GNUmakefile.in (RUBYDEF): needs DATA marks to export
  non-function symbols.  [ruby-core:21582]

* win32/mkexports.rb (Exports::Mingw#each_export): ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21845 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-28 11:09:01 +00:00
yugui
05392588e8 merges r21685 from trunk into ruby_1_9_1.
* Makefile.in (miniruby): renames and then removes, to get rid of
  EPERM on cygwin and mingw.

* Makefile.in ($(LIBRUBY_SO)): use wildcard option of objcopy.

* configure.in (DLDFLAGS): do not export all symbols.

* cygwin/GNUmakefile.in (RUBYDEF): rejects symbols prefixex with
  Init_.

* win32/mkexports.rb (Exports::Mingw): includes all symbols except for
  prefixed with Init_ as well as mswin32.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21843 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-28 11:08:44 +00:00
yugui
ef5a94ac95 merges r21767 from trunk into ruby_1_9_1.
* win32/Makefile.sub (clean-ext): condition of EXTS was inverted.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21835 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-28 09:23:21 +00:00
yugui
a21146a575 merges r21764 and r21765 from trunk into ruby_1_9_1.
* Makefile.in, win32/Makefile.sub (RMDIRS): remove directory and
  parents.

* Makefile.in, win32/Makefile.sub (distclean-rdoc): added to remove
  temprary rdoc.

* Makefile.in, win32/Makefile.sub (distclean): removes extout
  directory.

* Makefile.in, win32/Makefile.sub (clean-ext): skips non-existent
  directories.

* common.mk (clean, distclean): cleans rdoc.

* common.mk (clean-extout): removes extout directory.

* configure.in (RMDIRS, RMALL): added to clean extout.

* lib/fileutils.rb (FileUtils#rmdir): added :parents option.

* lib/mkmf.rb (create_makefile): cleans installed files at clean
  instead of distclean.

* lib/mkmf.rb (create_makefile): added clean-so and clean-rb.

* lib/mkmf.rb (def init_mkmf): added DISTCLEANDIRS.

* lib/un.rb (rmdir): added -p option.

* tool/rmdirs, win32/rmdirs.bat: removes directory and the parents.

* win32/rm.bat: added -r option.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21833 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-28 09:23:03 +00:00
yugui
0962222856 merges r21602, r21603, r21607 and r21630 from trunk into ruby_1_9_1.
* configure.in (Makefile): set VCS and VCSUP to support `git svn'                                      and git.

* Makefile.in, win32/Makefile.sub (up): split from common.mk.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21631 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-17 12:19:36 +00:00
yugui
575e4dfcbb merges r21591 from trunk into ruby_1_9_1.
* win32/Makefile.sub ($(INSNS), node_name.inc, known_errors.inc,
	  miniprelude.c, newline.c): if dependencies is newer than targets or
	  targets don't exist, try to create targets with BASERUBY. no need to
	  detect errors there because the absence of BASERUBY is not abnormal.
	  after the try, if the targets still don't exist, copy them from
	  $(srcdir).

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21596 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-16 04:07:23 +00:00
yugui
f6edc70d56 merges r21534 from trunk into ruby_1_9_1.
* win32/Makefile.sub ($(INSNS), node_name.inc, known_errors.inc,
	  miniprelude.c, newline.c): shoudn't copy when $(srcdir) != ".", too.
	  (this is a workaround.  we need more strict check.)

	* win32/Makefile.sub ($(INSNS)): shound't remove BASERUBY.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21572 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-15 16:32:34 +00:00
yugui
2f2497ee53 merges r21517 and r21519 from trunk into ruby_1_9_1.
* configure.in, win32/Makefile.sub (MISSING): added langinfo on mingw
  and mswin.

* encoding.c (rb_locale_charmap): use environments on mingw and mswin.

* missing/langinfo.c (nl_langinfo_codeset): MS-Windows Japanese
  environment uses Windows-31J derived from Shift_JIS, not EUC-JP.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21565 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-15 15:39:56 +00:00
yugui
2a71b1ca87 merges r21516 from trunk into ruby_1_9_1.
* win32/Makefile.sub ($(INSNS), node_name.inc, known_errors.inc,
	  miniprelude.c, newline.c): copy only when $(srcdir) != pwd.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21564 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-15 15:39:47 +00:00
yugui
cac78c3c4d merges r21518 from trunk into ruby_1_9_1.
* win32/Makefile.sub (COMPILERFLAG): for enc/trans/gb18030.c.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21561 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-15 15:39:16 +00:00
yugui
6227816910 merges r21487 from trunk into ruby_1_9_1.
* include/ruby/intern.h, thread.c, win32/Makefile.sub (rb_fdset_t,
	  rb_fd_init, rb_fd_term, rb_fd_zero, rb_fd_set, rb_fd_clr, rb_fd_isset,
	  rb_fd_select, rb_fd_ptr, rb_fd_max, HAVE_RB_FD_INIT): new type,
	  functions, and macros for Windows.

	* win32/win32.c (extract_fd, rb_w32_select): use rb_fdset_t to expand
	  fd_array if needed.  [ruby-core:19946]

	* win32/win32.c (copy_fd): new funcion for rb_w32_select().

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21549 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-15 15:37:20 +00:00
yugui
ce3002de0a merges r21506 from trunk into ruby_1_9_1.
* win32/win32.c (rb_w32_aspawn): should not escape with carret
  unless using cmd.exe.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21541 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-15 15:36:15 +00:00
yugui
b60f93b94b merges r21473 from trunk into ruby_1_9_1.
* win32/win32.c (internal_cmd_match): extracted from
  is_internal_cmd.

* win32/win32.c (argv_size, join_argv): escapes redirection, pipe
  and carret punctuations with carrets.

* win32/win32.c (rb_w32_aspawn): ditto, and redirections and pipe
  have no meanings.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21540 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-15 15:36:05 +00:00
yugui
1fbaa2a5af merges r21447 from trunk into ruby_1_9_1.
* win32/win32.c (open_dir_handle): extracted from rb_w32_opendir.

* win32/win32.c (winnt_stat): gets rid of strange behavior of
  GetFileAttributes().  [ruby-core:21269]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21464 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-12 13:33:08 +00:00
yugui
7083fd551a merges r21336 from trunk into ruby_1_9_1.
* win32/win32.c (init_env): use user profile folder than personal
  folder.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21403 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-09 02:18:59 +00:00
yugui
54ba01fe95 merges r21284 from trunk into ruby_1_9_1.
* common.mk, Makefile.in, win32/Makefile.sub (INSNS): move the macro
	  definition from common.mk to {Makefile.in,win32/Makefile.sub}.
	  [ruby-dev:37678]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21317 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-04 11:53:25 +00:00
yugui
ce35512187 merges r21280 from trunk into ruby_1_9_1.
* common.mk, Makefile.in, win32/Makefile.sub ($(INSNS), node_name.inc,
	  known_errors.inc, miniprelude.c, newline.c): move rules from common.mk
	  to {Makefile.in,win32/Makefile.sub) for nmake.
	  [ruby-core:20993]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21309 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-04 06:16:14 +00:00
yugui
bf4f43e210 merges r21220 from trunk into ruby_1_9_1.
* Makefile.in (distclean-ext, realclean-ext): use EXTS as default.

* win32/Makefile.sub (distclean-ext, realclean-ext): try to remove ext
  directory.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21234 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-01 06:43:17 +00:00
yugui
91cf7698e1 merges r21136 from trunk into ruby_1_9_1.
* win32/Makefile.sub (config.h): do not use snprintf/vsnprintf in
  msvcrt.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21154 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-12-29 07:18:39 +00:00
yugui
259ed6176f merges r21099 from trunk into ruby_1_9_1.
* win32/win32.c (rb_w32_argv_size): if an argument is empty, it's size
	  is 2, not 0, because it will be converted to "".

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21127 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-12-28 09:42:09 +00:00
yugui
c85ad557c2 merges r20088 from trunk into ruby_1_9_1.
win32/Makefile.sub: add RUNRUBYOPT. [ruby-dev:37009]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21050 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-12-25 16:32:15 +00:00
yugui
028ae6cfaf merges r20945 from trunk into ruby_1_9_1.
* win32/win32.c (rb_w32_spawn): deals with quoted commands.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21016 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-12-25 09:54:07 +00:00
yugui
c3b50d5ada merges r20942 from trunk into ruby_1_9_1.
* win32/win32.c (rb_w32_spawn): support normal commands with arguments.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21013 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-12-25 09:53:40 +00:00
yugui
d0ac50680a merges r20912 from trunk into ruby_1_9_1.
* cygwin/GNUmakefile.in (rubydll.def), win32/mkexports.rb
  (Exports#exports): added VERSION.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21000 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-12-25 09:51:30 +00:00
yugui
d9f4570bdd merges r20909 and r20910 from trunk into ruby_1_9_1.
* configure.in (mingw): no longer uses snprintf and vsnprintf of
  msvcrt.

* win32/win32.c (rb_w32_vsnprintf, rb_w32_snprintf): removed.

* win32/Makefile.sub (config.h): vsnprintf exists in VC7 or later.

* win32/mkexports.rb (Exports#initialize): aliases
  rb_w32_vsnprintf and rb_w32_snprintf for binary compatibility.

* sprintf.c (rb_str_format): uses snprintf instead of sprintf.

* numeric.c (flo_to_s, rb_num2long, rb_num2ll): ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@20998 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-12-25 09:51:10 +00:00
yugui
1bfa299015 merges r20892 from trunk into ruby_1_9_1.
* dln.c (dln_find_1): supplements an extension for executable
  files on DOSish platforms.

* io.c (pipe_open): use rb_w32_aspawn() for array form.

* win32/win32.c (rb_w32_pipe_exec): no longer used.

* win32/win32.c (rb_w32_spawn, rb_w32_aspawn): deals with batch
  files and commands with extensions.  [ruby-core:20695]

* win32/win32.c (has_redirection): supports environment variables
  references.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@20899 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-12-21 05:27:20 +00:00
yugui
82d84b4971 merges r20528 from trunk into ruby_1_9_1.
* win32/win32.c (rb_w32_read): ERROR_BROKEN_PIPE is not a real error
	  at this point.

	* io.c (pipe_open): use rb_w32_spawn() instead of rb_w32_pipe_exec()
	  to use our own redirection scheme.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@20897 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-12-21 05:27:06 +00:00
yugui
7bccce491f merges r20754 from trunk into ruby_1_9_1.
* win32/Makefile.sub (config.h): define CANONICALIZATION_FOR_MATHN
	  to follow r20683.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@20817 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-12-17 06:16:18 +00:00
usa
9fb5d4ed9d * win32/win32.c (rb_w32_read, rb_w32_write, rb_w32_isatty): check
whether fd is valid.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@20540 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-12-05 09:14:12 +00:00
usa
d291c56e63 * win32/win32.c (waitpid): fix bug of checking child slot.
* win32/win32.c (FindChildSlotByHandle): new.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@20517 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-12-04 14:31:37 +00:00
usa
2a628fe111 * win32/win32.c (rb_w32_accept): commit miss.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@20213 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-11-11 14:37:18 +00:00
usa
5602a9dd3a * win32/win32.c (rb_w32_accept): secure fd before accept because if
error causes in securing, cannot restore the state of accepted
	  socket.
	  fixed [ruby-core:19728]



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@20189 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-11-11 08:54:07 +00:00
usa
1cd9e3398a * win32/win32.c (ifs_open_socket): should retry without proto_buffer
if cannot find the suitable protocol. a patch from Heesob Park.
	  fixed [ruby-core:19713]



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@20166 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-11-10 00:57:49 +00:00
yugui
b7d291504d merged r20014 from trunk into ruby_1_9_1.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@20037 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-10-29 16:17:51 +00:00
yugui
bb51917dce merged 20011 from trunk into ruby_1_9_1.
* complex.c: uses macro in declarations.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@20033 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-10-29 16:11:12 +00:00
usa
b3b3c17461 * win32/win32.c (rb_w32_open): shouldn't seek here.
* win32/win32.c (rb_w32_write): write to the end of the file when
	  FAPPEND is specified.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@20015 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-10-29 02:01:54 +00:00
usa
10a1e380a2 * win32/win32.c (rb_w32_open): need to seek to the end of the file when
O_APPEND is specified.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@20009 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-10-28 15:30:03 +00:00