Bug #533899: gracefully handle unavailable 'comm' package

Bug #532905: fix the installer.

diff --git a/ChangeLog b/ChangeLog
index bf1b43c2e22584b794113f9846569fe7ddd4a0a5..095f44a67ea2a716f0f04f06bf995eea0eb783a8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Mar 24 23:50:29 2002  Pat Thoyts <patthoyts@users.sourceforge.net>
+       
+       * Bug #533899: gracefully handle unavailable 'comm' package
+       * Bug #532905: fix the installer.
+
 Fri Mar 22 15:53:54 2002  Pat Thoyts <patthoyts@users.sourceforge.net>
        
        * names.tcl: Bug #533642: send ::info in case info is redefined.

diff --git a/help.tcl b/help.tcl
index 626637598a91900d2db0fbcaf428db5c73960b15..5d292675c92f24f82859e599ad28bc73702613f2 100644 (file)
--- a/help.tcl
+++ b/help.tcl
@@ -75,7 +75,7 @@ dialog help_window {
        wm title $self "Help: $topic"
         set filename [file join $slot(helpdir) $topic]
         if {![file exist $filename]} {
-            append $filename .html
+            append filename .html
         }
        set f [open $filename r]
        set txt [read $f]

diff --git a/install.tcl b/install.tcl
index b24375a6a73a91a21a3c2f77b62e2315081ae341..e9a1f003790f1d1f0c677d32f9451fec38b5d898 100644 (file)
--- a/install.tcl
+++ b/install.tcl
@@ -49,7 +49,7 @@ widget install_dir {
            if {$ans == 1} {
                return 0
            }
-           if [catch {exec mkdir $dir} msg] {
+           if [catch {file mkdir $dir} msg] {
                tk_dialog .error "Error Making Directory" "Couldn't make directory $dir: $msg" error 0 "Ok"
                return 0
            }
@@ -83,11 +83,20 @@ text .instructions -relief ridge -bd 4 -width 20 -height 4 -wrap word \
 {Fill out the pathnames below and press the install button.  Any errors will appear in log window below.  If you wish to demo tkinspect w/o installing it, try "wish -f tkinspect.tcl".
 }
 pack .instructions -side top -fill both -expand 1
-set prefix /usr/local
-install_dir .prefix -label Prefix: -variable prefix
+
+switch -exact -- $tcl_platform(platform) {
+    unix { set prefix /usr/local }
+    windows -
+    macintosh { 
+        set prefix [eval file join [lrange \
+                [file split [info nameofexecutable]] 0 end-2]]
+    }
+}
 set bindir \$prefix/bin
-install_dir .bindir -label "Bin dir:" -variable bindir
 set libdir \$prefix/lib/tkinspect
+
+install_dir .prefix -label Prefix: -variable prefix
+install_dir .bindir -label "Bin dir:" -variable bindir
 install_dir .libdir -label "Library dir:" -variable libdir
 
 
@@ -112,32 +121,46 @@ proc log {msg} {
     update
 }
 
-foreach name {wish8.4 wish8.3 wish8.0 wish4.0 wish} {
-    log "Searching for $name..."
-    foreach dir [split $env(PATH) :] {
-       if [file executable $dir/$name] {
-           set wish $dir/$name
-           break
-       }
-    }
-    if ![info exists wish] {
-       log "not found!\n"
-       continue
-    }
-    break
-}
+set wish [info nameofexecutable]
+
+#foreach name {wish8.4 wish8.3 wish8.0 wish4.0 wish} {
+#    log "Searching for $name..."
+#    foreach dir [split $env(PATH) :] {
+#      if [file executable [file join $dir $name]] {
+#          set wish [file join $dir $name]
+#          break
+#      }
+#    }
+#    if ![info exists wish] {
+#      log "not found!\n"
+#      continue
+#    }
+#    break
+#}
 if [info exists wish] {
-    log "using $wish\n"    
+    log "using $wish\n"
 } else {
     set wish /usr/local/bin/wish8.3
-    log "Hmm, using $wish anways...\n"
+    log "Hmm, using $wish anyways...\n"
 }
 
 proc install_files {dir files} {
+    global tcl_platform
     foreach file $files {
        log "Copying $file to $dir..."
-       if {[catch {exec rm -f $dir/[file tail $file]}] || [catch {exec cp $file $dir} error] || [catch {exec chmod 0444 $dir/[file tail $file]} error]} {
-           log "whoops: $error, install aborted.\n"
+       if {[catch {
+            set dest [file join $dir [file tail $file]]
+            file copy -force $file $dest
+            switch -exact -- $tcl_platform(platform) {
+                unix { file attributes $dest -permissions 0444 }
+                windows -
+                macintosh { file attributes $dest -readonly 1 }
+                default { 
+                    error "platform $tcl_platform(platform) not recognised"
+                }
+            }
+        } errmsg]} {
+           log "whoops: $errmsg, install aborted.\n"
            return 0
        }
        log "ok.\n"
@@ -152,7 +175,7 @@ proc regsub_quote {string} {
 }
 
 proc install {} {
-    global prefix libdir bindir wish
+    global prefix libdir bindir wish tcl_platform
     foreach w {.prefix .bindir .libdir .wish} {
        log "Checking [$w cget -variable]..."
        if ![$w verify] {
@@ -161,9 +184,9 @@ proc install {} {
        }
        log "ok.\n"
     }
-    if ![file isdirectory $libdir/stl-lite] {
+    if ![file isdirectory [file join $libdir stl-lite]] {
        log "Making $libdir/stl-lite directory..."
-       if [catch {exec mkdir $libdir/stl-lite} error] {
+       if [catch {file mkdir [file join $libdir stl-lite]} error] {
            log "whoops: $error, install aborted.\n"
            return
        }
@@ -173,7 +196,7 @@ proc install {} {
        about.tcl defaults.tcl windows_info.tcl lists.tcl globals_list.tcl
        procs_list.tcl windows_list.tcl images_list.tcl menus_list.tcl
        canvas_list.tcl value.tcl stl.tcl sls.ppm version.tcl help.tcl
-       cmdline.tcl interface.tcl tclIndex
+       cmdline.tcl interface.tcl tclIndex ChangeLog
        names.tcl classes_list.tcl objects_list.tcl
        Intro.html Lists.html Procs.html Globals.html Windows.html
        Images.html Canvases.html Menus.html Classes.html
@@ -190,16 +213,22 @@ proc install {} {
     }
     log "Making tkinspect shell script..."
     if [catch {
-       exec rm -f $bindir/tkinspect
+        set progname tkinspect
+        if {$tcl_platform(platform) == "windows"} {
+            append progname .tcl
+        }
+        file delete -force [file join $bindir $progname]
        set fp [open tkinspect.tcl r]
        set text [read $fp]
        close $fp
        regsub -all @tkinspect_library@ $text [regsub_quote $libdir] text
        regsub -all @wish@ $text [regsub_quote $wish] text
-       set fp [open $bindir/tkinspect w]
+       set fp [open [file join $bindir $progname] w]
        puts $fp $text
        close $fp
-       exec chmod 0555 $bindir/tkinspect
+        if {$tcl_platform(platform) == "unix"} {
+            file attributes [file join $bindir $progname] -permissions 0555
+        }
     } error] {
        log "whoops: $error, install aborted.\n"
        return

diff --git a/tkinspect.tcl b/tkinspect.tcl
index d8a1487c19b4ce16a21889293febd5f25077ed8f..80d51e38d2e568f3d32e77dda79a101dd4b9bffa 100644 (file)
--- a/tkinspect.tcl
+++ b/tkinspect.tcl
@@ -122,10 +122,12 @@ dialog tkinspect_main {
        set m [menu $self.menu.file.m]
        $m add cascade -label "Select Interpreter (send)" -underline 0 \
            -menu $self.menu.file.m.interps
-       $m add cascade -label "Select Interpreter (comm)" -underline 21 \
-           -menu $self.menu.file.m.comminterps
-       $m add command -label "Connect to (comm)" -underline 0 \
-           -command "$self connect_dialog"  
+        if {[package provide comm] != {}} {
+            $m add cascade -label "Select Interpreter (comm)" -underline 21 \
+                    -menu $self.menu.file.m.comminterps
+            $m add command -label "Connect to (comm)" -underline 0 \
+                    -command "$self connect_dialog"  
+        }
        $m add command -label "Update Lists" -underline 0 \
            -command "$self update_lists"
        $m add separator
@@ -145,8 +147,10 @@ dialog tkinspect_main {
            -command tkinspect_exit
        menu $self.menu.file.m.interps -tearoff 0 \
            -postcommand "$self fill_interp_menu"
-       menu $self.menu.file.m.comminterps -tearoff 0 \
-           -postcommand "$self fill_comminterp_menu"
+       if {[package provide comm] != {}} {
+            menu $self.menu.file.m.comminterps -tearoff 0 \
+                    -postcommand "$self fill_comminterp_menu"
+        }
        menubutton $self.menu.help -menu $self.menu.help.m -text "Help" \
            -underline 0
        pack $self.menu.help -side right