Skip to content

Commit

Permalink
some cleaning based on andy's code review
Browse files Browse the repository at this point in the history
  • Loading branch information
erh committed Apr 18, 2012
1 parent 858acc6 commit 9185a4b
Showing 1 changed file with 6 additions and 8 deletions.
14 changes: 6 additions & 8 deletions SConstruct
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,6 @@
# This file, SConstruct, configures the build environment, and then delegates to
# several, subordinate SConscript files, which describe specific build rules.

import os

EnsureSConsVersion( 1, 1, 0 )
mysconsroot = ".scons/%s/%s" % ( os.uname()[0] , os.getenv( "HOST" , "nohost" ) )
SConsignFile( mysconsroot + "/sconsign" )

import buildscripts
import buildscripts.bb
import datetime
Expand All @@ -35,6 +29,10 @@ from buildscripts import utils

import libdeps

EnsureSConsVersion( 1, 1, 0 )
scons_data_dir = ".scons/%s/%s" % ( os.uname()[0] , os.getenv( "HOST" , "nohost" ) )
SConsignFile( scons_data_dir + "/sconsign" )

DEFAULT_INSTALL_DIR = "/usr/local"

def _rpartition(string, sep):
Expand Down Expand Up @@ -293,8 +291,8 @@ env = Environment( BUILD_DIR=variantDir,
PYSYSPLATFORM=os.sys.platform,

PCRE_VERSION='8.30',
CONFIGUREDIR = mysconsroot + '/sconf_temp',
CONFIGURELOG = mysconsroot + '/config.log'
CONFIGUREDIR = scons_data_dir + '/sconf_temp',
CONFIGURELOG = scons_data_dir + '/config.log'
)

if has_option('mute'):
Expand Down

0 comments on commit 9185a4b

Please sign in to comment.