BuildEnv: Eliminate RUBY as build environment variable

This patch replaces RUBY with PROTOCOL in all the SConscript files as
the environment variable that decides whether or not certain components
of the simulator are compiled.
This commit is contained in:
Nilay Vaish 2011-08-08 10:50:13 -05:00
parent 5c0e6e6092
commit 821dfc1289
24 changed files with 23 additions and 28 deletions

View file

@ -979,11 +979,6 @@ for variant_path in variant_paths:
if env['USE_SSE2']:
env.Append(CCFLAGS=['-msse2'])
if env['PROTOCOL'] != 'None':
env['RUBY'] = True
else:
env['RUBY'] = False
# The src/SConscript file sets up the build rules in 'env' according
# to the configured variables. It returns a list of environments,
# one for each variant build (debug, opt, etc.)

View file

@ -35,7 +35,7 @@ Import('*')
# When this dependency is removed, the ruby tester should be compiled
# independently from Ruby
#
if not env['RUBY']:
if env['PROTOCOL'] == 'None':
Return()
SimObject('RubyDirectedTester.py')

View file

@ -35,7 +35,7 @@ Import('*')
# When this dependency is removed, the ruby tester should be compiled
# independently from Ruby
#
if not env['RUBY']:
if env['PROTOCOL'] == 'None':
Return()
SimObject('RubyTester.py')

View file

@ -38,7 +38,7 @@ from SCons.Scanner import Classic
Import('*')
if not env['RUBY']:
if env['PROTOCOL'] == 'None':
Return()
protocol_dir = Dir('.')

View file

@ -40,7 +40,7 @@ Import('*')
if env['TARGET_ISA'] == 'no':
Return()
if not env['RUBY']:
if env['PROTOCOL'] == 'None':
Return()
def do_embed_text(target, source, env):

View file

@ -30,7 +30,7 @@
Import('*')
if not env['RUBY']:
if env['PROTOCOL'] == 'None':
Return()
Source('MessageBuffer.cc')

View file

@ -30,7 +30,7 @@
Import('*')
if not env['RUBY']:
if env['PROTOCOL'] == 'None':
Return()
Source('Address.cc')

View file

@ -30,7 +30,7 @@
Import('*')
if not env['RUBY']:
if env['PROTOCOL'] == 'None':
Return()
Source('RubyEventQueue.cc')

View file

@ -30,7 +30,7 @@
Import('*')
if not env['RUBY']:
if env['PROTOCOL'] == 'None':
Return()
Source('BlockBloomFilter.cc')

View file

@ -30,7 +30,7 @@
Import('*')
if not env['RUBY']:
if env['PROTOCOL'] == 'None':
Return()
SimObject('BasicLink.py')

View file

@ -30,7 +30,7 @@
Import('*')
if not env['RUBY']:
if env['PROTOCOL'] == 'None':
Return()
SimObject('BaseGarnetNetwork.py')

View file

@ -30,7 +30,7 @@
Import('*')
if not env['RUBY']:
if env['PROTOCOL'] == 'None':
Return()
SimObject('GarnetLink_d.py')

View file

@ -30,7 +30,7 @@
Import('*')
if not env['RUBY']:
if env['PROTOCOL'] == 'None':
Return()
SimObject('GarnetLink.py')

View file

@ -28,7 +28,7 @@
Import('*')
if not env['RUBY']:
if env['PROTOCOL'] == 'None':
Return()
Source('Arbiter.cc')

View file

@ -28,7 +28,7 @@
Import('*')
if not env['RUBY']:
if env['PROTOCOL'] == 'None':
Return()
Source('AmpUnit.cc')

View file

@ -28,7 +28,7 @@
Import('*')
if not env['RUBY']:
if env['PROTOCOL'] == 'None':
Return()
Source('Crossbar.cc')

View file

@ -27,7 +27,7 @@
Import('*')
if not env['RUBY']:
if env['PROTOCOL'] == 'None':
Return()
Source('NetworkPower.cc')

View file

@ -30,7 +30,7 @@
Import('*')
if not env['RUBY']:
if env['PROTOCOL'] == 'None':
Return()
SimObject('SimpleLink.py')

View file

@ -30,7 +30,7 @@
Import('*')
if not env['RUBY']:
if env['PROTOCOL'] == 'None':
Return()
PySource('', 'Crossbar.py')

View file

@ -30,7 +30,7 @@
Import('*')
if not env['RUBY']:
if env['PROTOCOL'] == 'None':
Return()
SimObject('Profiler.py')

View file

@ -30,7 +30,7 @@
Import('*')
if not env['RUBY']:
if env['PROTOCOL'] == 'None':
Return()
SimObject('Tracer.py')

View file

@ -30,7 +30,7 @@
Import('*')
if not env['RUBY']:
if env['PROTOCOL'] == 'None':
Return()
SimObject('Controller.py')

View file

@ -30,7 +30,7 @@
Import('*')
if not env['RUBY']:
if env['PROTOCOL'] == 'None':
Return()
SimObject('Cache.py')

View file

@ -288,7 +288,7 @@ else:
'simple-atomic-mp', 'simple-timing-mp', 'o3-timing-mp',
'inorder-timing', 'rubytest']
if env['RUBY']:
if env['PROTOCOL'] != 'None':
if env['PROTOCOL'] == 'MI_example':
configs += [c + "-ruby" for c in configs]
else: