tk 0.5.0 → 0.6.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/.github/workflows/test.yml +4 -3
- data/MANUAL_tcltklib.ja +1 -1
- data/README.md +8 -0
- data/ext/tk/extconf.rb +6 -7
- data/ext/tk/stubs.c +1 -2
- data/ext/tk/tcltklib.c +419 -868
- data/ext/tk/tkutil/tkutil.c +81 -202
- data/lib/multi-tk.rb +2 -2
- data/lib/thread_tk.rb +1 -1
- data/lib/tk/bgerror.rb +1 -1
- data/lib/tk/bindtag.rb +1 -1
- data/lib/tk/busy.rb +1 -1
- data/lib/tk/button.rb +1 -1
- data/lib/tk/canvas.rb +1 -1
- data/lib/tk/canvastag.rb +1 -1
- data/lib/tk/checkbutton.rb +1 -1
- data/lib/tk/clipboard.rb +1 -1
- data/lib/tk/clock.rb +1 -1
- data/lib/tk/composite.rb +1 -1
- data/lib/tk/console.rb +1 -1
- data/lib/tk/dialog.rb +1 -1
- data/lib/tk/encodedstr.rb +1 -1
- data/lib/tk/entry.rb +1 -1
- data/lib/tk/font.rb +1 -1
- data/lib/tk/fontchooser.rb +1 -1
- data/lib/tk/frame.rb +1 -1
- data/lib/tk/grid.rb +1 -1
- data/lib/tk/image.rb +1 -1
- data/lib/tk/itemconfig.rb +1 -1
- data/lib/tk/itemfont.rb +1 -1
- data/lib/tk/kinput.rb +1 -1
- data/lib/tk/label.rb +1 -1
- data/lib/tk/labelframe.rb +1 -1
- data/lib/tk/listbox.rb +1 -1
- data/lib/tk/macpkg.rb +1 -1
- data/lib/tk/menu.rb +1 -1
- data/lib/tk/menubar.rb +1 -1
- data/lib/tk/message.rb +1 -1
- data/lib/tk/mngfocus.rb +1 -1
- data/lib/tk/msgcat.rb +1 -1
- data/lib/tk/namespace.rb +1 -1
- data/lib/tk/optiondb.rb +1 -1
- data/lib/tk/optionobj.rb +1 -1
- data/lib/tk/pack.rb +1 -1
- data/lib/tk/package.rb +1 -1
- data/lib/tk/palette.rb +1 -1
- data/lib/tk/panedwindow.rb +1 -1
- data/lib/tk/place.rb +1 -1
- data/lib/tk/radiobutton.rb +1 -1
- data/lib/tk/root.rb +1 -1
- data/lib/tk/scale.rb +1 -1
- data/lib/tk/scrollable.rb +1 -1
- data/lib/tk/scrollbar.rb +1 -1
- data/lib/tk/scrollbox.rb +1 -1
- data/lib/tk/selection.rb +1 -1
- data/lib/tk/spinbox.rb +1 -1
- data/lib/tk/tagfont.rb +1 -1
- data/lib/tk/text.rb +1 -1
- data/lib/tk/textimage.rb +1 -1
- data/lib/tk/textmark.rb +1 -1
- data/lib/tk/texttag.rb +1 -1
- data/lib/tk/textwindow.rb +1 -1
- data/lib/tk/timer.rb +1 -1
- data/lib/tk/tk_mac.rb +1 -1
- data/lib/tk/toplevel.rb +1 -1
- data/lib/tk/txtwin_abst.rb +1 -1
- data/lib/tk/validation.rb +1 -1
- data/lib/tk/variable.rb +1 -1
- data/lib/tk/virtevent.rb +1 -1
- data/lib/tk/winfo.rb +1 -1
- data/lib/tk/winpkg.rb +1 -1
- data/lib/tk/wm.rb +1 -1
- data/lib/tk/xim.rb +1 -1
- data/lib/tk.rb +4 -2
- data/lib/tkextlib/ICONS/icons.rb +1 -1
- data/lib/tkextlib/blt/barchart.rb +1 -1
- data/lib/tkextlib/blt/bitmap.rb +1 -1
- data/lib/tkextlib/blt/busy.rb +1 -1
- data/lib/tkextlib/blt/component.rb +1 -1
- data/lib/tkextlib/blt/container.rb +1 -1
- data/lib/tkextlib/blt/cutbuffer.rb +1 -1
- data/lib/tkextlib/blt/dragdrop.rb +1 -1
- data/lib/tkextlib/blt/eps.rb +1 -1
- data/lib/tkextlib/blt/graph.rb +1 -1
- data/lib/tkextlib/blt/htext.rb +1 -1
- data/lib/tkextlib/blt/spline.rb +1 -1
- data/lib/tkextlib/blt/stripchart.rb +1 -1
- data/lib/tkextlib/blt/table.rb +1 -1
- data/lib/tkextlib/blt/tabnotebook.rb +1 -1
- data/lib/tkextlib/blt/tabset.rb +1 -1
- data/lib/tkextlib/blt/ted.rb +1 -1
- data/lib/tkextlib/blt/tile/button.rb +1 -1
- data/lib/tkextlib/blt/tile/checkbutton.rb +1 -1
- data/lib/tkextlib/blt/tile/frame.rb +1 -1
- data/lib/tkextlib/blt/tile/label.rb +1 -1
- data/lib/tkextlib/blt/tile/radiobutton.rb +1 -1
- data/lib/tkextlib/blt/tile/scrollbar.rb +1 -1
- data/lib/tkextlib/blt/tile/toplevel.rb +1 -1
- data/lib/tkextlib/blt/tile.rb +1 -1
- data/lib/tkextlib/blt/tree.rb +1 -1
- data/lib/tkextlib/blt/treeview.rb +1 -1
- data/lib/tkextlib/blt/unix_dnd.rb +1 -1
- data/lib/tkextlib/blt/vector.rb +1 -1
- data/lib/tkextlib/blt/watch.rb +1 -1
- data/lib/tkextlib/blt/win_printer.rb +1 -1
- data/lib/tkextlib/blt/winop.rb +1 -1
- data/lib/tkextlib/blt.rb +1 -1
- data/lib/tkextlib/bwidget/arrowbutton.rb +1 -1
- data/lib/tkextlib/bwidget/bitmap.rb +1 -1
- data/lib/tkextlib/bwidget/button.rb +1 -1
- data/lib/tkextlib/bwidget/buttonbox.rb +1 -1
- data/lib/tkextlib/bwidget/combobox.rb +1 -1
- data/lib/tkextlib/bwidget/dialog.rb +1 -1
- data/lib/tkextlib/bwidget/dragsite.rb +1 -1
- data/lib/tkextlib/bwidget/dropsite.rb +1 -1
- data/lib/tkextlib/bwidget/dynamichelp.rb +1 -1
- data/lib/tkextlib/bwidget/entry.rb +1 -1
- data/lib/tkextlib/bwidget/label.rb +1 -1
- data/lib/tkextlib/bwidget/labelentry.rb +1 -1
- data/lib/tkextlib/bwidget/labelframe.rb +1 -1
- data/lib/tkextlib/bwidget/listbox.rb +1 -1
- data/lib/tkextlib/bwidget/mainframe.rb +1 -1
- data/lib/tkextlib/bwidget/messagedlg.rb +1 -1
- data/lib/tkextlib/bwidget/notebook.rb +1 -1
- data/lib/tkextlib/bwidget/pagesmanager.rb +1 -1
- data/lib/tkextlib/bwidget/panedwindow.rb +1 -1
- data/lib/tkextlib/bwidget/panelframe.rb +1 -1
- data/lib/tkextlib/bwidget/passwddlg.rb +1 -1
- data/lib/tkextlib/bwidget/progressbar.rb +1 -1
- data/lib/tkextlib/bwidget/progressdlg.rb +1 -1
- data/lib/tkextlib/bwidget/scrollableframe.rb +1 -1
- data/lib/tkextlib/bwidget/scrolledwindow.rb +1 -1
- data/lib/tkextlib/bwidget/scrollview.rb +1 -1
- data/lib/tkextlib/bwidget/selectcolor.rb +1 -1
- data/lib/tkextlib/bwidget/selectfont.rb +1 -1
- data/lib/tkextlib/bwidget/separator.rb +1 -1
- data/lib/tkextlib/bwidget/spinbox.rb +1 -1
- data/lib/tkextlib/bwidget/statusbar.rb +1 -1
- data/lib/tkextlib/bwidget/titleframe.rb +1 -1
- data/lib/tkextlib/bwidget/tree.rb +1 -1
- data/lib/tkextlib/bwidget/widget.rb +1 -1
- data/lib/tkextlib/bwidget.rb +1 -1
- data/lib/tkextlib/itcl/incr_tcl.rb +1 -1
- data/lib/tkextlib/itk/incr_tk.rb +1 -1
- data/lib/tkextlib/iwidgets/buttonbox.rb +1 -1
- data/lib/tkextlib/iwidgets/calendar.rb +1 -1
- data/lib/tkextlib/iwidgets/canvasprintbox.rb +1 -1
- data/lib/tkextlib/iwidgets/canvasprintdialog.rb +1 -1
- data/lib/tkextlib/iwidgets/checkbox.rb +1 -1
- data/lib/tkextlib/iwidgets/combobox.rb +1 -1
- data/lib/tkextlib/iwidgets/dateentry.rb +1 -1
- data/lib/tkextlib/iwidgets/datefield.rb +1 -1
- data/lib/tkextlib/iwidgets/dialog.rb +1 -1
- data/lib/tkextlib/iwidgets/dialogshell.rb +1 -1
- data/lib/tkextlib/iwidgets/disjointlistbox.rb +1 -1
- data/lib/tkextlib/iwidgets/entryfield.rb +1 -1
- data/lib/tkextlib/iwidgets/extbutton.rb +1 -1
- data/lib/tkextlib/iwidgets/extfileselectionbox.rb +1 -1
- data/lib/tkextlib/iwidgets/extfileselectiondialog.rb +1 -1
- data/lib/tkextlib/iwidgets/feedback.rb +1 -1
- data/lib/tkextlib/iwidgets/fileselectionbox.rb +1 -1
- data/lib/tkextlib/iwidgets/fileselectiondialog.rb +1 -1
- data/lib/tkextlib/iwidgets/finddialog.rb +1 -1
- data/lib/tkextlib/iwidgets/hierarchy.rb +1 -1
- data/lib/tkextlib/iwidgets/hyperhelp.rb +1 -1
- data/lib/tkextlib/iwidgets/labeledframe.rb +1 -1
- data/lib/tkextlib/iwidgets/labeledwidget.rb +1 -1
- data/lib/tkextlib/iwidgets/mainwindow.rb +1 -1
- data/lib/tkextlib/iwidgets/menubar.rb +1 -1
- data/lib/tkextlib/iwidgets/messagebox.rb +1 -1
- data/lib/tkextlib/iwidgets/messagedialog.rb +1 -1
- data/lib/tkextlib/iwidgets/notebook.rb +2 -2
- data/lib/tkextlib/iwidgets/optionmenu.rb +1 -1
- data/lib/tkextlib/iwidgets/panedwindow.rb +1 -1
- data/lib/tkextlib/iwidgets/promptdialog.rb +1 -1
- data/lib/tkextlib/iwidgets/pushbutton.rb +1 -1
- data/lib/tkextlib/iwidgets/radiobox.rb +1 -1
- data/lib/tkextlib/iwidgets/scopedobject.rb +1 -1
- data/lib/tkextlib/iwidgets/scrolledcanvas.rb +1 -1
- data/lib/tkextlib/iwidgets/scrolledframe.rb +1 -1
- data/lib/tkextlib/iwidgets/scrolledhtml.rb +1 -1
- data/lib/tkextlib/iwidgets/scrolledlistbox.rb +1 -1
- data/lib/tkextlib/iwidgets/scrolledtext.rb +1 -1
- data/lib/tkextlib/iwidgets/scrolledwidget.rb +1 -1
- data/lib/tkextlib/iwidgets/selectionbox.rb +1 -1
- data/lib/tkextlib/iwidgets/selectiondialog.rb +1 -1
- data/lib/tkextlib/iwidgets/shell.rb +1 -1
- data/lib/tkextlib/iwidgets/spindate.rb +1 -1
- data/lib/tkextlib/iwidgets/spinint.rb +1 -1
- data/lib/tkextlib/iwidgets/spinner.rb +1 -1
- data/lib/tkextlib/iwidgets/spintime.rb +1 -1
- data/lib/tkextlib/iwidgets/tabnotebook.rb +2 -2
- data/lib/tkextlib/iwidgets/tabset.rb +1 -1
- data/lib/tkextlib/iwidgets/timeentry.rb +1 -1
- data/lib/tkextlib/iwidgets/timefield.rb +1 -1
- data/lib/tkextlib/iwidgets/toolbar.rb +1 -1
- data/lib/tkextlib/iwidgets/watch.rb +1 -1
- data/lib/tkextlib/iwidgets.rb +1 -1
- data/lib/tkextlib/pkg_checker.rb +1 -1
- data/lib/tkextlib/tcllib/autoscroll.rb +1 -1
- data/lib/tkextlib/tcllib/calendar.rb +1 -1
- data/lib/tkextlib/tcllib/canvas_sqmap.rb +1 -1
- data/lib/tkextlib/tcllib/canvas_zoom.rb +1 -1
- data/lib/tkextlib/tcllib/chatwidget.rb +1 -1
- data/lib/tkextlib/tcllib/crosshair.rb +1 -1
- data/lib/tkextlib/tcllib/ctext.rb +1 -1
- data/lib/tkextlib/tcllib/cursor.rb +1 -1
- data/lib/tkextlib/tcllib/dateentry.rb +1 -1
- data/lib/tkextlib/tcllib/datefield.rb +1 -1
- data/lib/tkextlib/tcllib/diagrams.rb +1 -1
- data/lib/tkextlib/tcllib/dialog.rb +1 -1
- data/lib/tkextlib/tcllib/getstring.rb +1 -1
- data/lib/tkextlib/tcllib/history.rb +1 -1
- data/lib/tkextlib/tcllib/ico.rb +1 -1
- data/lib/tkextlib/tcllib/ip_entry.rb +1 -1
- data/lib/tkextlib/tcllib/khim.rb +1 -1
- data/lib/tkextlib/tcllib/menuentry.rb +1 -1
- data/lib/tkextlib/tcllib/ntext.rb +1 -1
- data/lib/tkextlib/tcllib/panelframe.rb +1 -1
- data/lib/tkextlib/tcllib/plotchart.rb +1 -1
- data/lib/tkextlib/tcllib/ruler.rb +1 -1
- data/lib/tkextlib/tcllib/screenruler.rb +1 -1
- data/lib/tkextlib/tcllib/scrolledwindow.rb +1 -1
- data/lib/tkextlib/tcllib/scrollwin.rb +1 -1
- data/lib/tkextlib/tcllib/statusbar.rb +1 -1
- data/lib/tkextlib/tcllib/style.rb +1 -1
- data/lib/tkextlib/tcllib/superframe.rb +1 -1
- data/lib/tkextlib/tcllib/swaplist.rb +1 -1
- data/lib/tkextlib/tcllib/tablelist.rb +1 -1
- data/lib/tkextlib/tcllib/tablelist_core.rb +5 -5
- data/lib/tkextlib/tcllib/tablelist_tile.rb +1 -1
- data/lib/tkextlib/tcllib/tkpiechart.rb +1 -1
- data/lib/tkextlib/tcllib/toolbar.rb +1 -1
- data/lib/tkextlib/tcllib/tooltip.rb +1 -1
- data/lib/tkextlib/tcllib/validator.rb +1 -1
- data/lib/tkextlib/tcllib/widget.rb +1 -1
- data/lib/tkextlib/tcllib.rb +1 -1
- data/lib/tkextlib/tclx/tclx.rb +1 -1
- data/lib/tkextlib/tile/dialog.rb +1 -1
- data/lib/tkextlib/tile/sizegrip.rb +1 -1
- data/lib/tkextlib/tile/style.rb +1 -1
- data/lib/tkextlib/tile/tbutton.rb +1 -1
- data/lib/tkextlib/tile/tcheckbutton.rb +1 -1
- data/lib/tkextlib/tile/tcombobox.rb +1 -1
- data/lib/tkextlib/tile/tentry.rb +1 -1
- data/lib/tkextlib/tile/tframe.rb +1 -1
- data/lib/tkextlib/tile/tlabel.rb +1 -1
- data/lib/tkextlib/tile/tlabelframe.rb +1 -1
- data/lib/tkextlib/tile/tmenubutton.rb +1 -1
- data/lib/tkextlib/tile/tnotebook.rb +1 -1
- data/lib/tkextlib/tile/tpaned.rb +1 -1
- data/lib/tkextlib/tile/tprogressbar.rb +1 -1
- data/lib/tkextlib/tile/tradiobutton.rb +1 -1
- data/lib/tkextlib/tile/treeview.rb +1 -1
- data/lib/tkextlib/tile/tscale.rb +1 -1
- data/lib/tkextlib/tile/tscrollbar.rb +1 -1
- data/lib/tkextlib/tile/tseparator.rb +1 -1
- data/lib/tkextlib/tile/tspinbox.rb +1 -1
- data/lib/tkextlib/tile/tsquare.rb +1 -1
- data/lib/tkextlib/tile.rb +1 -1
- data/lib/tkextlib/tkDND/shape.rb +1 -1
- data/lib/tkextlib/tkDND/tkdnd.rb +1 -1
- data/lib/tkextlib/tkDND.rb +1 -1
- data/lib/tkextlib/tkHTML/htmlwidget.rb +1 -1
- data/lib/tkextlib/tkimg/bmp.rb +1 -1
- data/lib/tkextlib/tkimg/dted.rb +1 -1
- data/lib/tkextlib/tkimg/gif.rb +1 -1
- data/lib/tkextlib/tkimg/ico.rb +1 -1
- data/lib/tkextlib/tkimg/jpeg.rb +1 -1
- data/lib/tkextlib/tkimg/pcx.rb +1 -1
- data/lib/tkextlib/tkimg/pixmap.rb +1 -1
- data/lib/tkextlib/tkimg/png.rb +1 -1
- data/lib/tkextlib/tkimg/ppm.rb +1 -1
- data/lib/tkextlib/tkimg/ps.rb +1 -1
- data/lib/tkextlib/tkimg/raw.rb +1 -1
- data/lib/tkextlib/tkimg/sgi.rb +1 -1
- data/lib/tkextlib/tkimg/sun.rb +1 -1
- data/lib/tkextlib/tkimg/tga.rb +1 -1
- data/lib/tkextlib/tkimg/tiff.rb +1 -1
- data/lib/tkextlib/tkimg/window.rb +1 -1
- data/lib/tkextlib/tkimg/xbm.rb +1 -1
- data/lib/tkextlib/tkimg/xpm.rb +1 -1
- data/lib/tkextlib/tkimg.rb +1 -1
- data/lib/tkextlib/tktable/tktable.rb +1 -1
- data/lib/tkextlib/tktable.rb +1 -1
- data/lib/tkextlib/tktrans/tktrans.rb +1 -1
- data/lib/tkextlib/tktrans.rb +1 -1
- data/lib/tkextlib/treectrl/tktreectrl.rb +2 -2
- data/lib/tkextlib/trofs/trofs.rb +1 -1
- data/lib/tkextlib/vu/bargraph.rb +1 -1
- data/lib/tkextlib/vu/charts.rb +1 -1
- data/lib/tkextlib/vu/dial.rb +1 -1
- data/lib/tkextlib/vu/pie.rb +1 -1
- data/lib/tkextlib/vu/spinbox.rb +1 -1
- data/lib/tkextlib/vu.rb +1 -1
- data/lib/tkextlib/winico/winico.rb +1 -1
- data/lib/tkextlib/winico.rb +1 -1
- data/sample/tktextio.rb +2 -2
- data/tk.gemspec +1 -1
- metadata +3 -6
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 356bef4bb16300343f7aa7b9ea28cb5311a700a6e009d105df35b30f5c318e37
|
|
4
|
+
data.tar.gz: 96a40437b8786917ae8311276d0a0898345cd546310e79a5706ba435ad55d74f
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 417bac098785d55c22b102dc4be5bf51972cc203bf9cc82ed9ad2be3dc4d8ce6bbf34fa86f643c748ad645f0c30dde36dfa58872de27262e7ddf310bf45f0832
|
|
7
|
+
data.tar.gz: '038a06e6300648cec1217270a9b930bd4fe7c2cc1f0f82ea68ab831e8dbbfdff7f8721dab691d15cbbeca1cd47c7fce9f1f378f7f68d7be97c9e925982468342'
|
data/.github/workflows/test.yml
CHANGED
|
@@ -6,11 +6,12 @@ jobs:
|
|
|
6
6
|
build:
|
|
7
7
|
name: build (${{ matrix.ruby }}
|
|
8
8
|
strategy:
|
|
9
|
+
fail-fast: false
|
|
9
10
|
matrix:
|
|
10
|
-
ruby: [ 3.
|
|
11
|
-
runs-on: ubuntu-
|
|
11
|
+
ruby: [ 3.4, 3.3, 3.2, 3.1, head ]
|
|
12
|
+
runs-on: ubuntu-24.04
|
|
12
13
|
steps:
|
|
13
|
-
- uses: actions/checkout@
|
|
14
|
+
- uses: actions/checkout@v6
|
|
14
15
|
- name: Set up Ruby
|
|
15
16
|
uses: ruby/setup-ruby@v1
|
|
16
17
|
with:
|
data/MANUAL_tcltklib.ja
CHANGED
|
@@ -135,7 +135,7 @@ require "tcltklib" すると, 以下のモジュール, クラスが利用可能
|
|
|
135
135
|
メソッド _return_value()
|
|
136
136
|
直前の Tcl_Eval の戻り値を返します. 0(TCL_OK) で正常終了です.
|
|
137
137
|
引数: 無し
|
|
138
|
-
戻り値 (
|
|
138
|
+
戻り値 (Integer): 直前の Tcl_Eval() が返した値.
|
|
139
139
|
|
|
140
140
|
==============================================================
|
|
141
141
|
|
data/README.md
CHANGED
|
@@ -18,6 +18,14 @@ Or install it yourself as:
|
|
|
18
18
|
|
|
19
19
|
$ gem install tk
|
|
20
20
|
|
|
21
|
+
You may need to set options when using `gem install` so that the gem can find the Tcl/Tk headers and library:
|
|
22
|
+
|
|
23
|
+
$ gem install tk -- \
|
|
24
|
+
--with-tcl-include='/path/to/tcl/header/directory' \
|
|
25
|
+
--with-tk-include='/path/to/tk/header/directory' \
|
|
26
|
+
--with-tcl-lib='/path/to/tcl/shared/library/directory' \
|
|
27
|
+
--with-tk-lib='/path/to/tk/shared/library/directory'
|
|
28
|
+
|
|
21
29
|
## Documentation
|
|
22
30
|
|
|
23
31
|
### Read this first
|
data/ext/tk/extconf.rb
CHANGED
|
@@ -12,12 +12,12 @@ TkLib_Config['search_versions'] =
|
|
|
12
12
|
# %w[8.9 8.8 8.7 8.6 8.5 8.4 8.3 8.2 8.1 8.0 7.6 4.2]
|
|
13
13
|
# %w[8.7 8.6 8.5 8.4 8.3 8.2 8.1 8.0]
|
|
14
14
|
# %w[8.7 8.6 8.5 8.4 8.0] # to shorten search steps
|
|
15
|
-
%w[8.6 8.5 8.4]
|
|
15
|
+
%w[8.6 8.5 8.4 9.0]
|
|
16
16
|
|
|
17
17
|
TkLib_Config['unsupported_versions'] =
|
|
18
18
|
%w[8.8 8.7]
|
|
19
19
|
|
|
20
|
-
TkLib_Config['major_nums'] = '
|
|
20
|
+
TkLib_Config['major_nums'] = '90'
|
|
21
21
|
|
|
22
22
|
|
|
23
23
|
##############################################################
|
|
@@ -608,17 +608,17 @@ def libcheck_for_tclConfig(tcldir, tkdir, tclconf, tkconf)
|
|
|
608
608
|
|
|
609
609
|
if tclver
|
|
610
610
|
tcl_glob = "*tcl#{stub}#{tclver}.*"
|
|
611
|
-
tcl_regexp =
|
|
611
|
+
tcl_regexp = /(tcl#{stub}#{tclver}.*)\.(#{exts})/
|
|
612
612
|
elsif tclconf
|
|
613
613
|
tcl_glob = "*tcl#{stub}#{tclconf['TCL_MAJOR_VERSION']}{.,}#{tclconf['TCL_MINOR_VERSION']}*.*"
|
|
614
|
-
tcl_regexp =
|
|
614
|
+
tcl_regexp = /(tcl#{stub}#{tclconf['TCL_MAJOR_VERSION']}(?:\.|)#{tclconf['TCL_MINOR_VERSION']}.*)\.(#{exts})/
|
|
615
615
|
end
|
|
616
616
|
if tkver
|
|
617
617
|
tk_glob = "*tk#{stub}#{tkver}.*"
|
|
618
|
-
tk_regexp =
|
|
618
|
+
tk_regexp = /(tk#{stub}#{tkver}.*)\.(#{exts})/
|
|
619
619
|
elsif tkconf
|
|
620
620
|
tk_glob = "*tk#{stub}#{tkconf['TK_MAJOR_VERSION']}{.,}#{tkconf['TK_MINOR_VERSION']}*.*"
|
|
621
|
-
tk_regexp =
|
|
621
|
+
tk_regexp = /((?:tcl#{tclconf['TCL_MAJOR_VERSION']})?tk#{stub}#{tkconf['TK_MAJOR_VERSION']}\.?#{tkconf['TK_MINOR_VERSION']}.*)\.#{exts}/
|
|
622
622
|
end
|
|
623
623
|
|
|
624
624
|
tcllib_ok ||= !tclconf || Dir.glob(File.join(tcldir, tcl_glob), File::FNM_CASEFOLD).find{|file|
|
|
@@ -2096,5 +2096,4 @@ if (TkLib_Config["tcltk-framework"] ||
|
|
|
2096
2096
|
else
|
|
2097
2097
|
puts "\nCan't find proper Tcl/Tk libraries. So, can't make tcltklib.so which is required by Ruby/Tk."
|
|
2098
2098
|
puts "If you have Tcl/Tk libraries on your environment, you may be able to use them with configure options (see ext/tk/README.tcltklib)."
|
|
2099
|
-
puts "At present, Tcl/Tk8.6 is not supported. Although you can try to use Tcl/Tk8.6 with configure options, it will not work correctly. I recommend you to use Tcl/Tk8.5 or 8.4."
|
|
2100
2099
|
end
|
data/ext/tk/stubs.c
CHANGED