Changeset 5379 for trunk/fsource/SConstruct

Timestamp:

Nov 19, 2022 5:59:24 PM (7 months ago)

Author:

toby

Message:

reorg scons build: testing done (I hope)

File:

• trunk/fsource/SConstruct (modified) (3 diffs)

trunk/fsource/SConstruct

@@ -374 +374 @@
     #exe = os.path.splitext(str(source[0]))[0] + EXEsuffix
     exe = target
-#    cmd = FCompiler + ' $SOURCE ' + NISTlib[0] + ' -o ' + exe
-    cmd = FCompiler + ' $SOURCE ' + NISTlib[0] + ' -o $TARGET ;env'
+    cmd = os.path.join(FORTpath,FCompiler) + ' $SOURCE ' + NISTlib[0] + ' -o $TARGET'
     if sys.platform == "win32":
         installcmd = "copy $TARGET " + InstallLoc
@@ -454 +453 @@
 print("Setting environment variables:")
 # Setup build Environment
-#    add compiler, f2py & python to path
-#if pythonpath != "" and pythonpath != F2PYpath: env.PrependENVPath('PATH', pythonpath)
+#    add compiler, f2py & python locations to path
+if pythonpath != "" and pythonpath != F2PYpath: env.PrependENVPath('PATH', pythonpath)
 if F2PYpath != "":  env.PrependENVPath('PATH', F2PYpath)
 if FORTpath != "":  env.PrependENVPath('PATH', FORTpath)
@@ -475 +474 @@
 if not GetOption('no_exec'):
     fp = open(os.path.join(InstallLoc,'Build.notes.txt'),'w')
-    fp.write('Created {} on {}\n'.format(datetime.datetime.isoformat(datetime.datetime.now()),
-                                         platform.node()))
+    user = '?'
+    if 'USER' in os.environ:
+        user = os.environ.get('USER','?')
+    elif 'USERNAME' in os.environ:
+        user = os.environ.get('USERNAME','?')
+    fp.write('Created {} on {} by user "{}"\n\n'.format(datetime.datetime.isoformat(datetime.datetime.now()),
+                                         platform.node(),user))
+    try:
+        if sys.platform == "win32":
+            fp.write('Platform win32_ver: '+str(platform.win32_ver())+'\n')
+        elif sys.platform == "darwin":
+            fp.write('Platform mac_ver: {0:} on {2:}\n'.format(*platform.mac_ver()))
+        fp.write('Platform uname: '+str(list(platform.uname()))+'\n')
+    except:
+        pass
+    if 'BUILD_TAG' in os.environ:
+        fp.write('BUILD TAG: '+ os.environ['BUILD_TAG'] +'\n')
+    if 'CONDA_PREFIX' in os.environ:
+        fp.write('CONDA_PREFIX: '+ os.environ['CONDA_PREFIX'] +'\n')
+    
+    fp.write('\n\tPython: '+platform.python_version()+'\n')
+    try:
+        import numpy
+        fp.write('\tnumpy: '+numpy.__version__+'\n\n')
+    except:
+        pass
     for var in ['FCompiler','FORTpath','FORTflags','F2PYflags','F2PYpath','F2PYsuffix','LDFLAGS']:
         fp.write('\tVariable '+var+' = "'+eval(var)+'"\n')