From 6d687d7c0533e8de860ebfa80b18e85802dd9eb4 Mon Sep 17 00:00:00 2001 From: "mmoss@google.com" Date: Fri, 26 Sep 2008 20:19:40 +0000 Subject: "--clobber" should come before the build directory setup. Otherwise it deletes the build directory and db file which are needed by the rest of the build, causing the build to fail. Fixes error: scons: *** [Errno 2] No such file or directory: 'src/chrome/src/chrome/Hammer/.sconsign.dblite' Review URL: http://codereview.chromium.org/5010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2638 0039d316-1c4b-4281-b951-d872f2087c98 --- build/SConscript.main | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/build/SConscript.main b/build/SConscript.main index 80c1052..5a9f0a7 100644 --- a/build/SConscript.main +++ b/build/SConscript.main @@ -415,13 +415,6 @@ if ARGUMENTS.get('VERBOSE') in (None, '0'): env['BINDINGSCOMSTR'] = 'Building bindings in $TARGET ...' -# Place the .sconsign.dblite in the build directory. -target_dir = env.Dir('$TARGET_ROOT') -if not os.path.exists(target_dir.abspath): - Execute(Mkdir(target_dir)) -SConsignFile(target_dir.File('.sconsign').abspath) - - # Add --clobber (for the buildbot). # NOTE: seems to be crucial to do this before any builders are invoked. AddOption('--clobber', action='store_true', dest='clobber', default=False, @@ -429,6 +422,14 @@ AddOption('--clobber', action='store_true', dest='clobber', default=False, if GetOption('clobber'): shutil.rmtree(env.Dir('$TARGET_ROOT').abspath, True) + +# Place the .sconsign.dblite in the build directory. +target_dir = env.Dir('$TARGET_ROOT') +if not os.path.exists(target_dir.abspath): + Execute(Mkdir(target_dir)) +SConsignFile(target_dir.File('.sconsign').abspath) + + # Use timestamps change, followed by MD5 for speed env.Decider('MD5-timestamp') -- cgit v1.1