Re-merging branch/2012-08-15/variety-reform after fixing windows build problems.

Copied from Perforce
 Change: 179288
 ServerID: perforce.ravenbrook.com

3 files changed, 52 insertions, 50 deletions

diff --git a/mps/code/config.h b/mps/code/config.h
index 060c40ad604..552ee2987fb 100644
--- a/mps/code/config.h
+++ b/mps/code/config.h
@@ -39,22 +39,6 @@
 /* no telemetry log events */
 
 
-/* CONFIG_VAR_HOT -- the hot variety
- *
- * This variety is the default variety for distribution in products that use
- * the MPS.  It has maximum performance while retaining a good level of
- * consistency checking and allowing some debugging and telemetry features.
- */
-
-#elif defined(CONFIG_VAR_HOT)
-#define CONFIG_ASSERT
-#ifndef CHECKLEVEL
-#define CHECKLEVEL      CheckLevelMINIMAL
-#endif
-/* no statistic meters */
-/* no telemetry log events */
-
-
 /* CONFIG_VAR_DIAG -- diagnostic variety
  *
  * Deprecated.  The diagnostic variety prints messages about the internals
@@ -111,6 +95,24 @@
 #define CONFIG_STATS
 #define CONFIG_LOG
 
+
+#else /* CONFIG_VAR_* */
+
+/* CONFIG_VAR_HOT -- the hot variety
+ *
+ * This variety is the default variety for distribution in products that use
+ * the MPS.  It has maximum performance while retaining a good level of
+ * consistency checking and allowing some debugging and telemetry features.
+ */
+
+/* #elif defined(CONFIG_VAR_HOT) */
+#define CONFIG_ASSERT
+#ifndef CHECKLEVEL
+#define CHECKLEVEL      CheckLevelMINIMAL
+#endif
+/* no statistic meters */
+/* no telemetry log events */
+
 #endif /* CONFIG_VAR_* */
 
 
diff --git a/mps/code/w3i3mv.nmk b/mps/code/w3i3mv.nmk
index 521fe3a95f7..d92decb1f97 100644
--- a/mps/code/w3i3mv.nmk
+++ b/mps/code/w3i3mv.nmk
@@ -9,7 +9,7 @@ PFM = w3i3mv
 # (if not suppressed) generate a dependency on the C library, __chkesp,
 # which causes the linker step to fail when building the DLL, mpsdy.dll.
 PFMDEFS = /DCONFIG_PF_STRING="w3i3mv" /DCONFIG_PF_W3I3MV \
-      /DWIN32 /D_WINDOWS /Gs /I$(RAINBOWPATH)
+      /DWIN32 /D_WINDOWS /Gs
 
 MPM = <ring> <mpm> <bt> <protocol> <boot> \
       <arenavm> <arenacl> <locus> <arena> <global> <tract> <reserv> \
@@ -114,22 +114,22 @@ FMTTESTOBJ0 = $(FMTTEST:<=w3i3mv\ti\)
 POOLNOBJ0 = $(POOLN:<=w3i3mv\ti\)
 TESTLIBOBJ0 = $(TESTLIB:<=w3i3mv\ti\)
 
-!ELSEIF "$(VARIETY)" == "we"
-CFLAGS=$(CFLAGSCOMMONPRE) $(CFWE) $(CFLAGSCOMMONPOST)
-LINKFLAGS=$(LINKFLAGSCOMMON) $(LFWE)
-LIBFLAGS=$(LIBFLAGSCOMMON) $(LIBFLAGSWE)
-MPMOBJ0 = $(MPM:<=w3i3mv\we\)
-PLINTHOBJ0 = $(PLINTH:<=w3i3mv\we\)
-AMSOBJ0 = $(AMS:<=w3i3mv\we\)
-AMCOBJ0 = $(AMC:<=w3i3mv\we\)
-AWLOBJ0 = $(AWL:<=w3i3mv\we\)
-LOOBJ0 = $(LO:<=w3i3mv\we\)
-SNCOBJ0 = $(SNC:<=w3i3mv\we\)
-MVFFOBJ0 = $(MVFF:<=w3i3mv\we\)
-DWOBJ0 = $(DW:<=w3i3mv\we\)
-FMTTESTOBJ0 = $(FMTTEST:<=w3i3mv\we\)
-POOLNOBJ0 = $(POOLN:<=w3i3mv\we\)
-TESTLIBOBJ0 = $(TESTLIB:<=w3i3mv\we\)
+!ELSEIF "$(VARIETY)" == "rash"
+CFLAGS=$(CFLAGSCOMMONPRE) $(CFRASH) $(CFLAGSCOMMONPOST)
+LINKFLAGS=$(LINKFLAGSCOMMON) $(LFRASH)
+LIBFLAGS=$(LIBFLAGSCOMMON) $(LIBFLAGSRASH)
+MPMOBJ0 = $(MPM:<=w3i3mv\rash\)
+PLINTHOBJ0 = $(PLINTH:<=w3i3mv\rash\)
+AMSOBJ0 = $(AMS:<=w3i3mv\rash\)
+AMCOBJ0 = $(AMC:<=w3i3mv\rash\)
+AWLOBJ0 = $(AWL:<=w3i3mv\rash\)
+LOOBJ0 = $(LO:<=w3i3mv\rash\)
+SNCOBJ0 = $(SNC:<=w3i3mv\rash\)
+MVFFOBJ0 = $(MVFF:<=w3i3mv\rash\)
+DWOBJ0 = $(DW:<=w3i3mv\rash\)
+FMTTESTOBJ0 = $(FMTTEST:<=w3i3mv\rash\)
+POOLNOBJ0 = $(POOLN:<=w3i3mv\rash\)
+TESTLIBOBJ0 = $(TESTLIB:<=w3i3mv\rash\)
 
 #!ELSEIF "$(VARIETY)" == "cv"
 #CFLAGS=$(CFLAGSCOMMON) $(CFCV)
diff --git a/mps/code/w3i6mv.nmk b/mps/code/w3i6mv.nmk
index d339d1534a8..943f9c559d0 100644
--- a/mps/code/w3i6mv.nmk
+++ b/mps/code/w3i6mv.nmk
@@ -9,7 +9,7 @@ PFM = w3i6mv
 # (if not suppressed) generate a dependency on the C library, __chkesp,
 # which causes the linker step to fail when building the DLL, mpsdy.dll.
 PFMDEFS = /DCONFIG_PF_STRING="w3i6mv" /DCONFIG_PF_W3I6MV \
-      /DWIN32 /D_WINDOWS /Gs /I$(RAINBOWPATH)
+      /DWIN32 /D_WINDOWS /Gs
 MASM = ml64
 
 MPM = <ring> <mpm> <bt> <protocol> <boot> \
@@ -114,22 +114,22 @@ FMTTESTOBJ0 = $(FMTTEST:<=w3i6mv\ti\)
 POOLNOBJ0 = $(POOLN:<=w3i6mv\ti\)
 TESTLIBOBJ0 = $(TESTLIB:<=w3i6mv\ti\)
 
-!ELSEIF "$(VARIETY)" == "we"
-CFLAGS=$(CFLAGSCOMMONPRE) $(CFWE) $(CFLAGSCOMMONPOST)
-LINKFLAGS=$(LINKFLAGSCOMMON) $(LFWE)
-LIBFLAGS=$(LIBFLAGSCOMMON) $(LIBFLAGSWE)
-MPMOBJ0 = $(MPM:<=w3i6mv\we\)
-PLINTHOBJ0 = $(PLINTH:<=w3i6mv\we\)
-AMSOBJ0 = $(AMS:<=w3i6mv\we\)
-AMCOBJ0 = $(AMC:<=w3i6mv\we\)
-AWLOBJ0 = $(AWL:<=w3i6mv\we\)
-LOOBJ0 = $(LO:<=w3i6mv\we\)
-SNCOBJ0 = $(SNC:<=w3i6mv\we\)
-MVFFOBJ0 = $(MVFF:<=w3i6mv\we\)
-DWOBJ0 = $(DW:<=w3i6mv\we\)
-FMTTESTOBJ0 = $(FMTTEST:<=w3i6mv\we\)
-POOLNOBJ0 = $(POOLN:<=w3i6mv\we\)
-TESTLIBOBJ0 = $(TESTLIB:<=w3i6mv\we\)
+!ELSEIF "$(VARIETY)" == "rash"
+CFLAGS=$(CFLAGSCOMMONPRE) $(CFRASH) $(CFLAGSCOMMONPOST)
+LINKFLAGS=$(LINKFLAGSCOMMON) $(LFRASH)
+LIBFLAGS=$(LIBFLAGSCOMMON) $(LIBFLAGSRASH)
+MPMOBJ0 = $(MPM:<=w3i6mv\rash\)
+PLINTHOBJ0 = $(PLINTH:<=w3i6mv\rash\)
+AMSOBJ0 = $(AMS:<=w3i6mv\rash\)
+AMCOBJ0 = $(AMC:<=w3i6mv\rash\)
+AWLOBJ0 = $(AWL:<=w3i6mv\rash\)
+LOOBJ0 = $(LO:<=w3i6mv\rash\)
+SNCOBJ0 = $(SNC:<=w3i6mv\rash\)
+MVFFOBJ0 = $(MVFF:<=w3i6mv\rash\)
+DWOBJ0 = $(DW:<=w3i6mv\rash\)
+FMTTESTOBJ0 = $(FMTTEST:<=w3i6mv\rash\)
+POOLNOBJ0 = $(POOLN:<=w3i6mv\rash\)
+TESTLIBOBJ0 = $(TESTLIB:<=w3i6mv\rash\)
 
 #!ELSEIF "$(VARIETY)" == "cv"
 #CFLAGS=$(CFLAGSCOMMON) $(CFCV)