Changeset 13 for trunk/tcl

Timestamp:

Jun 8, 2005, 5:37:19 PM (19 years ago)

Author:

mmc

Message:

Many improvements, including a new energy level viewer
for Huckel-IV. Added support for a new <boolean> type.
Fixed the cloud/field stuff so that when a cloud is 1D,
it reverts to BLT vectors so it will plot correctly.
Fixed the install script to work better on Windows.

Location:

trunk/tcl

Files:

• install.tcl (moved) (moved from trunk/tcl/install) (7 diffs)
• scripts/library.tcl (modified) (2 diffs)

trunk/tcl/install.tcl

@@ -1 @@
-#!/bin/sh
 # ----------------------------------------------------------------------
-#  USAGE: tclsh install
+#  USAGE: tclsh install.tcl
 #
 #  Use this script to install the Rappture toolkit into an existing
@@ -9 +8 @@
 #  Copyright (c) 2004  Purdue Research Foundation, West Lafayette, IN
 # ======================================================================
-#\
-exec tclsh "$0" "$*"
-# ----------------------------------------------------------------------
-# tclsh executes everything from here on...
 
 # run this script from directory containing it
@@ -36 +31 @@
 }
 
+proc fixperms {target perms} {
+    global tcl_platform
+    if {$tcl_platform(platform) == "unix"} {
+        file attributes $target -permissions $perms
+    }
+}
+
 
 set dir [file dirname [info library]]
@@ -54 +56 @@
             puts "making directory $target..."
             catch {file mkdir $target}
-            file attributes $target -permissions ugo+rx
+            fixperms $target ugo+rx
         } else {
             puts "installing $target..."
             file copy -force $file $target
-            file attributes $target -permissions ugo+r
+            fixperms $target ugo+r
         }
     }
@@ -70 +72 @@
         puts "making directory $target..."
         catch {file mkdir $target}
-        file attributes $target -permissions ugo+rx
+        fixperms $target ugo+rx
     } else {
         puts "installing $target..."
         file copy -force $file $target
-        file attributes $target -permissions ugo+r
+        fixperms $target ugo+r
     }
 }
@@ -84 +86 @@
 puts $fid "package ifneeded $package $version \""
 puts $fid "  \[list lappend auto_path \[file join \$dir scripts\]\]"
-puts $fid "  namespace eval Rappture \[list variable installdir \$dir\]"
+puts $fid "  namespace eval \[list Rappture \[list variable installdir \$dir\]\]"
 puts $fid "  package provide $package $version"
 puts $fid "\""
@@ -91 +93 @@
 mkindex [file join $targetdir scripts]
 
-puts "== $package-$version INSTALLED"
+if {[catch {package require Tk}] == 0} {
+    wm withdraw .
+    tk_messageBox -icon info -message "$package-$version INSTALLED"
+} else {
+    puts "== $package-$version INSTALLED"
+}
+exit 0

trunk/tcl/scripts/library.tcl

@@ -123 +123 @@
         foreach cpath [$xmlobj children -as path $path] {
             switch -- [$xmlobj element -as type $cpath] {
-                group {
+                group - phase {
                     lappend queue $cpath
                 }
@@ -141 +141 @@
                     # if this element has embedded groups, add them to the queue
                     foreach ccpath [$xmlobj children -as path $cpath] {
-                        if {[$xmlobj element -as type $ccpath] == "group"} {
+                        set cctype [$xmlobj element -as type $ccpath]
+                        if {$cctype == "group" || $cctype == "phase"} {
                             lappend queue $ccpath
                         }