Changeset 5133

Timestamp:

Mar 7, 2008, 11:40:27 AM (17 years ago)

Author:

jack

Message:

Removed some dead code. Fixed the search for python dll on windows platforms.

File:

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

anuga_core/source/anuga/utilities/compile.py

@@ -132 +132 @@
     libext = 'dll'
 
-    v = version.replace('.','')
-    dllfilename = 'python%s.dll' %(v)
-    #libs = os.path.join(sys.exec_prefix,dllfilename)
     libs, is_found = set_python_dll_path()
       
@@ -356 +353 @@
 
 def set_python_dll_path():
-  """ Find which of the two usual hiding places the python dll is located.
+  """ On windows, find which of the two usual hiding places the python
+  dll is located.
 
   If the file can't be found, return None.
@@ -370 +368 @@
   is_found = True   
   if access(libs,F_OK) == 0 :
-    # Hacky - fix if you want
-    libs = os.path.join('c:'+os.sep+'WINNT'+os.sep+'system32',dllfilename)
+    # Sometimes python dll is hidden in %WINDIR%/system32
+    libs = os.path.join(os.environ.get('WINDIR', 'C:\WINNT'), 'system32',
+                        dllfilename)
     if access(libs,F_OK) == 0 :
       # could not find the dll