diff options
| author | Steve Reinhardt <stever@eecs.umich.edu> | 2006-03-07 02:11:11 -0500 |
|---|---|---|
| committer | Steve Reinhardt <stever@eecs.umich.edu> | 2006-03-07 02:11:11 -0500 |
| commit | fd69f40e209d1b77ce167bf59c189e513a6815f3 (patch) | |
| tree | db641c495808ced7e8fab00e953ec58b4d47d356 | |
| parent | 9358681756e4ec2cc66062700e8075effebb40dc (diff) | |
| download | gem5-fd69f40e209d1b77ce167bf59c189e513a6815f3.tar.xz | |
Rename default options path from "build_options/default" to "default_options",
and current options path from "build_options/current" to "options".
This way we can symlink default_options to a different build dir
w/o clobbering the current options.
--HG--
rename : build/build_options/default/ALPHA_FS => build/default_options/ALPHA_FS
rename : build/build_options/default/ALPHA_FS_TL => build/default_options/ALPHA_FS_TL
rename : build/build_options/default/ALPHA_SE => build/default_options/ALPHA_SE
rename : build/build_options/default/MIPS_SE => build/default_options/MIPS_SE
rename : build/build_options/default/SPARC_SE => build/default_options/SPARC_SE
extra : convert_revision : 8c0d3139cdd7e9ed40a9f2deeb47f65f24e52799
| -rw-r--r-- | build/SConstruct | 6 | ||||
| -rw-r--r-- | build/default_options/ALPHA_FS (renamed from build/build_options/default/ALPHA_FS) | 0 | ||||
| -rw-r--r-- | build/default_options/ALPHA_FS_TL (renamed from build/build_options/default/ALPHA_FS_TL) | 0 | ||||
| -rw-r--r-- | build/default_options/ALPHA_SE (renamed from build/build_options/default/ALPHA_SE) | 0 | ||||
| -rw-r--r-- | build/default_options/MIPS_SE (renamed from build/build_options/default/MIPS_SE) | 0 | ||||
| -rw-r--r-- | build/default_options/SPARC_SE (renamed from build/build_options/default/SPARC_SE) | 0 |
6 files changed, 3 insertions, 3 deletions
diff --git a/build/SConstruct b/build/SConstruct index 2d64afb3e..306d3a9dc 100644 --- a/build/SConstruct +++ b/build/SConstruct @@ -341,11 +341,11 @@ for build_dir in build_dirs: sticky_opts.files = [] # Name of default options file is taken from 'default=' on command # line if set, otherwise name of build dir. - default_options_file = os.path.join('build_options', 'default', + default_options_file = os.path.join('default_options', ARGUMENTS.get('default', build_dir)) if os.path.isfile(default_options_file): sticky_opts.files.append(default_options_file) - current_options_file = os.path.join('build_options', 'current', build_dir) + current_options_file = os.path.join('options', build_dir) if os.path.isfile(current_options_file): sticky_opts.files.append(current_options_file) else: @@ -355,7 +355,7 @@ for build_dir in build_dirs: if not os.path.isdir(opt_dir): os.mkdir(opt_dir) if not sticky_opts.files: - print "%s: No options file found in build_options, using defaults." \ + print "%s: No options file found in options, using defaults." \ % build_dir # Apply current option settings to env diff --git a/build/build_options/default/ALPHA_FS b/build/default_options/ALPHA_FS index ddd69b9b3..ddd69b9b3 100644 --- a/build/build_options/default/ALPHA_FS +++ b/build/default_options/ALPHA_FS diff --git a/build/build_options/default/ALPHA_FS_TL b/build/default_options/ALPHA_FS_TL index 4f3e201ec..4f3e201ec 100644 --- a/build/build_options/default/ALPHA_FS_TL +++ b/build/default_options/ALPHA_FS_TL diff --git a/build/build_options/default/ALPHA_SE b/build/default_options/ALPHA_SE index 3fedc22ca..3fedc22ca 100644 --- a/build/build_options/default/ALPHA_SE +++ b/build/default_options/ALPHA_SE diff --git a/build/build_options/default/MIPS_SE b/build/default_options/MIPS_SE index e74e2f69c..e74e2f69c 100644 --- a/build/build_options/default/MIPS_SE +++ b/build/default_options/MIPS_SE diff --git a/build/build_options/default/SPARC_SE b/build/default_options/SPARC_SE index 3b256fc34..3b256fc34 100644 --- a/build/build_options/default/SPARC_SE +++ b/build/default_options/SPARC_SE |