Changeset 669

Timestamp:

Jun 30, 2012 8:37:47 PM (11 years ago)

Author:

toby

Message:

Revise GSAS-II Mac app to run in terminal

File:

• install/bootstrap.py (modified) (9 diffs)

install/bootstrap.py

@@ -2 +2 @@
 import os, stat, sys, platform, subprocess
 home = 'https://subversion.xor.aps.anl.gov/pyGSAS/'
+print 70*'*'
+print 'Checking python packages...',
+missing = []
+for pkg in ['numpy','scipy','matplotlib','wx']:
+    try:
+        exec('import '+pkg)
+    except:
+        missing.append(pkg)
 
-print sys.argv
+if missing:
+    print """Sorry, this version of Python cannot be used
+for GSAS-II. It is missing the following package(s):
+\t""",
+    for pkg in missing: print " ",pkg,
+    print 
+    print "We suggest installing the EPDfree package at\nhttp://www.enthought.com/products/epd_free.php/"
+    sys.exit()
+
 gsaspath = os.path.split(sys.argv[0])[0]
 gsaspath = os.path.abspath(os.path.expanduser(gsaspath))
@@ -17 +33 @@
 print 'OK'
 
-print 'GSAS-II is being bootstrapped from repository\n',home,'\nto '+gsaspath
+print 'GSAS-II is being bootstrapped from repository\n\t',home,'\nto '+gsaspath
 
 print 'Determining system type...',
@@ -56 +72 @@
     script = '''
 (*   GSAS-II AppleScript by B. Toby (brian.toby@anl.gov)
-         It can launch GSAS-II by double clicking or by dropping a data file or folder over that app.
-         thanks to F. Farges; farges@univ-mlv.fr for showing me how to do much of this
+         It can launch GSAS-II by double clicking or by dropping a data file
+         or folder over the app.
+         It runs GSAS-II in a terminal window.
+         
+         Thanks to F. Farges (farges@univ-mlv.fr) for many applescript tricks
 *)
 
@@ -77 +96 @@
                 if (file appwithpath exists) then
                 else
-                        display dialog "Error: file " & appwithpath & " not found. This AppleScript must be run from a directory containing the GSAS-II executable. Did you move it?" with icon caution buttons {"Quit"}
+                        display dialog "Error: file " & appwithpath & " not found. This AppleScript must be run from a directory containing the GSAS-II python code. Did you move it?" with icon caution buttons {"Quit"}
                         return
                 end if
@@ -92 +111 @@
 *)
 on run
-        set python to "%s"
+        set python to "/Library/Frameworks/Python.framework/Versions/7.1/Resources/Python.app/Contents/MacOS/Python"
         set myPath to (path to me)
         set ParentPath to GetParentPath(myPath)
@@ -98 +117 @@
         TestFilePresent(appwithpath)
         set posixapp to quoted form of the POSIX path of appwithpath
-        set results to do shell script python & " " & posixapp & " > ~/GSASIIerrors 2>&1  &"
+        tell application "Terminal"
+                activate
+                do script python & " " & posixapp & "; exit"
+        end tell
 end run
 
@@ -115 +137 @@
 on open names
         
-        set python to "%s"
+        set python to "/Library/Frameworks/Python.framework/Versions/7.1/Resources/Python.app/Contents/MacOS/Python"
         set myPath to (path to me)
         set ParentPath to GetParentPath(myPath)
@@ -127 +149 @@
                         set myfile to choose file default location filename with prompt "Select a GSAS-II input file" multiple selections allowed no
                         set myfile to the quoted form of the POSIX path of myfile
-                        set results to do shell script python & " " & posixapp & " " & myfile & " > ~/GSASIIerrors 2>&1  &"
+                        tell application "Terminal"
+                                activate
+                                do script python & " " & posixapp & " " & myfile & "; exit"
+                        end tell
                 else
                         (* if this is an input file, open it *)
                         set filename to the quoted form of the POSIX path of filename
-                        set results to do shell script python & " " & posixapp & " " & filename & " > ~/GSASIIerrors 2>&1  &"
+                        tell application "Terminal"
+                                activate
+                                do script python & " " & posixapp & " " & filename & "; exit"
+                        end tell
                 end if
         end repeat
@@ -142 +170 @@
     p.communicate()
     if os.path.exists('GSAS2.rsrc'):
-        print "Note: ignore the -d warning from osacompile"
+        print "Note: ignore the previous -d warning from osacompile"
         p = subprocess.call(['/Developer/Tools/Rez','-append','GSAS2.rsrc','-o',app + "/Icon\r"])
         p = subprocess.call(['/Developer/Tools/SetFile','-a','C',app])