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

76 Коммитов

Автор SHA1 Сообщение Дата
nobu 931581469f tk/extconf.rb: refactor
* ext/tk/extconf.rb (collect_tcltk_defs): split by -D at the
  beginning or preceded by a space.  exclude empty strings from
  $defs.

* ext/tk/extconf.rb: test if value is set and has non-blank by
  matching /\S/ at once.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54763 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-04-25 08:30:56 +00:00
nobu ff4cec3c09 tk: suppress progress indicators
* ext/tk/extconf.rb: hack to disable progress indicators with
  parallel build, not to interleave other messages.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54682 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-04-22 06:14:21 +00:00
nobu 21791dd97f ext/tk/extconf.rb: add newline
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54524 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-04-09 04:01:35 +00:00
nobu 333034eacd tk/extconf.rb: progress
* ext/tk/extconf.rb (progress): print progress messages only if
  Logging is quiet.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54516 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-04-08 03:53:28 +00:00
nobu ccb6e802af tk/extconf.rb: outdated checks
* ext/tk/extconf.rb: remove outdated checks.

* ext/tk/tcltklib.c (ip_ruby_cmd): remove longstanding dead code.
  ptr and len in RArray were till 1.8 and have_struct_member of
  1.8 does not set HAVE_<stuct_name>_<member_name> but only
  HAVE_ST_<member_name>.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54515 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-04-08 03:14:45 +00:00
a_matsuda 97d1dbada3 Typos in messages
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53333 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-12-27 09:57:30 +00:00
a_matsuda 73a37eb325 Documentation typos
[ci skip]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53332 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-12-27 09:57:21 +00:00
naruse c4fdfabcc8 handle ext/ as r53141
g -L frozen_string_literal ext/**/*.rb|xargs ruby -Ka -e'ARGV.each{|fn|puts
fn;open(fn,"r+"){|f|s=f.read.sub(/\A(#!.*\n)?(#.*coding.*\n)?/,"\\&#
frozen_string_literal: false\n");f.rewind;f.write s}}'

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53143 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-12-16 05:31:54 +00:00
nobu 1a2a4084d9 tcltklib.c: basename
* ext/tk/tcltklib.c (setup_rubytkkit): use ruby_enc_find_basename
  if available, instead of File.basename.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52417 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-10-31 23:39:37 +00:00
hsbt d9a2b3480e * doc/contributors.rdoc: fix a typo. Patch by @davydovanton
[fix GH-872][ci skip]
* doc/syntax/methods.rdoc: ditto.
* ext/digest/sha2/sha2.c: ditto.
* ext/socket/ipsocket.c: ditto.
* ext/tk/*: ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50320 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-04-15 01:37:47 +00:00
nagai bf0e2520d7 * ext/tk/tcltklib.c: support Tcl/Tk8.6.
* ext/tk/lib/tk.rb: ditto.
* ext/tk/extconf.rb: ditto.
* ext/tk/lib/tk_mac.rb: add new features of Tcl/Tk8.6.
* ext/tk/lib/tkextlib/tile/treeview.rb: ditto.
* ext/tk/lib/tkextlib/tile/fontchooser.rb: add an alias.
* ext/tk/lib/tk/autoload.rb: ditto.
* ext/tk/lib/tkextlib/tcllib/validator.rb: add a new feature of tklib extension.
* ext/tk/lib/tkextlib/tkimg/dted.rb: a new supported format of Img extension.
* ext/tk/lib/tkextlib/tkimg/raw.rb: ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48018 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-10-19 08:38:35 +00:00
nagai 7ce520e90a * ext/tk/tcltklib.c: (experimental) support Tcl/Tk8.6.2.
* ext/tk/extconf.rb: ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47908 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-10-13 17:32:17 +00:00
nagai 738c298ce0 * ext/tk/extconf.rb: --with-tcllib and --with-tklib configure options
don't work correctly. Patch by jeremyevans0 (Jeremy Evans).
  [ruby-core:59483] [Bug #9348]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44574 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-01-12 09:04:06 +00:00
nobu f06ee90f95 tk/extconf.rb: fix libpathflag arguments
* ext/tk/extconf.rb: fix to pass arrays instead of strings to
  libpathflag.  patch at [ruby-core:59665].  [Bug #9386]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44541 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-01-09 15:47:54 +00:00
nobu dc4922b89d tk/extconf.rb: rpath by libpathflag
* ext/tk/extconf.rb: use libpathflag method instead of dealing with
  rpath options directly.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44507 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-01-05 12:48:23 +00:00
nobu bd0ef220f0 ext/tk/extconf.rb: fix build error with tk variant
* ext/tk/extconf.rb: use -rpath linker option instead of -R, to
  fix build error with tk variant.  incorporate from MacPorts.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44498 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-01-04 12:10:20 +00:00
nagai 07c15e8b10 * ext/tk/extconf.rb: show the reason of why ignore tclConfig.sh/tkConfig.sh.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43925 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-11-30 02:46:47 +00:00
nagai b72256f91c * ext/tk/lib/tkextlib/tktable/tktable.rb: fix bug on arguments for Proc object.
* ext/tk/sample/scrollframe.rb: forgot a Module definition.

* ext/tk/extconf.rb: check unsupported version of tclConfig.sh/tkConfig.sh. It is because current Ruby/Tk doesn't support Tcl/Tk8.6.

* ext/tk/extconf.rb: change search step of Tcl/Tk libraries.

* ext/tk/lib/tk/namespace.rb: instance_exec() cannot accept a script string.

* ext/tk/lib/tk/msgcat.rb: bug fix on treating encodings. Now, ext/tk/sample/tkmsgcat-load_rb*.rb will work.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43923 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-11-29 15:44:25 +00:00
nobu 3976eb12ff mkmf.rb: fix framework option
* lib/mkmf.rb (have_framework): should append framework options to
  $LIBS, not $LDFLAGS.  the former is propagated to exts.mk when
  enable-static-linked-ext.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43277 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-10-14 02:07:51 +00:00
nagai 0d5ec8a346 * ext/tk/extconf.rb: Don't add "-ltk -ltcl" for MacOSX frameworks, because they may link improper libraries.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42372 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-08-04 01:31:39 +00:00
nagai e31da2df7e * ext/tk/extconf.rb: Default search_versions are set 8.5 and 8.4 only. At present, Tcl/Tk8.6 is not supported.
* ext/tk/extconf.rb: Fix typo. [ruby-core:56084] [Bug #8656]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42059 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-07-19 04:43:16 +00:00
nagai c58dc63686 * ext/tk/extconf.rb: support s390x (Thanks to bkabrda) [ruby-trunk - Bug #5465]
* ext/tk/extconf.rb: apply [Backport87 - Backport #5048]
* ext/tk/lib/tk/canvas.rb, ext/tk/sample/demos-{en,jp}/{tree.rb,widget}: fix bug (Thanks to zzak) [ruby-trunk - Bug #8319]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41347 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-06-17 05:21:16 +00:00
nobu 78598ebf51 ext/tk/tcltklib.c: adjust nesting
* ext/tk/extconf.rb: check for rb_thread_alive_p and
  rb_thread_check_trap_pending.

* ext/tk/tcltklib.c (rb_thread_alive_p, rb_thread_check_trap_pending):
  define substitutions if not available.

* ext/tk/tcltklib.c (lib_eventloop_core, lib_eventloop_ensure),
  (lib_thread_callback, ip_rbUpdateCommand, ip_rbVwaitCommand),
  (ip_rbTkWaitCommand, call_queue_handler, eval_queue_handler),
  (invoke_queue_handler): adjust nesting.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39974 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-03-28 04:50:12 +00:00
nobu a5ddc2e196 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
2013-01-10 07:47:20 +00:00
nobu d0d68df7d0 mkmf.rb: fix splitting options with an argument
* ext/extmk.rb (extmake), lib/mkmf.rb (have_framework): fix splitting
  options with an argument, not using NUL as special character.
  [ruby-core:47447] [Bug #6987]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36918 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-09-06 16:21:57 +00:00
nobu 5a03c25690 mkmf.rb: hack for -framework
* lib/mkmf.rb (have_framework): get rid of separating -framework
  option and its argument and dealing with the argument as a library
  or an object name.  if $LDFLAGS were an array...


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36437 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-07-18 07:17:43 +00:00
nobu 03570f8091 ext/extmk.rb: workaround for -framework option
* ext/extmk.rb (extmake): assume non-option words are arguments.
  workaround for -framework option.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35731 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-05-20 15:58:03 +00:00
nobu 0a7aada5d1 fix static-linked-ext
* ext/tk/extconf.rb: add -l options to $libs not $LDFLAGS, to be
  passed to EXTLIBS in exts.mk.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35671 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-05-17 01:55:00 +00:00
nobu 58e7c45fc7 fix static-linked-ext
* lib/mkmf.rb (MakeMakefile#have_framework): combine -framework option
  and its argument with an equal sign not to be separated in merge_libs.
* ext/tk/extconf.rb: ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35669 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-05-17 01:37:08 +00:00
kosaki 20ae79b0c2 * include/ruby/defines.h: remove NextStep, OpenStep, Rhapsody
support. Last activity of their OSs are 7 years ago.
* configure.in: ditto.
* dir.c: ditto.
* ext/tk/extconf.rb: ditto.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33337 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-09-26 00:19:03 +00:00
eban d7ccf5e1cc * ex/tk/extconf.rb: support for the latest ActiveTcl with mingw.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32287 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-06-29 14:11:19 +00:00
nagai 483efa1fda * ext/tk/extconf.rb: fails on Mac OS X [Ruby 1.9 - Bug #4853]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32023 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-06-12 07:22:41 +00:00
nobu 5b3bf854f7 * ext/tk/extconf.rb: use $defs not $CPPFLAGS to get rid of
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
2011-06-07 04:37:08 +00:00
nagai eeccb5935b * ext/tk/extconf.rb: fix for uninitialized global variables. [Ruby 1.9 - Bug #4811]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31894 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-06-01 15:46:31 +00:00
nagai 542190ce58 * ext/tk/lib/tk.rb: hang-up at exit before calling Tk.mainloop.
* ext/tk/lib/tk/extconf.rb: cannot make on MinGW [Ruby 1.9 - Bug #4141].


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31742 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-05-26 23:36:33 +00:00
nagai 3ca633b890 * ext/tk/lib/tk.rb: fail to start Tk.mainloop (exit immediately) on some environment (reported on [ruby-talk:381444]).
* ext/tk/lib/tk/canvas.rb: support creating a canvas item object from an item ID number.

* ext/tk/lib/tk/image.rb: import documents which are pull-requested. [Ruby 1.9 - Feature #4595]

* ext/tk/lib/tk/extconf.rb: search directories for 64bit library (e.g. /usr/lib64), add some new configure options (see README.tcltklib), and bug fix.

* ext/tk/lib/tk/README.tcltklib: modify docs for some new configure options.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31717 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-05-23 22:37:44 +00:00
nobu 3a47cf3395 * remove trailing spaces.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31573 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-05-15 11:55:52 +00:00
nagai bc8e650735 * ext/tk/extconf.rb: use TK_XINCLUDES on tkConfig.sh when not empty,
even if MacOS X Aqua version [ruby-dev:41883].


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28793 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-07-29 22:54:01 +00:00
nagai d369a50c2b * ext/tk/extconf.rb: use tclConfig.sh/tkConfig.sh when frameworks
are enabled on MacOS X.
* ext/tk/stubs.c: dirty hack for frameworks and stubs on MacOS X.
* ext/tk/lib/tk.rb: stop creating a dummy Tcl/Tk interpreter. 
  And hide a root window before starting eventloop. (for ruby 1.9)
* ext/tk/tcltklib.c: add codes to support Ruby/Tk-Kit (Rubykit).


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28111 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-05-31 14:50:39 +00:00
nagai 3c80aa56de * ext/tk/extconf.rb: [ruby-def:41334] [Bug #3307] invalid result on searching tcl.h/tk.h. Thanks, Masaya Tarui.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27904 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-05-19 14:45:03 +00:00
nobu 69310faab2 * ext/tk/extconf.rb (get_tclConfig_dirs): glob with EXEEXT.
* ext/tk/extconf.rb (search_tclConfig): fixed typo.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27652 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-05-07 00:16:19 +00:00
nagai cc9333b840 * ext/tk/extconf.rb: search directories on PATH, only if containing
tclsh or wish command (probably right fix for [ruby-core:30010]).


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27649 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-05-06 21:47:37 +00:00
nagai 690e065bf8 * ext/tk/extconf.rb: revert. enbugged by last commit.
([ruby-dev:41133], [ruby-dev:41134], [ruby-core:30010])
* ext/tk/README.tcltklib: ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27627 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-05-05 10:08:16 +00:00
nagai 5d639de5d3 * ext/tk/extconf.rb: better support for MinGW environment.
* ext/tk/README.tcltklib: add info of --with-tcltk-drive for Windows.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27562 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-04-30 06:41:01 +00:00
nagai 9e415266a8 * ext/tk/extconf.rb: fix [ruby-core:28901] [Bug #2997]. Thanks, Michael Graff.
* ext/tk/tcltklib.c: use xfree() for memories allocated by ALLOC().
* ext/tk/tkutil/tkutil.c: ditto.
* ext/tk/lib/tkextlib/version.rb: forgot updating.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27055 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-03-25 19:55:32 +00:00
nagai fd684f1082 * ext/tk/extconf.rb: fix [Bug #2840] Tk doesn't built in mingw.
* ext/tk/lib/tk.rb: forgot updating RELEASE_DATE at last commit.
* ext/tk/tkutil/tkutil.c: ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26901 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-03-13 01:07:23 +00:00
nobu de850442f2 * ext/tk/extconf.rb: log() is built-in in some compilers and needs
proper declaration.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26878 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-03-11 21:49:02 +00:00
nagai 979ac967a9 * ext/tk/extconf.rb (search_tclConfig): last change isn't enough. fixed it.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24484 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-08-09 12:24:55 +00:00
nagai 833b354578 * ext/tk/extconf.rb (search_tclConfig): fix logic bug.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24431 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-08-06 16:07:11 +00:00
nagai 8e7e28f15c * ext/tk/lib/extconf.rb: bug fix and ignore invalid Tcl/Tk libraries.
* ext/tk/lib/config_list.in: bug fix and add a new option.
* ext/tk/lib/README.tcltklib: update for a new option.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24299 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-07-27 19:40:43 +00:00