From aa8bcd15ec1ba916f3e750f41697a65e06b3c2ac Mon Sep 17 00:00:00 2001 From: Jason Power Date: Wed, 12 Sep 2012 14:52:04 -0500 Subject: Ruby: Modify Scons so that we can put .sm files in extras Also allows for header files which are required in slicc generated code to be in a directory other than src/mem/ruby/slicc_interface. --- src/mem/protocol/SConsopts | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'src/mem/protocol/SConsopts') diff --git a/src/mem/protocol/SConsopts b/src/mem/protocol/SConsopts index 78b93c40e..95b043bc5 100644 --- a/src/mem/protocol/SConsopts +++ b/src/mem/protocol/SConsopts @@ -32,7 +32,7 @@ import os Import('*') -all_protocols = [ +all_protocols.extend([ 'MESI_CMP_directory', 'MI_example', 'MOESI_CMP_directory', @@ -40,13 +40,14 @@ all_protocols = [ 'MOESI_hammer', 'Network_test', 'None' - ] - -opt = EnumVariable('PROTOCOL', 'Coherence protocol for Ruby', 'None', - all_protocols) - -sticky_vars.AddVariables(opt) -export_vars += ['PROTOCOL'] + ]) opt = BoolVariable('SLICC_HTML', 'Create HTML files', False) sticky_vars.AddVariables(opt) + +protocol_dirs.append(Dir('.').abspath) + +protocol_base = Dir('.') +Export('protocol_base') + +slicc_includes.append('mem/ruby/slicc_interface/RubySlicc_includes.hh') -- cgit v1.2.3