Changeset 4764

Timestamp:

Oct 29, 2007, 2:28:52 PM (16 years ago)

Author:

duncan

Message:

anuga can now use the python dll in C:\WINNT\system32

File:

• anuga_core/source/anuga/utilities/compile.py (modified) (3 diffs)

anuga_core/source/anuga/utilities/compile.py

@@ -129 +129 @@
     v = version.replace('.','')
     dllfilename = 'python%s.dll' %(v)
-    libs = os.path.join(sys.exec_prefix,dllfilename)
-
+    #libs = os.path.join(sys.exec_prefix,dllfilename)
+    libs, is_found = set_python_dll_path()
       
   else:
@@ -330 +330 @@
     return C
 
-def check_python_dll():
-  """ Check that the python dll is present
+def set_python_dll_path():
+  """ Find which of the two usual hiding places the python dll is located.
+
+  If the file can't be found, return None.
   """
   import sys
@@ -340 +342 @@
   dllfilename = 'python%s.dll' %(v)
   libs = os.path.join(sys.exec_prefix,dllfilename)
-  
+
+  is_found = True   
   if access(libs,F_OK) == 0 :
-    print "%s not present.\nPlease install.\nIt is available on the web." \
-          %(libs)
+    # Hacky - fix if you want
+    libs = os.path.join('c:'+os.sep+'WINNT'+os.sep+'system32',dllfilename)
+    if access(libs,F_OK) == 0 :
+      # could not find the dll
+      libs = os.path.join(sys.exec_prefix,dllfilename)
+      is_found = False
+  return libs, is_found
+
+def check_python_dll():
+  libs, is_found = set_python_dll_path()
+  if not is_found:
+    print "%s not found.\nPlease install.\nIt is available on the web." \
+              %(libs)
     import sys; sys.exit()
+    
       
 if __name__ == '__main__':
-
   from os.path import splitext
   check_python_dll()