From c1c96f8fc41002ad907c345c84c51af9184cd323 Mon Sep 17 00:00:00 2001
From: Edward Brash <brash@jlab.org>
Date: Fri, 4 Nov 2016 00:05:05 -0400
Subject: [PATCH] Update SConstruct to call the Podd SConstruct directly
---
SConstruct | 21 +++++++++++++++++----
1 file changed, 17 insertions(+), 4 deletions(-)
diff --git a/SConstruct b/SConstruct
index 2a0b29b..dc2690f 100644
--- a/SConstruct
+++ b/SConstruct
@@ -38,10 +38,11 @@ EnsureSConsVersion(2,1,0)
####### Hall A Build Environment #############
#
-baseenv.Append(MAIN_DIR= Dir('.').abspath)
-baseenv.Append(HC_DIR= baseenv.subst('$MAIN_DIR'))
+baseenv.Append(HEAD_DIR= Dir('.').abspath)
+baseenv.Append(HC_DIR= baseenv.subst('$HEAD_DIR'))
baseenv.Append(HC_SRC= baseenv.subst('$HC_DIR')+'/src ')
baseenv.Append(HA_DIR= baseenv.subst('$HC_DIR')+'/podd ')
+baseenv.Append(MAIN_DIR= baseenv.subst('$HEAD_DIR'))
baseenv.Append(HA_SRC= baseenv.subst('$HA_DIR')+'/src ')
baseenv.Append(HA_DC= baseenv.subst('$HA_DIR')+'/hana_decode ')
baseenv.Append(MAJORVERSION = '1')
@@ -212,8 +213,6 @@ baseenv.Append(LIBPATH=['$HC_DIR','$EVIO_LIB','$HA_DIR','$HC_SRC','$HA_SRC','$HA
baseenv.Replace(SHLIBSUFFIX = '.so')
baseenv.Append(CPPDEFINES = '-DHALLC_MODS')
-directorylist = ['./','src','podd','podd/src','podd/hana_decode']
-
baseenv.Append(SHLIBSUFFIX ='.'+baseenv.subst('$VERSION'))
pbaseenv=baseenv.Clone()
pbaseenv.Prepend(LIBS=[hallclib,hallalib,dclib,eviolib])
@@ -232,6 +231,20 @@ if pbaseenv['CXX'] == 'g++':
if '-std=c++11' not in pbaseenv['CXXFLAGS']:
pbaseenv.Append(CXXFLAGS='-std=c++11')
+##directorylist = ['./','src','podd','podd/src','podd/hana_decode']
+##SConscript('podd/SConstruct')
+
+if baseenv.GetOption('clean'):
+ subprocess.call(['echo', '!!!!!! Cleaning Podd Directory !!!!!! '])
+ podd_command_scons = "cd %s; scons -c" % baseenv.subst('$HA_DIR')
+else:
+ subprocess.call(['echo', '!!!!!! Building Podd !!!!!! '])
+ podd_command_scons = "cd %s; scons" % baseenv.subst('$HA_DIR')
+
+print "podd_command_scons = %s" % podd_command_scons
+os.system(podd_command_scons)
+
+directorylist = ['./','src']
SConscript(dirs = directorylist,name='SConscript.py',exports='baseenv')
####### End of SConstruct #########
--
GitLab