[cig-commits] commit: Updating stgMagma.

[Mercurial]

changeset:   50:3a804b81d576
user:        LukeHodkinson
date:        Thu Mar 13 06:32:20 2008 +0000
files:       StgSCons config/SConfig/SConscript config/SConfig/packages/CompilerFlags.py
description:
Updating stgMagma.


diff -r 7e2b586b980b -r 3a804b81d576 StgSCons
--- a/StgSCons	Wed Mar 12 23:09:22 2008 +0000
+++ b/StgSCons	Thu Mar 13 06:32:20 2008 +0000
@@ -1,6 +1,5 @@ import os, glob as pyglob, platform, pic
 import os, glob as pyglob, platform, pickle
 from SCons.Script.SConscript import SConsEnvironment
-import SCons.Sig
 
 #
 # Setup some basic path utilities.
@@ -34,8 +33,8 @@ def copy_file(env, dst, src):
     old = os.getcwd()
     os.chdir(env.GetLaunchDir())
     src = env.norm_path(src)
-    src_sig = SCons.Sig.MD5.signature(File(os.path.abspath(src)))
-    dst_sig = SCons.Sig.MD5.signature(File(os.path.abspath(dst)))
+    src_sig = File(os.path.abspath(src)).get_csig()
+    dst_sig = File(os.path.abspath(dst)).get_csig()
     if not os.path.exists(os.path.abspath(dst)) or src_sig != dst_sig:
         dst_dir = os.path.dirname(dst)
         if not os.path.exists(dst_dir):
diff -r 7e2b586b980b -r 3a804b81d576 config/SConfig/SConscript
--- a/config/SConfig/SConscript	Wed Mar 12 23:09:22 2008 +0000
+++ b/config/SConfig/SConscript	Thu Mar 13 06:32:20 2008 +0000
@@ -36,10 +36,11 @@ def save_config(env, filename, vars):
 
 def load_config(env, filename):
     if not os.path.exists(filename):
-        print "\nError: project hasn't been configured!\n"
-        print '************************************************'
-        print "* Run 'scons config' to configure the project. *"
-        print '************************************************\n'
+        print "\nError: project hasn't been configured!"
+        print '*******************************************************'
+        print "* Run 'scons config' to configure the project.        *"
+        print "* Run 'scons help' to see what options are available. *"
+        print '*******************************************************'
         env.Exit()
     f = file(filename, 'r')
     import pickle
@@ -83,6 +84,11 @@ def configure_packages(env, options=None
         vars += options.keys()
     env.save_config(output, vars)
 
+    # Print out build message.
+    print '\n*****************************************'
+    print "* Now run 'scons' to build the project. *"
+    print '*****************************************\n'
+
 SConsEnvironment.Package = Package
 SConsEnvironment.configure_packages = configure_packages
 SConsEnvironment.save_config = save_config
diff -r 7e2b586b980b -r 3a804b81d576 config/SConfig/packages/CompilerFlags.py
--- a/config/SConfig/packages/CompilerFlags.py	Wed Mar 12 23:09:22 2008 +0000
+++ b/config/SConfig/packages/CompilerFlags.py	Thu Mar 13 06:32:20 2008 +0000
@@ -57,6 +57,7 @@ class CompilerFlags(SConfig.Package):
         result = self.run_scons_cmd(self.ctx.TryCompile, '', '.c')
         self.pop_state(old)
         if result[0] and (result[1].find('not recognized') != -1 or
-                          result[1].find('not recognised') != -1):
+                          result[1].find('not recognised') != -1 or
+                          result[1].find('unknown option') != -1):
             result[0] = 0
         return [result[0], result[1], '']