[cig-commits] commit: Fixing some more minor issues.

[Mercurial]

changeset:   51:8a40e35540f4
user:        LukeHodkinson
date:        Fri Mar 14 01:17:43 2008 +0000
files:       SConstruct StgSCons config/SConfig/SConscript
description:
Fixing some more minor issues.


diff -r 3a804b81d576 -r 8a40e35540f4 SConstruct
--- a/SConstruct	Thu Mar 13 06:32:20 2008 +0000
+++ b/SConstruct	Fri Mar 14 01:17:43 2008 +0000
@@ -60,6 +60,6 @@ else:
     env.Prepend(LIBS='PICellerator')
     SConscript('Underworld/SConscript', exports='env')
     env.Prepend(LIBS='Underworld')
-    SConscript('Underworld/Magma', exports='env')
+    SConscript('Magma/SConscript', exports='env')
     if env['with_glucifer']:
         SConscript('gLucifer/SConscript', exports='env')
diff -r 3a804b81d576 -r 8a40e35540f4 StgSCons
--- a/StgSCons	Thu Mar 13 06:32:20 2008 +0000
+++ b/StgSCons	Fri Mar 14 01:17:43 2008 +0000
@@ -146,7 +146,7 @@ def build_metadata(env, files, hpath):
     for m in files:
         tgt = get_target_name(env, m, '.meta')
         src = env.Meta(target=tgt, source=m)
-        tgt = src[0].path[:-2]
+        tgt = '#' + src[0].path[:-2]
         cur_node = env.hbuild(env.SharedObject, hpath,
                               target=tgt, source=src)
         nodes.append(cur_node)
diff -r 3a804b81d576 -r 8a40e35540f4 config/SConfig/SConscript
--- a/config/SConfig/SConscript	Thu Mar 13 06:32:20 2008 +0000
+++ b/config/SConfig/SConscript	Fri Mar 14 01:17:43 2008 +0000
@@ -57,6 +57,11 @@ def configure_packages(env, options=None
 def configure_packages(env, options=None, output='config.cfg'):
     sconf = Configure(env, custom_tests={'CheckPackages': CheckPackages})
 
+    # Get rid of the temporary directory to make sure we're building
+    # from scratch.
+    if os.path.exists('.sconsign.dblite'):
+        os.remove('.sconsign.dblite')
+
     # Add dependencies needed for shared libraries.
     for pkg in env.package_list:
         if pkg.require_shared: