[RFA] patch to find_iwidgets_library()

[RFA] patch to find_iwidgets_library()

[Martin M. Hunt]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain, Size: 1656 bytes --]

The patch fixes the common problem when someone checks out sources without 
-P.  Insight then incorrectly finds the iwidgets2 directory instead of the 
iwidgets3.  

2001-07-18  Martin M. Hunt  <hunt@redhat.com>

	* library/util.tcl (find_iwidgets_library): Look
	for iwidgets3* so we don't accidently find iwidgets2.x.

Index: library/util.tcl
===================================================================
RCS file: /cvs/src/src/gdb/gdbtk/library/util.tcl,v
retrieving revision 1.7
diff -u -p -r1.7 util.tcl
--- util.tcl	2001/06/11 23:08:05	1.7
+++ util.tcl	2001/07/19 05:23:27
@@ -237,7 +237,7 @@ proc find_iwidgets_library {} {
 
     set iwidgetsSrcDir [glob -nocomplain [file join \
 					    [file dirname [file dirname $::tcl_library]] \
-					    itcl iwidgets*]]
+					    itcl iwidgets3*]]
     
     # Canonicalize the executable's directory name.  It turns out that on 
Solaris, 
     # info nameofexecutable returns /foo/bar/real_dir/./gdb when gdb is 
launched from
@@ -258,7 +258,7 @@ proc find_iwidgets_library {} {
 
     set iwidgetsBuildDir [glob -nocomplain [file join \
 					      [file dirname $exec_name] \
-					      itcl iwidgets*]]
+					      itcl iwidgets3*]]
     set initFile [file join [lindex $iwidgetsBuildDir 0] \
 		    unix iwidgets.tcl]
 
@@ -267,7 +267,7 @@ proc find_iwidgets_library {} {
       # Check in "normal" installed place: "../../share/iwidgets*"
       set iwidgetsBuildDir [glob -nocomplain [file join \
 						[file dirname [file dirname $exec_name]] \
-						share iwidgets*]]
+						share iwidgets3*]]
       set initFile [file join [lindex $iwidgetsBuildDir 0] iwidgets.tcl]
     }
 
`\x16Ý@\x10

Re: [RFA] patch to find_iwidgets_library()

[Fernando Nasser]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain, Size: 2382 bytes --]

"Martin M. Hunt" wrote:
> 
> The patch fixes the common problem when someone checks out sources without
> -P.  Insight then incorrectly finds the iwidgets2 directory instead of the
> iwidgets3.
> 

Thank you Martin.  I see that you did not forget it :-)

It is approved, of course.

Thanks a lot.

Fernando



> 2001-07-18  Martin M. Hunt  <hunt@redhat.com>
> 
>         * library/util.tcl (find_iwidgets_library): Look
>         for iwidgets3* so we don't accidently find iwidgets2.x.
> 
> Index: library/util.tcl
> ===================================================================
> RCS file: /cvs/src/src/gdb/gdbtk/library/util.tcl,v
> retrieving revision 1.7
> diff -u -p -r1.7 util.tcl
> --- util.tcl    2001/06/11 23:08:05     1.7
> +++ util.tcl    2001/07/19 05:23:27
> @@ -237,7 +237,7 @@ proc find_iwidgets_library {} {
> 
>      set iwidgetsSrcDir [glob -nocomplain [file join \
>                                             [file dirname [file dirname $::tcl_library]] \
> -                                           itcl iwidgets*]]
> +                                           itcl iwidgets3*]]
> 
>      # Canonicalize the executable's directory name.  It turns out that on
> Solaris,
>      # info nameofexecutable returns /foo/bar/real_dir/./gdb when gdb is
> launched from
> @@ -258,7 +258,7 @@ proc find_iwidgets_library {} {
> 
>      set iwidgetsBuildDir [glob -nocomplain [file join \
>                                               [file dirname $exec_name] \
> -                                             itcl iwidgets*]]
> +                                             itcl iwidgets3*]]
>      set initFile [file join [lindex $iwidgetsBuildDir 0] \
>                     unix iwidgets.tcl]
> 
> @@ -267,7 +267,7 @@ proc find_iwidgets_library {} {
>        # Check in "normal" installed place: "../../share/iwidgets*"
>        set iwidgetsBuildDir [glob -nocomplain [file join \
>                                                 [file dirname [file dirname $exec_name]] \
> -                                               share iwidgets*]]
> +                                               share iwidgets3*]]
>        set initFile [file join [lindex $iwidgetsBuildDir 0] iwidgets.tcl]
>      }
> 
> `\x16Ý@\x10

-- 
Fernando Nasser
Red Hat Canada Ltd.                     E-Mail:  fnasser@redhat.com
2323 Yonge Street, Suite #300
Toronto, Ontario   M4P 2C9