github
/
ruby
зеркало из https://github.com/github/ruby.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

extconf.rb: have_header 

* ext/tk/extconf.rb (find_tcltk_header): use have_header instead of
  try_cpp, which is incredibly slow with VC.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38760 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2013-01-10 07:47:20 +00:00
Родитель 42eadff3a1
Коммит a5ddc2e196
2 изменённых файлов: 39 добавлений и 12 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

5
ChangeLog
Просмотреть файл

@ -1,3 +1,8 @@
Thu Jan 10 16:47:18 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/tk/extconf.rb (find_tcltk_header): use have_header instead of
try_cpp, which is incredibly slow with VC.
Thu Jan 10 15:55:28 2013 Shugo Maeda <shugo@ruby-lang.org>
* numeric.c (do_coerce): remove an unused variable.

46
ext/tk/extconf.rb
Просмотреть файл

@ -1358,10 +1358,15 @@ def find_tcltk_header(tclver, tkver)
print(".") # progress
if major && minor
# version check on tcl.h
have_tcl_h = try_cpp("#include <tcl.h>\n#if TCL_MAJOR_VERSION != #{major} || TCL_MINOR_VERSION != #{minor}\n#error VERSION does not match\n#endif")
version_check = proc {|code|
code << ("#if TCL_MAJOR_VERSION != #{major} || TCL_MINOR_VERSION != #{minor}\n" \
"#error VERSION does not match\n" \
"#endif")
}
else
have_tcl_h = have_header('tcl.h')
version_check = nil
end
have_tcl_h = have_header('tcl.h', &version_check)
unless have_tcl_h
if tclver && ! tclver.empty?
versions = [tclver]
@ -1383,13 +1388,19 @@ def find_tcltk_header(tclver, tkver)
(File.directory?(dir))? File.expand_path(dir): nil
}.compact.uniq
code = "#include <tcl.h>\n"
code << "#if TCL_MAJOR_VERSION != #{major}\n#error MAJOR_VERSION does not match\n#endif\n" if major
code << "#if TCL_MINOR_VERSION != #{minor}\n#error MINOR_VERSION does not match\n#endif\n" if minor
if major || minor
version_check = proc {|code|
code << "#if TCL_MAJOR_VERSION != #{major}\n#error MAJOR_VERSION does not match\n#endif\n" if major
code << "#if TCL_MINOR_VERSION != #{minor}\n#error MINOR_VERSION does not match\n#endif\n" if minor
code
}
else
version_check = nil
end
have_tcl_h = paths.find{|path|
print(".") # progress
inc_opt = " -I#{path.quote}"
if try_cpp(code, inc_opt)
if try_header("tcl", inc_opt, &version_check)
($INCFLAGS ||= "") << inc_opt
true
else
@ -1414,10 +1425,15 @@ def find_tcltk_header(tclver, tkver)
print(".") # progress
if major && minor
# version check on tk.h
have_tk_h = try_cpp("#include <tk.h>\n#if TK_MAJOR_VERSION != #{major} || TK_MINOR_VERSION != #{minor}\n#error VERSION does not match\n#endif")
version_check = proc {|code|
code << ("#if TK_MAJOR_VERSION != #{major} || TK_MINOR_VERSION != #{minor}\n" \
"#error VERSION does not match\n" \
"#endif")
}
else
have_tk_h = have_header('tk.h')
version_check = nil
end
have_tk_h = have_header('tk.h')
unless have_tk_h
if tkver && ! tkver.empty?
versions = [tkver]
@ -1439,13 +1455,19 @@ def find_tcltk_header(tclver, tkver)
(File.directory?(dir))? File.expand_path(dir): nil
}.compact.uniq
code = "#include <tcl.h>\n#include <tk.h>\n"
code << "#if TK_MAJOR_VERSION != #{major}\n#error MAJOR_VERSION does not match\n#endif\n" if major
code << "#if TK_MINOR_VERSION != #{minor}\n#error MINOR_VERSION does not match\n#endif\n" if minor
if major || minor
version_check = proc {|code|
code << "#if TK_MAJOR_VERSION != #{major}\n#error MAJOR_VERSION does not match\n#endif\n" if major
code << "#if TK_MINOR_VERSION != #{minor}\n#error MINOR_VERSION does not match\n#endif\n" if minor
code
}
else
version_check = nil
end
have_tk_h = paths.find{|path|
print(".") # progress
inc_opt = " -I#{path.quote}"
if try_cpp(code, inc_opt)
if try_header(%w'tcl.h tk.h', inc_opt, &version_check)
($INCFLAGS ||= "") << inc_opt
true
else