Skip to content
Snippets Groups Projects
Commit e3571907 authored by Edward Brash's avatar Edward Brash
Browse files

Set indentation in SCons* scripts to four spaces (and remove tab characters)

parent 7e824eab
No related branches found
No related tags found
No related merge requests found
...@@ -56,32 +56,32 @@ baseenv.Append(BUILDERS = {'RootCint': bld}) ...@@ -56,32 +56,32 @@ baseenv.Append(BUILDERS = {'RootCint': bld})
proceed = "1" or "y" or "yes" or "Yes" or "Y" proceed = "1" or "y" or "yes" or "Yes" or "Y"
if baseenv.subst('$CPPCHECK')==proceed: if baseenv.subst('$CPPCHECK')==proceed:
is_cppcheck = which('cppcheck') is_cppcheck = which('cppcheck')
print ("Path to cppcheck is %s\n" % is_cppcheck) print ("Path to cppcheck is %s\n" % is_cppcheck)
if(is_cppcheck == None): if(is_cppcheck == None):
print('!!! cppcheck not found on this system. Check if cppcheck is installed and in your PATH.') print('!!! cppcheck not found on this system. Check if cppcheck is installed and in your PATH.')
Exit(1) Exit(1)
else: else:
cppcheck_command = baseenv.Command('cppcheck_report.txt',[],"cppcheck --quiet --enable=all src/ 2> $TARGET") cppcheck_command = baseenv.Command('cppcheck_report.txt',[],"cppcheck --quiet --enable=all src/ 2> $TARGET")
baseenv.AlwaysBuild(cppcheck_command) baseenv.AlwaysBuild(cppcheck_command)
######## Configure Section ####### ######## Configure Section #######
if not (baseenv.GetOption('clean') or baseenv.GetOption('help')): if not (baseenv.GetOption('clean') or baseenv.GetOption('help')):
configure.config(baseenv,ARGUMENTS) configure.config(baseenv,ARGUMENTS)
conf = Configure(baseenv) conf = Configure(baseenv)
if not conf.CheckCXX(): if not conf.CheckCXX():
print('!!! Your compiler and/or environment is not correctly configured.') print('!!! Your compiler and/or environment is not correctly configured.')
Exit(1) Exit(1)
# if not conf.CheckFunc('printf'): # if not conf.CheckFunc('printf'):
# print('!!! Your compiler and/or environment is not correctly configured.') # print('!!! Your compiler and/or environment is not correctly configured.')
# Exit(1) # Exit(1)
if conf.CheckCXXHeader('sstream'): if conf.CheckCXXHeader('sstream'):
conf.env.Append(CPPDEFINES = 'HAS_SSTREAM') conf.env.Append(CPPDEFINES = 'HAS_SSTREAM')
baseenv = conf.Finish() baseenv = conf.Finish()
Export('baseenv') Export('baseenv')
...@@ -109,10 +109,10 @@ baseenv.Prepend(LIBS=[hallalib,dclib,eviolib]) ...@@ -109,10 +109,10 @@ baseenv.Prepend(LIBS=[hallalib,dclib,eviolib])
Export('pbaseenv') Export('pbaseenv')
if pbaseenv['CXX'] == 'g++': if pbaseenv['CXX'] == 'g++':
gxxVersion = [int(i) for i in pbaseenv['CXXVERSION'].split('.')] gxxVersion = [int(i) for i in pbaseenv['CXXVERSION'].split('.')]
if (gxxVersion[0] < 4) or (gxxVersion[0] == 4 and gxxVersion[1] < 4): if (gxxVersion[0] < 4) or (gxxVersion[0] == 4 and gxxVersion[1] < 4):
print('Error: g++ version too old! Need at least g++ 4.4!') print('Error: g++ version too old! Need at least g++ 4.4!')
Exit(1) Exit(1)
##directorylist = ['./','src','podd','podd/src','podd/hana_decode'] ##directorylist = ['./','src','podd','podd/src','podd/hana_decode']
##SConscript('podd/SConstruct') ##SConscript('podd/SConstruct')
...@@ -124,11 +124,11 @@ else: ...@@ -124,11 +124,11 @@ else:
subprocess.call(['echo', '!!!!!! Building Podd !!!!!! ']) subprocess.call(['echo', '!!!!!! Building Podd !!!!!! '])
podd_command_scons = "cd %s; scons" % baseenv.subst('$HA_DIR') podd_command_scons = "cd %s; scons" % baseenv.subst('$HA_DIR')
if baseenv.GetOption('num_jobs'): if baseenv.GetOption('num_jobs'):
podd_command_scons += " -j%s" % (GetOption('num_jobs')) podd_command_scons += " -j%s" % (GetOption('num_jobs'))
if baseenv.GetOption('silent'): if baseenv.GetOption('silent'):
podd_command_scons += " -s" podd_command_scons += " -s"
for key,value in ARGLIST: for key,value in ARGLIST:
podd_command_scons += " %s=%s" % (key,value) podd_command_scons += " %s=%s" % (key,value)
print ("podd_command_scons = %s" % podd_command_scons) print ("podd_command_scons = %s" % podd_command_scons)
......
...@@ -24,9 +24,9 @@ localmajorcleantarget = '../'+linkbase+'.so' ...@@ -24,9 +24,9 @@ localmajorcleantarget = '../'+linkbase+'.so'
print('cleantarget = %s\n' % cleantarget) print('cleantarget = %s\n' % cleantarget)
print('localmajorcleantarget = %s\n' % localmajorcleantarget) print('localmajorcleantarget = %s\n' % localmajorcleantarget)
try: try:
os.symlink(cleantarget,localmajorcleantarget) os.symlink(cleantarget,localmajorcleantarget)
except: except:
print (" Continuing ... ") print (" Continuing ... ")
Clean(srclib,cleantarget) Clean(srclib,cleantarget)
Clean(srclib,localmajorcleantarget) Clean(srclib,localmajorcleantarget)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment