Граф коммитов

71 Коммитов

Автор SHA1 Сообщение Дата
nobu 1cede1dab2 reaply r48278
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48298 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-11-06 10:53:04 +00:00
naruse 8d00496911 Revert r48278 "common.mk: update unicode data only if BASERUBY is available"
Moreover its error "make[1]: *** No rule to make target
`lib/unicode_normalize/tables.rb', needed by `srcs-lib'.  Stop." is not
a good error message.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48295 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-11-06 05:46:43 +00:00
nobu ef8139db13 common.mk: update unicode data only if BASERUBY is available
* common.mk (lib/unicode_normalize/tables.rb): do nothing unless
  BASERUBY is available.  MINIRUBY cannot load extension libraries,
  so cannot update Unicode data.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48278 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-11-05 05:11:33 +00:00
usa a12ca2113d * win32/setup.mak: $(APPEND) with some arguments insert a space before
the arguments, so it causes error if the arguments are expected to be
  a macro definition.  this fix resolve the build error introduced at
  r48210.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48211 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-10-31 08:25:07 +00:00
nobu 74ec76990a win32/setup.mak: get target architecture from the compiler
* win32/Makefile.sub, win32/setup.mak (MACHINE): get target
  architecture from the compiler, instead of environment variable
  at build time, which is irrelevant to runtime environment, and
  not set when running in cygwin sshd.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48210 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-10-31 08:07:50 +00:00
nobu 42ca978656 common.mk: UNICODE_FILES
* common.mk (UNICODE_FILES): revert the rule that Unicode data
  files depend on downloader target, and add missing dependency of
  lib/unicode_normalize/tables.rb

* common.mk (after-configure): removed as srcdir should be
  read-only after update.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48075 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-10-21 13:48:16 +00:00
nobu 4ae67d876a common.mk: after-configure
* common.mk (after-configure): update Unicode files after
  configure run.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48069 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-10-21 05:17:32 +00:00
nobu 0eb892e103 win32/setup.mak: rename RUBY_RELEASE_DATE
* win32/setup.mak (verconf.mk): rename RUBY_PROGRAM_VERSION as
  RUBY_RELEASE_DATE, same as other platforms.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46394 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-06-10 08:30:10 +00:00
nobu 2e2ccab110 win32/setup.mak: separate verconf.mk
* win32/setup.mak (verconf.mk): separate RUBY_RELEASE_DATE from
  Makefile so that build would not stop everyday.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46393 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-06-10 08:30:01 +00:00
usa cdf80f030d * win32/{setup.mak,Makefile.sub}: update fake.rb like
template/fake.rb.in.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44444 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-12-27 04:25:47 +00:00
nobu d66c5768ca win32.c: check by module handles
* win32/win32.c (console_emulator_p): check by comparison between
  module handle of WriteConsoleW and kernel32.dll.
* configure.in, win32/Makefile.sub, win32/setup.mak: no longer need
  psapi.lib.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43331 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-10-17 08:11:21 +00:00
nobu 209376034f * remove trailing spaces.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43325 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-10-17 02:57:44 +00:00
nobu a8c6a52a1a win32/setup.mak: check psapi.h
* win32/setup.mak (check-psapi.h): check if psapi.h is available.

* win32/win32.c (CHECK_CONSOLE_EMULATOR): enable console emulator DLL
  check only when psapi.h is available.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43307 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-10-16 13:50:29 +00:00
nobu 8d816aef2e setup.mak: -runtime-
* win32/setup.mak (-runtime-): see msvcrt from link header on mswin
  instead of running testing executable file, for cross compiling.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38791 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-01-12 07:12:49 +00:00
nobu 51914fcce6 setup.mak: -osname-
* win32/setup.mak (-osname-): separate from -runtime- and just
  compile.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38783 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-01-11 10:21:52 +00:00
nobu 2b131e1eb6 win32/setup.mak: remove each files
* win32/setup.mak (-runtime-): removing by wildcard errs on network
  file system, so remove each files.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38773 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-01-11 02:02:18 +00:00
usa 9d2711691e * win32/configure.bat, win32/setup.mak, win32/Makefile.sub: omit Win9x
support.  remove --enable/disable-win95 option.

* include/ruby/win32.h, file.c, win32/win32.c: ditto.

* win32/README.win32: ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36342 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-07-09 08:25:06 +00:00
usa edeba4dbe6 * win32/setup.mak: support x86-amd64 cross compile environment.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32521 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-07-12 02:59:11 +00:00
kosaki c6e6380665 * win32/setup.mak (USE_RUBYGEMS): fixed r30835. It didn't work on
mswin32 port. If you changed win32/configure.bat, you should change
  setup.mak too.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30870 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-02-14 09:49:56 +00:00
usa c5d383bae1 * win32/setup.mak (BASERUBY): quit with an error when BASERUBY was not
able to set, just like configure.in does. [ruby-dev:42782]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30236 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-12-17 04:29:16 +00:00
usa b9b26300da * win32/{configure.bat,setup.mak,Makefile.sub} (PROGRAM_PREFIX,
PROGRAM_SUFFIX): unite the differences of the names of macros of
  prefix and suffix.
  reported by HANEDA Norikatsu. [ruby-dev:42775]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30225 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-12-16 10:55:11 +00:00
nobu 261903223a * win32/setup.mak (-basic-vars-, -runtime-): suppress trailing
space and compiler command line.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29780 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-11-13 23:48:12 +00:00
usa 7b109f1772 * win32/setup.mak: use findstr.exe instead of find.exe, because all
target build platforms should have findstr.exe, and, find.exe often
  means another command such as cygwin's.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29767 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-11-12 01:00:39 +00:00
nobu f2ff3eb6ec * configure.in: read API version from include/ruby/version.h.
* {bcc,win}32/setup.mak (-version-): ditto.

* version.h (RUBY_LIB_VERSION): use API version numbers.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29084 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-08-24 01:11:14 +00:00
usa 0f406d278f * win32/configure.bat: now recognize --with-*-{dir,include,lib} options
and pass them to mkmf.

* win32/configure.bat: general conversion from ``/'' to ``\'' of
  configure_args is not necessary any longer.

* win32/setup.mak: BASERUBY is used as command, so always need to
  convert ``/'' to ``\'' within it.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26051 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-12-08 14:53:55 +00:00
usa 39e457b4e7 * win32/{configure.bat, setup.mak, Makefile.sub}: add new configure
option ``--with-ntver''.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25931 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-11-26 08:55:34 +00:00
usa 4e389756ec * win32/{setup.mak,Makefile.sub,win32.c},include/ruby/win32.h (RT_VER):
split compiler specification and runtime library specification.

* win32/Makefile.sub (LD_SHARED*, config.status): no need to embbed
  manifest if not exist.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25173 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-10-01 05:19:19 +00:00
nobu d291fd5208 * win32/setup.mak (-version-): r23426.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@23477 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-05-17 13:27:53 +00:00
nobu d34f9699fc * configure.in, win32/configure.bat (--enable-win95): new option
to enable/disable win95 support.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22766 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-03-04 14:29:58 +00:00
nobu 6e7d7bf5dd * include/ruby/win32.h (WIN95): moved to config.h
* win32/Makefile.sub (config.h): defines WIN95 only if unicows.lib
  is available.

* win32/setup.mak (-unicows-): checks if unicows.lib is available.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22763 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-03-04 10:35:28 +00:00
usa bfdadb885a * win32/{configure.bat,setup.mak,Makefile.sub): add --program-prefix
configure option support.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19664 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-10-03 05:04:57 +00:00
usa bf050c3cd6 * win32/setup.rb, win32/Makefile.sub (PLATFORM): use $(PLATFORM)
instead of $(OS) because ENV["OS"] is used in test-all (drb).



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18028 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-07-11 13:10:29 +00:00
usa 5e0824bcd8 * win32/setup.mak (BASERUBY): nmake cannot execute ruby collectly
if the path of ruby.exe is quoted.

	* win32/setup.mak ($(ARCH)): if a macro is appended by $(APPEND),
	  a space will be inserted on the top of the line.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15113 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-01-18 11:06:12 +00:00
nobu 9615084012 * win32/setup.mak: strip out empty lines from CPP output.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15059 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-01-15 06:09:30 +00:00
nobu de556e6281 * {win,bcc}32/setup.mak (-basic-vars-): expand BASERUBY to full path
to get rid of ./ruby.exe.

* win32/enc-setup.mak: workaround for Borland make.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15058 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-01-15 05:57:40 +00:00
nobu 872899fa58 * version.h: use patchlevel if revision is not set.
* {bcc32,win{32,ce}}/setup.mak (-version-): skip including revision.h.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14502 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-12-22 18:26:50 +00:00
nobu 4cf13ffaef * configure.in (EXTERNAL_ENCOBJS, ENCSOS): removed.
* enc/Makefile.in (BUILTIN_ENCS): includes .c suffix.

* enc/depend: splitted from Makefile.in.

* {bcc32,win32,wince}/setup.mak (-encs-): extracts BUILTIN_ENCOBJS.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14264 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-12-17 08:17:50 +00:00
usa 2276493ee5 * win32/setup.mak: commit miss.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13796 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-10-31 16:34:16 +00:00
usa 24ada5f55e * win32/configure.bat, setup.mak: now can recognize OS even if
the ``--target'' option of configure is omitted.

	* win32/README.win32: update the descriptions about compiler.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13795 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-10-31 15:53:19 +00:00
nobu 267241808b * {win32,wince,bcc32}/setup.mak (-version-): no RUBY_EXTERN magic.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12828 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-07-21 06:39:26 +00:00
usa 1aa54c6db6 * include/ruby/win32.h, win32/Makefile.sub, win32/configure.bat,
win32/mkexports.rb, win32/setup.mak, win32/win32.c: import
	  x64-mswin64 port.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12635 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-06-27 11:47:53 +00:00
usa b696420526 * Makefile.in, common.mk, configure.in, */{Makefile.sub, configure.bat,
setup.mak}: add --with-baseruby configure option.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11559 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-01-23 06:41:22 +00:00
nobu eba74dc219 * win32/Makefile.sub, win32/configure.bat win32/setup.mak: program
name transform.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10884 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2006-09-08 00:00:12 +00:00
nobu 0ca603c1bc * mkconfig.rb: merge multiple entries to an entry with multiple lines.
* lib/mkmf.rb: allow a series of commands to link.

* win32/Makefile.sub: embed manifests.

* win32/setup.mak: suffix OS name by runtime version.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10189 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2006-05-24 16:52:00 +00:00
usa dc2732c84f * win32/setup.mak (MAKE): workaround for nmake 8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9840 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2006-01-17 02:33:29 +00:00
ocean 90382d8aab * win32/setup.mk: findstr doesn't exist on win9x.
fixed: [ruby-dev:27756] (written by nobu)


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9575 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-11-21 07:12:57 +00:00
nobu f76f6155e1 * win32/Makefile.sub (MKFILES): update MKFILES if configure files get
changed.

* win32/configure.bat, win32/setup.mak (configure_args): store
  arguments to configure files.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9391 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-10-14 14:10:08 +00:00
nobu 6329fa50b6 * win32/Makefile.sub (OPTFLAGS): default global optimization to
disabled only for VC++6.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8389 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-04-27 14:43:06 +00:00
nobu 7f530ef4e1 * {bcc32,win32,wince}/configure.bat, {bcc32,win32,wince}/setup.mak:
add extout option.

* bcc32/setup.mak: make configuration variables overridable.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8358 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-04-19 22:28:28 +00:00
nobu f091f36035 * configure.in (mingw32): use actual runtime DLL name as ruby DLL
name and default load path.

* win32/Makefile.sub, win32/setup.mak: ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8314 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-04-13 10:25:41 +00:00