Changeset 810

Timestamp:

Dec 4, 2009 5:12:26 PM (14 years ago)

Author:

toby

Message:

# on 2004/09/28 22:34:07, toby did:
use WINUTILS if present in place of WINEXEC
on Mac use Rez & SetFile? from dist, when not installed

File:

• trunk/gsascmds.tcl (modified) (5 diffs, 3 props)

trunk/gsascmds.tcl

@@ -2435 +2435 @@
             return
         }
-        # pause is hard coded in the .BAT file
+        if {[info command winutils::shell] == "" && \
+                [info command winexec] == ""} {
+            MyMessageBox -parent . -title "Setup error" \
+                -message {Error -- Use "Neither WINEXEC not WINTILS were found. Can't do anything!"} \
+                -icon error -type darn -default darn \
+                -helplink "expgui_Win_readme.html Winexec"
+            return
+        }
+        # N. B. pause is now hard coded in the .BAT file
         #
         # loop over multiple commands
@@ -2466 +2474 @@
             # replace the forward slashes with backward
             regsub -all / $cmd \\ cmd
-            winexec -d [file nativename [pwd]] \
+            if {[info command winutils::shell] != ""} {
+                winutils::shell [file join $expgui(scriptdir) gsastcl.bat] $cmd
+            } else {
+                winexec -d [file nativename [pwd]] \
                     [file join $expgui(scriptdir) gsastcl.bat] $cmd
+            }
             if {$wait} {
                 tkwait window .lock
@@ -2580 +2592 @@
     # required tool (Rez) are installed
     set app [file join $expgui(gsasdir) expgui.app]
-    if {[file exists $app] && [file exists /Developer/Tools/Rez]} {
+    if {[file exists /Developer/Tools/Rez]} {
+        set RezApp /Developer/Tools/Rez
+    } elseif {[file exists [file join $expgui(gsasdir) Rez]]} {
+        set RezApp [file join $expgui(gsasdir) Rez]
+    } else {
+        set RezApp {}
+    }
+    if {[file exists /Developer/Tools/SetFile]} {
+        set SetFileApp /Developer/Tools/SetFile
+    } elseif {[file exists [file join $expgui(gsasdir) SetFile]]} {
+        set SetFileApp [file join $expgui(gsasdir) SetFile]
+    } else {
+        set SetFileApp {}
+    }
+    if {[file exists $app] && $RezApp != ""} {
         # make a resource file
         set l [string length $app]; incr l
@@ -2594 +2620 @@
         puts $fp $str
         close $fp
-        exec /Developer/Tools/Rez setapp.r -o $expnative -a
+        exec $RezApp setapp.r -o $expnative -a
         file delete -force setapp.r
     }
@@ -2600 +2626 @@
     # assign an icon to the data file, if it and the required tools exist
     set icon [file join $expgui(gsasdir) gsasicon.r]
-    if {[file exists $icon] && [file exists /Developer/Tools/Rez] && \
-            [file exists /Developer/Tools/SetFile]} {
-        exec /Developer/Tools/Rez [file nativename $icon] -o $expnative -a
-        exec /Developer/Tools/SetFile -a C $expnative
-    }
-}
+    if {[file exists $icon] && $RezApp != "" && $SetFileApp != ""} {
+        exec $RezApp [file nativename $icon] -o $expnative -a
+        exec $SetFileApp -a C $expnative
+    }
+}