From 76a32552c440579d40c94cb65642a7d7aa8e872f Mon Sep 17 00:00:00 2001
From: Steve Reinhardt <stever@eecs.umich.edu>
Date: Sat, 24 Sep 2005 21:16:02 -0400
Subject: [PATCH] Split build options files into a static set of defaults for
 committing to bk and a dynamically updated set which are not under revision
 control.

build/SConstruct:
    Split build options into static defaults and dynamic "current" settings.

--HG--
rename : build/build_options/ALPHA_FS => build/build_options/default/ALPHA_FS
rename : build/build_options/ALPHA_FS_TL => build/build_options/default/ALPHA_FS_TL
rename : build/build_options/ALPHA_SE => build/build_options/default/ALPHA_SE
extra : convert_revision : 8219211a3f2ce955fd6e2c34c169cac3fc704854
---
 build/SConstruct                              | 21 ++++++++++++-------
 build/build_options/{ => default}/ALPHA_FS    |  0
 build/build_options/{ => default}/ALPHA_FS_TL |  0
 build/build_options/{ => default}/ALPHA_SE    |  0
 4 files changed, 14 insertions(+), 7 deletions(-)
 rename build/build_options/{ => default}/ALPHA_FS (100%)
 rename build/build_options/{ => default}/ALPHA_FS_TL (100%)
 rename build/build_options/{ => default}/ALPHA_SE (100%)

diff --git a/build/SConstruct b/build/SConstruct
index 7f237ca77..d1fa5320c 100644
--- a/build/SConstruct
+++ b/build/SConstruct
@@ -320,12 +320,19 @@ for build_dir in build_dirs:
     # Make a copy of the default environment to use for this config.
     env = base_env.Copy()
     # Set env according to the build directory config.
-    options_file = os.path.join('build_options', build_dir)
-    if os.path.isfile(options_file):
-        sticky_opts.files = [options_file]
-    else:
-        print "Options file %s not found, using defaults." % options_file
 
+    sticky_opts.files = []
+    default_options_file = os.path.join('build_options', '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)
+    if os.path.isfile(current_options_file):
+        sticky_opts.files.append(current_options_file)
+    if not sticky_opts.files:
+        print "%s: No options file found in build_options, using defaults." \
+              % build_dir
+
+    # Apply current option settings to env
     sticky_opts.Update(env)
     nonsticky_opts.Update(env)
 
@@ -353,8 +360,8 @@ for build_dir in build_dirs:
             env.ParseConfig(mysql_config_libs)
             env.ParseConfig(mysql_config_include)
 
-    # Save sticky option settings back to file
-    sticky_opts.Save(options_file, env)
+    # Save sticky option settings back to current options file
+    sticky_opts.Save(current_options_file, env)
 
     # Do this after we save setting back, or else we'll tack on an
     # extra 'qdo' every time we run scons.
diff --git a/build/build_options/ALPHA_FS b/build/build_options/default/ALPHA_FS
similarity index 100%
rename from build/build_options/ALPHA_FS
rename to build/build_options/default/ALPHA_FS
diff --git a/build/build_options/ALPHA_FS_TL b/build/build_options/default/ALPHA_FS_TL
similarity index 100%
rename from build/build_options/ALPHA_FS_TL
rename to build/build_options/default/ALPHA_FS_TL
diff --git a/build/build_options/ALPHA_SE b/build/build_options/default/ALPHA_SE
similarity index 100%
rename from build/build_options/ALPHA_SE
rename to build/build_options/default/ALPHA_SE