Changeset 1003 for trunk/bindings/python

Timestamp:

01/07/08 16:58:29 (4 years ago)

Author:

Freddie Akeroyd

Message:

• On windows check for NEXUSDIR variable set by installer

Refs #101

File:

• trunk/bindings/python/nxs.py (modified) (2 diffs)

trunk/bindings/python/nxs.py

@@ -198 +198 @@
         files = []
 
+    # NEXUSDIR is set by the Windows installer for NeXus
+    if 'NEXUSDIR' in os.environ:
+        winnxdir = os.environ['NEXUSDIR']
+    else:
+        winnxdir =  'C:/Program Files/NeXus Data Format'
+
     # Default names and locations to look for the library are system dependent
     filedir = os.path.dirname(__file__)
@@ -203 +209 @@
         files += [filedir+"/libNeXus.dll",
                   filedir+"/libNeXus-0.dll",
-                  'C:/Program Files/NeXus Data Format/bin/libNeXus-0.dll']
+                  winnxdir + '/bin/libNeXus-0.dll']
     else:
         if sys.platform in ('darwin'):