Changeset 1357

Timestamp:

May 20, 2014 11:15:02 PM (10 years ago)

Author:

toby

Message:

more 64-bit stuff; fix OS X install

Location:

trunk

Files:

• fsource/SConstruct (modified) (1 diff)
• makeMacApp.py (modified) (3 diffs)

trunk/fsource/SConstruct

@@ -201 +201 @@
 if FCompiler == 'gfortran':
     if FORTpath == "": FORTpath = GFORTpath
-    if F2PYflags == "": F2PYflags = '--fcompiler=gnu95 --f77exec=gfortran --f77flags="-fno-range-check"'
-#    if sys.platform == "linux2":
-#        if FORTflags == "": FORTflags = ' -w -O2 -fPIC'
     if sys.platform == "linux2" and PlatformBits == '64bit':
         if FORTflags == "": FORTflags = ' -w -O2 -fPIC -m64'
+        if F2PYflags == "": F2PYflags = '--fcompiler=gnu95 --f77exec=gfortran --f77flags="-fno-range-check -m64"'# --arch="-arch x86_64"'
     elif sys.platform == "linux2":
         if FORTflags == "": FORTflags = ' -w -O2 -fPIC -m32'
+        if F2PYflags == "": F2PYflags = '--fcompiler=gnu95 --f77exec=gfortran --f77flags="-fno-range-check -m32"'
+    elif sys.platform == "darwin" and PlatformBits == '64bit':
+        LDFLAGS += " -arch x86_64 -m64"
+        if FORTflags == "": FORTflags = ' -w -O2 -m64'
+        if F2PYflags == "": F2PYflags = '--fcompiler=gnu95 --f77exec=gfortran --f77flags="-fno-range-check -m64"'
+    elif sys.platform == "darwin":
+        if F2PYflags == "": F2PYflags = '--fcompiler=gnu95 --f77exec=gfortran --f77flags="-fno-range-check -m32"'
 elif FCompiler == 'g77':
     if FORTpath == "": FORTpath = G77path

trunk/makeMacApp.py

@@ -133 +133 @@
 
     # find the python application; must be an OS X app
-    pythonpath,top = os.path.split(os.path.realpath(sys.executable))
+    pythonpath = os.path.realpath(sys.executable)
+    top = True
     while top:
-        if 'Resources' in pythonpath:
-            pass
-        elif os.path.exists(os.path.join(pythonpath,'Resources')):
-            break
+        pythonapp = os.path.join(pythonpath,'Resources','Python.app','Contents','MacOS','Python')
+        if os.path.exists(pythonapp): break
         pythonpath,top = os.path.split(pythonpath)
-        pythonapp = os.path.join(pythonpath,'Resources','Python.app','Contents','MacOS','Python')
-        if not os.path.exists(pythonapp): 
-            print("\nSorry, failed to find a Python app in "+str(pythonapp))
-            pythonapp = sys.executable
     else:
         print("\nSorry, failed to find a Resources directory associated with "+str(sys.executable))
         pythonapp = sys.executable
-
+    
     # create a link to the python app, but named to match the project
     if os.path.exists('/tmp/testpython'): os.remove('/tmp/testpython')
@@ -156 +151 @@
     #print testout,errout
     if testout.strip() != "OK":
-        print 'Run of python app failed, assuming Canopy <=1.4'
+        print 'Run of python app failed, resorting to non-app version of Python, Alas!'
         pythonapp = sys.executable
-        # switch to pythonw
-        if os.path.split(pythonapp)[1].lower() == 'python':
-            pythonapp = os.path.join(os.path.split(pythonapp)[0],'pythonw')
+        # is this brain-dead Canopy 1.4.0, if so, switch to pythonw
+        try:
+            import canopy.version
+            if canopy.version.version == '1.4.0':
+                print 'using pythonw for Canopy 1.4.0'
+                pythonapp = os.path.join(os.path.split(pythonapp)[0],'pythonw')
+                if not os.path.exists(pythonapp):
+                    raise Exception('no pythonw here: '+pythonapp)
+        except ImportError:
+            pass
         newpython = pythonapp
     else:
@@ -166 +168 @@
         newpython =  os.path.join(apppath,"Contents","MacOS",project)
 
-    print sys.executable
-    print newpython
-    print pythonapp
-    #sys.exit()
-    
     if os.path.exists(apppath): # cleanup
         print("\nRemoving old "+project+" app ("+str(apppath)+")")