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

Minor updates

parent 82323134
Branches
Tags
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 12 additions and 13 deletions
SConstruct.py
+ 12
− 13
View file @ 19e4debc
...@@ -30,25 +30,19 @@ baseenv = Environment(ENV = os.environ) ...@@ -30,25 +30,19 @@ baseenv = Environment(ENV = os.environ)
# print "Construction variable = '%s', value = '%s'" % (key, dict[key]) # print "Construction variable = '%s', value = '%s'" % (key, dict[key])
####### Check SCons version ################## ####### Check SCons version ##################
#print('!!! You should be using the local version of SCons, invoked with:')
#print('!!! ./podd/scons/scons.py')
print('!!! Building the Hall C analyzer and libraries with SCons requires') print('!!! Building the Hall C analyzer and libraries with SCons requires')
print('!!! SCons version 2.1.0 or newer.') print('!!! SCons version 2.1.0 or newer.')
EnsureSConsVersion(2,1,0) EnsureSConsVersion(2,1,0)
####### Hall A Build Environment ############# ####### Hall A Build Environment #############
# #
# Edit for the location of your root installation here ... baseenv.Append(MAIN_DIR= Dir('.').abspath)
# baseenv.Append(HC_DIR= baseenv.subst('$MAIN_DIR'))
#baseenv.Append(ROOTSYS = '/usr/local/root') baseenv.Append(HC_SRC= baseenv.subst('$HC_DIR')+'/src ')
# baseenv.Append(HA_DIR= baseenv.subst('$HC_DIR')+'/podd ')
baseenv.Append(MAIN_DIR = Dir('.').abspath) baseenv.Append(HA_SRC= baseenv.subst('$HA_DIR')+'/src ')
baseenv.Append(HC_DIR = baseenv.subst('$MAIN_DIR')) baseenv.Append(HA_DC= baseenv.subst('$HA_DIR')+'/hana_decode ')
baseenv.Append(HC_SRC = baseenv.subst('$HC_DIR')+'/src ') baseenv.Append(HA_SCALER= baseenv.subst('$HA_DIR')+'/hana_scaler ')
baseenv.Append(HA_DIR = baseenv.subst('$HC_DIR')+'/podd ')
baseenv.Append(HA_SRC = baseenv.subst('$HA_DIR')+'/src ')
baseenv.Append(HA_DC = baseenv.subst('$HA_DIR')+'/hana_decode ')
baseenv.Append(HA_SCALER = baseenv.subst('$HA_DIR')+'/hana_scaler ')
baseenv.Append(MAJORVERSION = '1') baseenv.Append(MAJORVERSION = '1')
baseenv.Append(MINORVERSION = '5') baseenv.Append(MINORVERSION = '5')
baseenv.Append(PATCH = '25') baseenv.Append(PATCH = '25')
...@@ -163,6 +157,11 @@ pbaseenv.Append(LIBS=[hallclib,hallalib,dclib,scalerlib]) ...@@ -163,6 +157,11 @@ pbaseenv.Append(LIBS=[hallclib,hallalib,dclib,scalerlib])
baseenv.Append(LIBS=[hallalib,dclib,scalerlib]) baseenv.Append(LIBS=[hallalib,dclib,scalerlib])
Export('pbaseenv') Export('pbaseenv')
#SConscript('podd/SConscript.py',exports='baseenv')
#SConscript('podd/hana_scaler/SConscript.py',exports='baseenv')
#SConscript('podd/hana_decode/SConscript.py',exports='baseenv')
#SConscript('src/SConscript.py',exports='baseenv')
#SConscript('./SConscript.py',exports='baseenv')
SConscript(dirs = directorylist,name='SConscript.py',exports='baseenv') SConscript(dirs = directorylist,name='SConscript.py',exports='baseenv')
####### End of SConstruct ######### ####### End of SConstruct #########
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment