kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* ext/tk/extconf.rb: use $defs not $CPPFLAGS to get rid of

Browse source 
command line escape issues on Windows.  fixed #4835.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31947 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2011-06-07 04:37:08 +00:00
parent 8189483161
commit 5b3bf854f7
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Tue Jun 7 13:36:51 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/tk/extconf.rb: use $defs not $CPPFLAGS to get rid of
command line escape issues on Windows. fixed #4835.
Tue Jun 7 03:18:45 2011 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
* test/ruby/test_io.rb (TestIO#test_s_{,bin}write): do not create a

9
ext/tk/extconf.rb
View file

@ -370,7 +370,7 @@ def collect_tcltk_defs(tcl_defs_str, tk_defs_str)
vtcl != vtk )
}
defs.map{|ary| s = ary.join(''); (s.strip.empty?)? "": "-D" << s}.join(' ')
defs.map{|ary| s = ary.join(''); (s.strip.empty?)? "": "-D" << s}
end
def parse_tclConfig(file)
@ -1942,7 +1942,7 @@ TkLib_Config["checked_shlib_dirs"] =
$CPPFLAGS ||= ""
# $CPPFLAGS += " #{TclConfig_Info['TCL_DEFS']}"
# $CPPFLAGS += " #{TkConfig_Info['TK_DEFS']}"
$CPPFLAGS += collect_tcltk_defs(TclConfig_Info['TCL_DEFS'], TkConfig_Info['TK_DEFS'])
$defs += collect_tcltk_defs(TclConfig_Info['TCL_DEFS'], TkConfig_Info['TK_DEFS'])
# MacOS X Frameworks?
if TkLib_Config["tcltk-framework"]
@ -2018,9 +2018,8 @@ if (TkLib_Config["tcltk-framework"] ||
$INSTALLFILES << ["lib/tkextlib/SUPPORT_STATUS", "$(RUBYLIBDIR)", "lib"]
# create
$CPPFLAGS ||= ""
$CPPFLAGS << %[ -DRUBY_VERSION=\\"#{RUBY_VERSION}\\"]
$CPPFLAGS << %[ -DRUBY_RELEASE_DATE=\\"#{RUBY_RELEASE_DATE}\\"]
$defs << %[-DRUBY_VERSION=\\"#{RUBY_VERSION}\\"]
$defs << %[-DRUBY_RELEASE_DATE=\\"#{RUBY_RELEASE_DATE}\\"]
create_makefile("tcltklib")