From fd69f40e209d1b77ce167bf59c189e513a6815f3 Mon Sep 17 00:00:00 2001 From: Steve Reinhardt Date: Tue, 7 Mar 2006 02:11:11 -0500 Subject: 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 --- build/SConstruct | 6 +++--- build/build_options/default/ALPHA_FS | 2 -- build/build_options/default/ALPHA_FS_TL | 2 -- build/build_options/default/ALPHA_SE | 2 -- build/build_options/default/MIPS_SE | 2 -- build/build_options/default/SPARC_SE | 2 -- build/default_options/ALPHA_FS | 2 ++ build/default_options/ALPHA_FS_TL | 2 ++ build/default_options/ALPHA_SE | 2 ++ build/default_options/MIPS_SE | 2 ++ build/default_options/SPARC_SE | 2 ++ 11 files changed, 13 insertions(+), 13 deletions(-) delete mode 100644 build/build_options/default/ALPHA_FS delete mode 100644 build/build_options/default/ALPHA_FS_TL delete mode 100644 build/build_options/default/ALPHA_SE delete mode 100644 build/build_options/default/MIPS_SE delete mode 100644 build/build_options/default/SPARC_SE create mode 100644 build/default_options/ALPHA_FS create mode 100644 build/default_options/ALPHA_FS_TL create mode 100644 build/default_options/ALPHA_SE create mode 100644 build/default_options/MIPS_SE create mode 100644 build/default_options/SPARC_SE 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/build_options/default/ALPHA_FS deleted file mode 100644 index ddd69b9b3..000000000 --- a/build/build_options/default/ALPHA_FS +++ /dev/null @@ -1,2 +0,0 @@ -FULL_SYSTEM = 1 -ALPHA_TLASER = 0 diff --git a/build/build_options/default/ALPHA_FS_TL b/build/build_options/default/ALPHA_FS_TL deleted file mode 100644 index 4f3e201ec..000000000 --- a/build/build_options/default/ALPHA_FS_TL +++ /dev/null @@ -1,2 +0,0 @@ -FULL_SYSTEM = 1 -ALPHA_TLASER = 1 diff --git a/build/build_options/default/ALPHA_SE b/build/build_options/default/ALPHA_SE deleted file mode 100644 index 3fedc22ca..000000000 --- a/build/build_options/default/ALPHA_SE +++ /dev/null @@ -1,2 +0,0 @@ -FULL_SYSTEM = 0 -SS_COMPATIBLE_FP = 1 diff --git a/build/build_options/default/MIPS_SE b/build/build_options/default/MIPS_SE deleted file mode 100644 index e74e2f69c..000000000 --- a/build/build_options/default/MIPS_SE +++ /dev/null @@ -1,2 +0,0 @@ -TARGET_ISA = 'mips' -FULL_SYSTEM = 0 diff --git a/build/build_options/default/SPARC_SE b/build/build_options/default/SPARC_SE deleted file mode 100644 index 3b256fc34..000000000 --- a/build/build_options/default/SPARC_SE +++ /dev/null @@ -1,2 +0,0 @@ -TARGET_ISA = 'sparc' -FULL_SYSTEM = 0 diff --git a/build/default_options/ALPHA_FS b/build/default_options/ALPHA_FS new file mode 100644 index 000000000..ddd69b9b3 --- /dev/null +++ b/build/default_options/ALPHA_FS @@ -0,0 +1,2 @@ +FULL_SYSTEM = 1 +ALPHA_TLASER = 0 diff --git a/build/default_options/ALPHA_FS_TL b/build/default_options/ALPHA_FS_TL new file mode 100644 index 000000000..4f3e201ec --- /dev/null +++ b/build/default_options/ALPHA_FS_TL @@ -0,0 +1,2 @@ +FULL_SYSTEM = 1 +ALPHA_TLASER = 1 diff --git a/build/default_options/ALPHA_SE b/build/default_options/ALPHA_SE new file mode 100644 index 000000000..3fedc22ca --- /dev/null +++ b/build/default_options/ALPHA_SE @@ -0,0 +1,2 @@ +FULL_SYSTEM = 0 +SS_COMPATIBLE_FP = 1 diff --git a/build/default_options/MIPS_SE b/build/default_options/MIPS_SE new file mode 100644 index 000000000..e74e2f69c --- /dev/null +++ b/build/default_options/MIPS_SE @@ -0,0 +1,2 @@ +TARGET_ISA = 'mips' +FULL_SYSTEM = 0 diff --git a/build/default_options/SPARC_SE b/build/default_options/SPARC_SE new file mode 100644 index 000000000..3b256fc34 --- /dev/null +++ b/build/default_options/SPARC_SE @@ -0,0 +1,2 @@ +TARGET_ISA = 'sparc' +FULL_SYSTEM = 0 -- cgit v1.2.3