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

87 Коммитов

Автор SHA1 Сообщение Дата
nobu 51fdac39eb setup.mak: discard BASERUBY output
* win32/setup.mak: discard output from BASERUBY command, even if
  it contains multiple commands.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@62110 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2018-01-30 11:12:21 +00:00
nobu e61e19a2fe setup.mak: make Makefile stable
* win32/setup.mak (-basic-vars-): moved BASERUBY and HAVE_BASERUBY
  definition to make Makefile stable when they have been defaulted.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60985 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2017-12-03 04:41:06 +00:00
nobu 6af650256b RUBY_DEVEL flag
* configure.in: define RUBY_DEVEL only in the trunk.

* gc.c: enable runtime rgengc debug if RUBY_DEVEL

* ruby.c (debug_option): enable RUBY_DEBUG in --debug option only
  if RUBY_DEVEL.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59131 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2017-06-21 04:34:25 +00:00
usa eb7817ad7e setup.mak have to handle `GIT` and `HAVE_GIT`
* win32/setup.mak: seems to be forgotten to commit at r58295.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@58520 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2017-04-30 21:18:31 +00:00
nobu 4c70f04786 setup.mak: ENABLE_DEBUG_ENV [ci skip]
* win32/setup.mak (-basic-vars-): pass ENABLE_DEBUG_ENV to
  Makefile.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@58223 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2017-03-31 00:35:01 +00:00
nobu e704fc8280 win32/setup.mak: reorder
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@57488 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2017-02-01 04:54:03 +00:00
svn e4a27f25c5 * remove trailing spaces.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55639 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-07-11 16:30:04 +00:00
usa 5e1ee25ad8 * configure.in, lib/mkmf.rb, win32/Makefile.sub (CSRCFLAG): make the
compiler option replacable in Makefile.

* win32/Makefile.sub (OUTFLAG, COUTFLAG): ditto.

* win32/Makeile.sub, win32/setup.mak (CC): should not append `-nologo`
  option forcely.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55638 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-07-11 16:30:03 +00:00
nobu 98eae5d71e configure.bat: --with-libdir
* win32/configure.bat: add --with-libdir option for basename of
  libdir.  on Windows it must be placed under exec_prefix always.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53619 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-01-22 14:28:31 +00:00
nobu d43ef66b12 RUBY_PROGRAM_VERSION from RUBY_VERSION
* configure.in, win32/setup.mak: extract RUBY_PROGRAM_VERSION from
  RUBY_VERSION in version.h instead of RUBY_API_VERSION numbers in
  include/ruby/version.h, and cut it into version numbers.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53477 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-01-09 01:44:56 +00:00
nobu 1fbfa7180b RUBY_RELEASE_DATE in verconf.mk
* win32/setup.mak (verconf.mk): extract RUBY_RELEASE_DATE without
  quotation marks.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53475 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-01-09 00:23:04 +00:00
nobu bc8a7f9ab7 revert r53459, r53427, r53314
Revert "* tool/make-snapshot: fix for the changes of version.h in r53314."
Revert "* version.h (RUBY_BUILD_VERSION_STR_3): Workaround for old version of"
Revert "program version from API version"

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53472 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-01-09 00:19:16 +00:00
nobu 8c327b7f3a program version from API version
* configure.in, version.h (RUBY_PROGRAM_VERSION): extract version
  numbers from API version in include/ruby/version.h except for
  TEENY, to save matz job next year.
* win32/setup.mak (-version-): use program version.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53314 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-12-25 16:24:43 +00:00
nobu 00a47cf678 setup.mak: split release date
* win32/setup.mak (verconf.mk): split release date into year,
  month, and day.

* common.mk (RUBY_RELEASE_DATE): move from Makefile.in to share
  with win32/setup.mak.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53312 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-12-25 15:02:14 +00:00
nobu 59fc842601 setup.mak: follow up r53310
* win32/setup.mak (verconf.mk): no longer appends, and escape
  dollar.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53311 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-12-25 14:50:26 +00:00
nobu fd236be28f setup.mak: follow up r53303
* win32/setup.mak (verconf.mk): follow up r53303.  needs STRINGIZE
  now.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53310 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-12-25 14:46:27 +00:00
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