Changeset 983

Timestamp:

Jul 7, 2013 10:03:10 AM (10 years ago)

Author:

toby

Message:

new Mac app

File:

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

install/bootstrap.py

@@ -17 +17 @@
     for pkg in missing: print " ",pkg,
     print 
-    print "We suggest installing the EPDfree package at\nhttp://www.enthought.com/products/epd_free.php/"
+    print "We suggest installing the Canopy Express package (must be 32 bit) at\nhttp://www.enthought.com/store"
     sys.exit()
 
@@ -74 +74 @@
 #===========================================================================
 # on a Mac, make an applescript 
-if sys.platform.startswith('darwin'):
-    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 the app.
-         It runs GSAS-II in a terminal window.
-         
-         Thanks to F. Farges (farges@univ-mlv.fr) for many applescript tricks
-*)
-
-
-(*
---------------------------------------------
-Define subroutines used in later sections of code
---------------------------------------------
-*)
-
-(*  get  directory  from a file name *)
-on GetParentPath(theFile)
-        tell application "Finder" to return container of theFile as text
-end GetParentPath
-
-(* test if a file is present and exit with an error message if it is not  *)
-on TestFilePresent(appwithpath)
-        tell application "System Events"
-                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 python code. Did you move it?" with icon caution buttons {"Quit"}
-                        return
-                end if
-        end tell
-end TestFilePresent
-
-(* 
---------------------------------------------------------------
-this section responds to a double-click. No file is supplied to GSAS-II
- o  First find the location of the script
- o  then convert the colon-delimited macintosh file location to a POSIX filename
- o  start the app with no file as argument -- opens last file or none (depending on GSAS-II preferences)
--------------------------------------------------------------- 
-*)
-on run
-        set python to "%s"
-        set myPath to (path to me)
-        set ParentPath to GetParentPath(myPath)
-        set appwithpath to ParentPath & "GSASII.py"
-        TestFilePresent(appwithpath)
-        set posixapp to quoted form of the POSIX path of appwithpath
-        tell application "Terminal"
-                activate
-                do script python & " " & posixapp & "; exit"
-        end tell
-end run
-
-(*
-----------------------------------------------------------------------
-this section handles opening files dragged into the AppleScript
- o it finds the location of the current script and finds the GSAS-II
-     executable relative to the applescript
- o it goes through the list of files dragged in
- o then it converts the colon-delimited macintosh file location to a POSIX filename
- o for every non-directory file dragged into the icon, it tries to pass that file  to GSAS-II
- o for directories select a file from the directory
------------------------------------------------------------------------
-*)
-
-on open names
-        
-        set python to "%s"
-        set myPath to (path to me)
-        set ParentPath to GetParentPath(myPath)
-        set appwithpath to ParentPath & "GSASII.py"
-        TestFilePresent(appwithpath)
-        set posixapp to the quoted form of the POSIX path of appwithpath
-        set filePath to ""
-        repeat with filename in names
-                set filestr to (filename as string)
-                if filestr ends with ":" then
-                        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
-                        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
-                        tell application "Terminal"
-                                activate
-                                do script python & " " & posixapp & " " & filename & "; exit"
-                        end tell
-                end if
-        end repeat
-end open
-'''
-    app = os.path.join(gsaspath, 'GSASII.app')
-    p = subprocess.Popen(['/usr/bin/osacompile','-o',app],stdin=subprocess.PIPE)
-    p.stdin.write(script % (sys.executable,sys.executable) )
-    p.stdin.close()
-    p.communicate()
-    if os.path.exists('GSAS2.rsrc'):
-        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])
-
+if sys.platform.startswith('darwin') and os.path.exists(
+    os.path.join(gsaspath,"makeMacApp.py")):
+    execfile(os.path.join(gsaspath,"makeMacApp.py"))
 #===========================================================================
 # On linux, make desktop icon