Mps br/vc9: new w3i3m9 clone-platform:

Regular changes w3i3mv ->w3i3m9

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

2 files changed, 168 insertions, 179 deletions

diff --git a/mps/code/w3i3m9.nmk b/mps/code/w3i3m9.nmk
index fc9509cd87b..435e5703b07 100644
--- a/mps/code/w3i3m9.nmk
+++ b/mps/code/w3i3m9.nmk
@@ -1,9 +1,21 @@
-# w3i3mv.nmk: WINDOWS (INTEL) NMAKE FILE
+# w3i3m9.nmk: WINDOWS (INTEL) NMAKE FILE -- VC9 CLONE
 #
 # $Id$
 # Copyright (c) 2001 Ravenbrook Limited.  See end of file for license.
 
-PFM = w3i3mv
+
+# This is a clone of w3i3mv, for experimenting with compiler & linker
+# options for VC9 (Visual C++ 9.0).
+# Differences:
+#   - compiler & linker options, as set in this file;
+#   - built in w3i3m9 directory (ie. separate from w3i3mv);
+#   - MPS_PF_STRING is "w3i3m9".
+# Otherwise it is the same.  In particular:
+#   - it still defines "MPS_BUILD_MV";
+#   - general MPS source is blind to the distinction.
+
+
+PFM = w3i3m9
 
 RAINBOWPATH = MSVISUAL\WIN32\I386
 DONGLELIB = $(RAINBOWPATH)\spromeps.lib
@@ -58,257 +70,257 @@ TESTLIB = <testlib>
 CFLAGS=$(CFLAGSCOMMONPRE) $(CFHE) $(CFLAGSCOMMONPOST)
 LINKFLAGS=$(LINKFLAGSCOMMON) $(LFHE)
 LIBFLAGS=$(LIBFLAGSCOMMON) $(LIBFLAGSHE)
-MPMOBJ0 = $(MPM:<=w3i3mv\he\)
+MPMOBJ0 = $(MPM:<=w3i3m9\he\)
 MPMOBJ = $(MPMOBJ0:>=.obj)
-PLINTHOBJ0 = $(PLINTH:<=w3i3mv\he\)
+PLINTHOBJ0 = $(PLINTH:<=w3i3m9\he\)
 PLINTHOBJ = $(PLINTHOBJ0:>=.obj)
-SWOBJ0 = $(SW:<=w3i3mv\he\)
+SWOBJ0 = $(SW:<=w3i3m9\he\)
 SWOBJ = $(SWOBJ0:>=.obj)
-AMSOBJ0 = $(AMS:<=w3i3mv\he\)
+AMSOBJ0 = $(AMS:<=w3i3m9\he\)
 AMSOBJ = $(AMSOBJ0:>=.obj)
-AMCOBJ0 = $(AMC:<=w3i3mv\he\)
+AMCOBJ0 = $(AMC:<=w3i3m9\he\)
 AMCOBJ = $(AMCOBJ0:>=.obj)
-AWLOBJ0 = $(AWL:<=w3i3mv\he\)
+AWLOBJ0 = $(AWL:<=w3i3m9\he\)
 AWLOBJ = $(AWLOBJ0:>=.obj)
-LOOBJ0 = $(LO:<=w3i3mv\he\)
+LOOBJ0 = $(LO:<=w3i3m9\he\)
 LOOBJ = $(LOOBJ0:>=.obj)
-SNCOBJ0 = $(SNC:<=w3i3mv\he\)
+SNCOBJ0 = $(SNC:<=w3i3m9\he\)
 SNCOBJ = $(SNCOBJ0:>=.obj)
-DWOBJ0 = $(DW:<=w3i3mv\he\)
+DWOBJ0 = $(DW:<=w3i3m9\he\)
 DWOBJ = $(DWOBJ0:>=.obj)
-FMTTESTOBJ0 = $(FMTTEST:<=w3i3mv\he\)
+FMTTESTOBJ0 = $(FMTTEST:<=w3i3m9\he\)
 FMTTESTOBJ = $(FMTTESTOBJ0:>=.obj)
-POOLNOBJ0 = $(POOLN:<=w3i3mv\he\)
+POOLNOBJ0 = $(POOLN:<=w3i3m9\he\)
 POOLNOBJ = $(POOLNOBJ0:>=.obj)
-TESTLIBOBJ0 = $(TESTLIB:<=w3i3mv\he\)
+TESTLIBOBJ0 = $(TESTLIB:<=w3i3m9\he\)
 TESTLIBOBJ = $(TESTLIBOBJ0:>=.obj)
 
 !ELSEIF "$(VARIETY)" == "ce"
 CFLAGS=$(CFLAGSCOMMONPRE) $(CFCE) $(CFLAGSCOMMONPOST)
 LINKFLAGS=$(LINKFLAGSCOMMON) $(LFCE)
 LIBFLAGS=$(LIBFLAGSCOMMON) $(LIBFLAGSCE)
-MPMOBJ0 = $(MPM:<=w3i3mv\ce\)
+MPMOBJ0 = $(MPM:<=w3i3m9\ce\)
 MPMOBJ = $(MPMOBJ0:>=.obj)
-PLINTHOBJ0 = $(PLINTH:<=w3i3mv\ce\)
+PLINTHOBJ0 = $(PLINTH:<=w3i3m9\ce\)
 PLINTHOBJ = $(PLINTHOBJ0:>=.obj)
-SWOBJ0 = $(SW:<=w3i3mv\ce\)
+SWOBJ0 = $(SW:<=w3i3m9\ce\)
 SWOBJ = $(SWOBJ0:>=.obj)
-AMSOBJ0 = $(AMS:<=w3i3mv\ce\)
+AMSOBJ0 = $(AMS:<=w3i3m9\ce\)
 AMSOBJ = $(AMSOBJ0:>=.obj)
-AMCOBJ0 = $(AMC:<=w3i3mv\ce\)
+AMCOBJ0 = $(AMC:<=w3i3m9\ce\)
 AMCOBJ = $(AMCOBJ0:>=.obj)
-AWLOBJ0 = $(AWL:<=w3i3mv\ce\)
+AWLOBJ0 = $(AWL:<=w3i3m9\ce\)
 AWLOBJ = $(AWLOBJ0:>=.obj)
-LOOBJ0 = $(LO:<=w3i3mv\ce\)
+LOOBJ0 = $(LO:<=w3i3m9\ce\)
 LOOBJ = $(LOOBJ0:>=.obj)
-SNCOBJ0 = $(SNC:<=w3i3mv\ce\)
+SNCOBJ0 = $(SNC:<=w3i3m9\ce\)
 SNCOBJ = $(SNCOBJ0:>=.obj)
-DWOBJ0 = $(DW:<=w3i3mv\ce\)
+DWOBJ0 = $(DW:<=w3i3m9\ce\)
 DWOBJ = $(DWOBJ0:>=.obj)
-FMTTESTOBJ0 = $(FMTTEST:<=w3i3mv\ce\)
+FMTTESTOBJ0 = $(FMTTEST:<=w3i3m9\ce\)
 FMTTESTOBJ = $(FMTTESTOBJ0:>=.obj)
-POOLNOBJ0 = $(POOLN:<=w3i3mv\ce\)
+POOLNOBJ0 = $(POOLN:<=w3i3m9\ce\)
 POOLNOBJ = $(POOLNOBJ0:>=.obj)
-TESTLIBOBJ0 = $(TESTLIB:<=w3i3mv\ce\)
+TESTLIBOBJ0 = $(TESTLIB:<=w3i3m9\ce\)
 TESTLIBOBJ = $(TESTLIBOBJ0:>=.obj)
 
 !ELSEIF "$(VARIETY)" == "hi"
 CFLAGS=$(CFLAGSCOMMONPRE) $(CFHI) $(CFLAGSCOMMONPOST)
 LINKFLAGS=$(LINKFLAGSCOMMON) $(LFHI)
 LIBFLAGS=$(LIBFLAGSCOMMON) $(LIBFLAGSHI)
-MPMOBJ0 = $(MPM:<=w3i3mv\hi\)
+MPMOBJ0 = $(MPM:<=w3i3m9\hi\)
 MPMOBJ = $(MPMOBJ0:>=.obj)
-PLINTHOBJ0 = $(PLINTH:<=w3i3mv\hi\)
+PLINTHOBJ0 = $(PLINTH:<=w3i3m9\hi\)
 PLINTHOBJ = $(PLINTHOBJ0:>=.obj)
-SWOBJ0 = $(SW:<=w3i3mv\hi\)
+SWOBJ0 = $(SW:<=w3i3m9\hi\)
 SWOBJ = $(SWOBJ0:>=.obj)
-AMSOBJ0 = $(AMS:<=w3i3mv\hi\)
+AMSOBJ0 = $(AMS:<=w3i3m9\hi\)
 AMSOBJ = $(AMSOBJ0:>=.obj)
-AMCOBJ0 = $(AMC:<=w3i3mv\hi\)
+AMCOBJ0 = $(AMC:<=w3i3m9\hi\)
 AMCOBJ = $(AMCOBJ0:>=.obj)
-AWLOBJ0 = $(AWL:<=w3i3mv\hi\)
+AWLOBJ0 = $(AWL:<=w3i3m9\hi\)
 AWLOBJ = $(AWLOBJ0:>=.obj)
-LOOBJ0 = $(LO:<=w3i3mv\hi\)
+LOOBJ0 = $(LO:<=w3i3m9\hi\)
 LOOBJ = $(LOOBJ0:>=.obj)
-SNCOBJ0 = $(SNC:<=w3i3mv\hi\)
+SNCOBJ0 = $(SNC:<=w3i3m9\hi\)
 SNCOBJ = $(SNCOBJ0:>=.obj)
-DWOBJ0 = $(DW:<=w3i3mv\hi\)
+DWOBJ0 = $(DW:<=w3i3m9\hi\)
 DWOBJ = $(DWOBJ0:>=.obj)
-FMTTESTOBJ0 = $(FMTTEST:<=w3i3mv\hi\)
+FMTTESTOBJ0 = $(FMTTEST:<=w3i3m9\hi\)
 FMTTESTOBJ = $(FMTTESTOBJ0:>=.obj)
-POOLNOBJ0 = $(POOLN:<=w3i3mv\hi\)
+POOLNOBJ0 = $(POOLN:<=w3i3m9\hi\)
 POOLNOBJ = $(POOLNOBJ0:>=.obj)
-TESTLIBOBJ0 = $(TESTLIB:<=w3i3mv\hi\)
+TESTLIBOBJ0 = $(TESTLIB:<=w3i3m9\hi\)
 TESTLIBOBJ = $(TESTLIBOBJ0:>=.obj)
 
 !ELSEIF "$(VARIETY)" == "di"
 CFLAGS=$(CFLAGSCOMMONPRE) $(CFDI) $(CFLAGSCOMMONPOST)
 LINKFLAGS=$(LINKFLAGSCOMMON) $(LFDI)
 LIBFLAGS=$(LIBFLAGSCOMMON) $(LIBFLAGSDI)
-MPMOBJ0 = $(MPM:<=w3i3mv\di\)
+MPMOBJ0 = $(MPM:<=w3i3m9\di\)
 MPMOBJ = $(MPMOBJ0:>=.obj)
-PLINTHOBJ0 = $(PLINTH:<=w3i3mv\di\)
+PLINTHOBJ0 = $(PLINTH:<=w3i3m9\di\)
 PLINTHOBJ = $(PLINTHOBJ0:>=.obj)
-SWOBJ0 = $(SW:<=w3i3mv\di\)
+SWOBJ0 = $(SW:<=w3i3m9\di\)
 SWOBJ = $(SWOBJ0:>=.obj)
-AMSOBJ0 = $(AMS:<=w3i3mv\di\)
+AMSOBJ0 = $(AMS:<=w3i3m9\di\)
 AMSOBJ = $(AMSOBJ0:>=.obj)
-AMCOBJ0 = $(AMC:<=w3i3mv\di\)
+AMCOBJ0 = $(AMC:<=w3i3m9\di\)
 AMCOBJ = $(AMCOBJ0:>=.obj)
-AWLOBJ0 = $(AWL:<=w3i3mv\di\)
+AWLOBJ0 = $(AWL:<=w3i3m9\di\)
 AWLOBJ = $(AWLOBJ0:>=.obj)
-LOOBJ0 = $(LO:<=w3i3mv\di\)
+LOOBJ0 = $(LO:<=w3i3m9\di\)
 LOOBJ = $(LOOBJ0:>=.obj)
-SNCOBJ0 = $(SNC:<=w3i3mv\di\)
+SNCOBJ0 = $(SNC:<=w3i3m9\di\)
 SNCOBJ = $(SNCOBJ0:>=.obj)
-DWOBJ0 = $(DW:<=w3i3mv\di\)
+DWOBJ0 = $(DW:<=w3i3m9\di\)
 DWOBJ = $(DWOBJ0:>=.obj)
-FMTTESTOBJ0 = $(FMTTEST:<=w3i3mv\di\)
+FMTTESTOBJ0 = $(FMTTEST:<=w3i3m9\di\)
 FMTTESTOBJ = $(FMTTESTOBJ0:>=.obj)
-POOLNOBJ0 = $(POOLN:<=w3i3mv\di\)
+POOLNOBJ0 = $(POOLN:<=w3i3m9\di\)
 POOLNOBJ = $(POOLNOBJ0:>=.obj)
-TESTLIBOBJ0 = $(TESTLIB:<=w3i3mv\di\)
+TESTLIBOBJ0 = $(TESTLIB:<=w3i3m9\di\)
 TESTLIBOBJ = $(TESTLIBOBJ0:>=.obj)
 
 !ELSEIF "$(VARIETY)" == "ci"
 CFLAGS=$(CFLAGSCOMMONPRE) $(CFCI) $(CFLAGSCOMMONPOST)
 LINKFLAGS=$(LINKFLAGSCOMMON) $(LFCI)
 LIBFLAGS=$(LIBFLAGSCOMMON) $(LIBFLAGSCI)
-MPMOBJ0 = $(MPM:<=w3i3mv\ci\)
+MPMOBJ0 = $(MPM:<=w3i3m9\ci\)
 MPMOBJ = $(MPMOBJ0:>=.obj)
-PLINTHOBJ0 = $(PLINTH:<=w3i3mv\ci\)
+PLINTHOBJ0 = $(PLINTH:<=w3i3m9\ci\)
 PLINTHOBJ = $(PLINTHOBJ0:>=.obj)
-SWOBJ0 = $(SW:<=w3i3mv\ci\)
+SWOBJ0 = $(SW:<=w3i3m9\ci\)
 SWOBJ = $(SWOBJ0:>=.obj)
-AMSOBJ0 = $(AMS:<=w3i3mv\ci\)
+AMSOBJ0 = $(AMS:<=w3i3m9\ci\)
 AMSOBJ = $(AMSOBJ0:>=.obj)
-AMCOBJ0 = $(AMC:<=w3i3mv\ci\)
+AMCOBJ0 = $(AMC:<=w3i3m9\ci\)
 AMCOBJ = $(AMCOBJ0:>=.obj)
-AWLOBJ0 = $(AWL:<=w3i3mv\ci\)
+AWLOBJ0 = $(AWL:<=w3i3m9\ci\)
 AWLOBJ = $(AWLOBJ0:>=.obj)
-LOOBJ0 = $(LO:<=w3i3mv\ci\)
+LOOBJ0 = $(LO:<=w3i3m9\ci\)
 LOOBJ = $(LOOBJ0:>=.obj)
-SNCOBJ0 = $(SNC:<=w3i3mv\ci\)
+SNCOBJ0 = $(SNC:<=w3i3m9\ci\)
 SNCOBJ = $(SNCOBJ0:>=.obj)
-DWOBJ0 = $(DW:<=w3i3mv\ci\)
+DWOBJ0 = $(DW:<=w3i3m9\ci\)
 DWOBJ = $(DWOBJ0:>=.obj)
-FMTTESTOBJ0 = $(FMTTEST:<=w3i3mv\ci\)
+FMTTESTOBJ0 = $(FMTTEST:<=w3i3m9\ci\)
 FMTTESTOBJ = $(FMTTESTOBJ0:>=.obj)
-POOLNOBJ0 = $(POOLN:<=w3i3mv\ci\)
+POOLNOBJ0 = $(POOLN:<=w3i3m9\ci\)
 POOLNOBJ = $(POOLNOBJ0:>=.obj)
-TESTLIBOBJ0 = $(TESTLIB:<=w3i3mv\ci\)
+TESTLIBOBJ0 = $(TESTLIB:<=w3i3m9\ci\)
 TESTLIBOBJ = $(TESTLIBOBJ0:>=.obj)
 
 !ELSEIF "$(VARIETY)" == "ti"
 CFLAGS=$(CFLAGSCOMMONPRE) $(CFTI) $(CFLAGSCOMMONPOST)
 LINKFLAGS=$(LINKFLAGSCOMMON) $(LFTI)
 LIBFLAGS=$(LIBFLAGSCOMMON) $(LIBFLAGSTI)
-MPMOBJ0 = $(MPM:<=w3i3mv\ti\)
+MPMOBJ0 = $(MPM:<=w3i3m9\ti\)
 MPMOBJ = $(MPMOBJ0:>=.obj)
-PLINTHOBJ0 = $(PLINTH:<=w3i3mv\ti\)
+PLINTHOBJ0 = $(PLINTH:<=w3i3m9\ti\)
 PLINTHOBJ = $(PLINTHOBJ0:>=.obj)
-SWOBJ0 = $(SW:<=w3i3mv\ti\)
+SWOBJ0 = $(SW:<=w3i3m9\ti\)
 SWOBJ = $(SWOBJ0:>=.obj)
-AMSOBJ0 = $(AMS:<=w3i3mv\ti\)
+AMSOBJ0 = $(AMS:<=w3i3m9\ti\)
 AMSOBJ = $(AMSOBJ0:>=.obj)
-AMCOBJ0 = $(AMC:<=w3i3mv\ti\)
+AMCOBJ0 = $(AMC:<=w3i3m9\ti\)
 AMCOBJ = $(AMCOBJ0:>=.obj)
-AWLOBJ0 = $(AWL:<=w3i3mv\ti\)
+AWLOBJ0 = $(AWL:<=w3i3m9\ti\)
 AWLOBJ = $(AWLOBJ0:>=.obj)
-LOOBJ0 = $(LO:<=w3i3mv\ti\)
+LOOBJ0 = $(LO:<=w3i3m9\ti\)
 LOOBJ = $(LOOBJ0:>=.obj)
-SNCOBJ0 = $(SNC:<=w3i3mv\ti\)
+SNCOBJ0 = $(SNC:<=w3i3m9\ti\)
 SNCOBJ = $(SNCOBJ0:>=.obj)
-DWOBJ0 = $(DW:<=w3i3mv\ti\)
+DWOBJ0 = $(DW:<=w3i3m9\ti\)
 DWOBJ = $(DWOBJ0:>=.obj)
-FMTTESTOBJ0 = $(FMTTEST:<=w3i3mv\ti\)
+FMTTESTOBJ0 = $(FMTTEST:<=w3i3m9\ti\)
 FMTTESTOBJ = $(FMTTESTOBJ0:>=.obj)
-POOLNOBJ0 = $(POOLN:<=w3i3mv\ti\)
+POOLNOBJ0 = $(POOLN:<=w3i3m9\ti\)
 POOLNOBJ = $(POOLNOBJ0:>=.obj)
-TESTLIBOBJ0 = $(TESTLIB:<=w3i3mv\ti\)
+TESTLIBOBJ0 = $(TESTLIB:<=w3i3m9\ti\)
 TESTLIBOBJ = $(TESTLIBOBJ0:>=.obj)
 
 !ELSEIF "$(VARIETY)" == "wi"
 CFLAGS=$(CFLAGSCOMMONPRE) $(CFWI) $(CFLAGSCOMMONPOST)
 LINKFLAGS=$(LINKFLAGSCOMMON) $(LFWI)
 LIBFLAGS=$(LIBFLAGSCOMMON) $(LIBFLAGSWI)
-MPMOBJ0 = $(MPM:<=w3i3mv\wi\)
+MPMOBJ0 = $(MPM:<=w3i3m9\wi\)
 MPMOBJ = $(MPMOBJ0:>=.obj)
-PLINTHOBJ0 = $(PLINTH:<=w3i3mv\wi\)
+PLINTHOBJ0 = $(PLINTH:<=w3i3m9\wi\)
 PLINTHOBJ = $(PLINTHOBJ0:>=.obj)
-SWOBJ0 = $(SW:<=w3i3mv\wi\)
+SWOBJ0 = $(SW:<=w3i3m9\wi\)
 SWOBJ = $(SWOBJ0:>=.obj)
-AMSOBJ0 = $(AMS:<=w3i3mv\wi\)
+AMSOBJ0 = $(AMS:<=w3i3m9\wi\)
 AMSOBJ = $(AMSOBJ0:>=.obj)
-AMCOBJ0 = $(AMC:<=w3i3mv\wi\)
+AMCOBJ0 = $(AMC:<=w3i3m9\wi\)
 AMCOBJ = $(AMCOBJ0:>=.obj)
-AWLOBJ0 = $(AWL:<=w3i3mv\wi\)
+AWLOBJ0 = $(AWL:<=w3i3m9\wi\)
 AWLOBJ = $(AWLOBJ0:>=.obj)
-LOOBJ0 = $(LO:<=w3i3mv\wi\)
+LOOBJ0 = $(LO:<=w3i3m9\wi\)
 LOOBJ = $(LOOBJ0:>=.obj)
-SNCOBJ0 = $(SNC:<=w3i3mv\wi\)
+SNCOBJ0 = $(SNC:<=w3i3m9\wi\)
 SNCOBJ = $(SNCOBJ0:>=.obj)
-DWOBJ0 = $(DW:<=w3i3mv\wi\)
+DWOBJ0 = $(DW:<=w3i3m9\wi\)
 DWOBJ = $(DWOBJ0:>=.obj)
-FMTTESTOBJ0 = $(FMTTEST:<=w3i3mv\wi\)
+FMTTESTOBJ0 = $(FMTTEST:<=w3i3m9\wi\)
 FMTTESTOBJ = $(FMTTESTOBJ0:>=.obj)
-POOLNOBJ0 = $(POOLN:<=w3i3mv\wi\)
+POOLNOBJ0 = $(POOLN:<=w3i3m9\wi\)
 POOLNOBJ = $(POOLNOBJ0:>=.obj)
-TESTLIBOBJ0 = $(TESTLIB:<=w3i3mv\wi\)
+TESTLIBOBJ0 = $(TESTLIB:<=w3i3m9\wi\)
 TESTLIBOBJ = $(TESTLIBOBJ0:>=.obj)
 
 !ELSEIF "$(VARIETY)" == "we"
 CFLAGS=$(CFLAGSCOMMONPRE) $(CFWE) $(CFLAGSCOMMONPOST)
 LINKFLAGS=$(LINKFLAGSCOMMON) $(LFWE)
 LIBFLAGS=$(LIBFLAGSCOMMON) $(LIBFLAGSWE)
-MPMOBJ0 = $(MPM:<=w3i3mv\we\)
+MPMOBJ0 = $(MPM:<=w3i3m9\we\)
 MPMOBJ = $(MPMOBJ0:>=.obj)
-PLINTHOBJ0 = $(PLINTH:<=w3i3mv\we\)
+PLINTHOBJ0 = $(PLINTH:<=w3i3m9\we\)
 PLINTHOBJ = $(PLINTHOBJ0:>=.obj)
-SWOBJ0 = $(SW:<=w3i3mv\we\)
+SWOBJ0 = $(SW:<=w3i3m9\we\)
 SWOBJ = $(SWOBJ0:>=.obj)
-AMSOBJ0 = $(AMS:<=w3i3mv\we\)
+AMSOBJ0 = $(AMS:<=w3i3m9\we\)
 AMSOBJ = $(AMSOBJ0:>=.obj)
-AMCOBJ0 = $(AMC:<=w3i3mv\we\)
+AMCOBJ0 = $(AMC:<=w3i3m9\we\)
 AMCOBJ = $(AMCOBJ0:>=.obj)
-AWLOBJ0 = $(AWL:<=w3i3mv\we\)
+AWLOBJ0 = $(AWL:<=w3i3m9\we\)
 AWLOBJ = $(AWLOBJ0:>=.obj)
-LOOBJ0 = $(LO:<=w3i3mv\we\)
+LOOBJ0 = $(LO:<=w3i3m9\we\)
 LOOBJ = $(LOOBJ0:>=.obj)
-SNCOBJ0 = $(SNC:<=w3i3mv\we\)
+SNCOBJ0 = $(SNC:<=w3i3m9\we\)
 SNCOBJ = $(SNCOBJ0:>=.obj)
-DWOBJ0 = $(DW:<=w3i3mv\we\)
+DWOBJ0 = $(DW:<=w3i3m9\we\)
 DWOBJ = $(DWOBJ0:>=.obj)
-FMTTESTOBJ0 = $(FMTTEST:<=w3i3mv\we\)
+FMTTESTOBJ0 = $(FMTTEST:<=w3i3m9\we\)
 FMTTESTOBJ = $(FMTTESTOBJ0:>=.obj)
-POOLNOBJ0 = $(POOLN:<=w3i3mv\we\)
+POOLNOBJ0 = $(POOLN:<=w3i3m9\we\)
 POOLNOBJ = $(POOLNOBJ0:>=.obj)
-TESTLIBOBJ0 = $(TESTLIB:<=w3i3mv\we\)
+TESTLIBOBJ0 = $(TESTLIB:<=w3i3m9\we\)
 TESTLIBOBJ = $(TESTLIBOBJ0:>=.obj)
 
 #!ELSEIF "$(VARIETY)" == "cv"
 #CFLAGS=$(CFLAGSCOMMON) $(CFCV)
 #LINKFLAGS=$(LINKFLAGSCOMMON) $(LFCV)
 #LIBFLAGS=$(LIBFLAGSCOMMON) $(LIBFLAGSCV)
-#MPMOBJ0 = $(MPM:<=w3i3mv\cv\)
+#MPMOBJ0 = $(MPM:<=w3i3m9\cv\)
 #MPMOBJ = $(MPMOBJ0:>=.obj)
-#PLINTHOBJ0 = $(PLINTH:<=w3i3mv\cv\)
+#PLINTHOBJ0 = $(PLINTH:<=w3i3m9\cv\)
 #PLINTHOBJ = $(PLINTHOBJ0:>=.obj)
-#AMSOBJ0 = $(AMS:<=w3i3mv\cv\)
+#AMSOBJ0 = $(AMS:<=w3i3m9\cv\)
 #AMSOBJ = $(AMSOBJ0:>=.obj)
-#AMCOBJ0 = $(AMC:<=w3i3mv\cv\)
+#AMCOBJ0 = $(AMC:<=w3i3m9\cv\)
 #AMCOBJ = $(AMCOBJ0:>=.obj)
-#AWLOBJ0 = $(AWL:<=w3i3mv\cv\)
+#AWLOBJ0 = $(AWL:<=w3i3m9\cv\)
 #AWLOBJ = $(AWLOBJ0:>=.obj)
-#LOOBJ0 = $(LO:<=w3i3mv\cv\)
+#LOOBJ0 = $(LO:<=w3i3m9\cv\)
 #LOOBJ = $(LOOBJ0:>=.obj)
-#SNCOBJ0 = $(SNC:<=w3i3mv\cv\)
+#SNCOBJ0 = $(SNC:<=w3i3m9\cv\)
 #SNCOBJ = $(SNCOBJ0:>=.obj)
-#DWOBJ0 = $(DW:<=w3i3mv\cv\)
+#DWOBJ0 = $(DW:<=w3i3m9\cv\)
 #DWOBJ = $(DWOBJ0:>=.obj)
-#POOLNOBJ0 = $(POOLN:<=w3i3mv\cv\)
+#POOLNOBJ0 = $(POOLN:<=w3i3m9\cv\)
 #POOLNOBJ = $(POOLNOBJ0:>=.obj)
-#TESTLIBOBJ0 = $(TESTLIB:<=w3i3mv\cv\)
+#TESTLIBOBJ0 = $(TESTLIB:<=w3i3m9\cv\)
 #TESTLIBOBJ = $(TESTLIBOBJ0:>=.obj)
 
 !ENDIF
@@ -319,7 +331,7 @@ TESTLIBOBJ = $(TESTLIBOBJ0:>=.obj)
 
 # C. COPYRIGHT AND LICENSE
 #
-# Copyright (C) 2001-2002 Ravenbrook Limited <http://www.ravenbrook.com/>.
+# Copyright (C) 2001-2002, 2008 Ravenbrook Limited <http://www.ravenbrook.com/>.
 # All rights reserved.  This is an open source license.  Contact
 # Ravenbrook for commercial licensing options.
 # 
diff --git a/mps/code/w3vc9.bat b/mps/code/w3vc9.bat
index 9282c9f07f1..f418d16cc2a 100755
--- a/mps/code/w3vc9.bat
+++ b/mps/code/w3vc9.bat
@@ -6,73 +6,50 @@
 @rem Copyright (C) 2005-2008 Ravenbrook Limited.  All rights reserved.
 
 
-@set mpsreleasename=exp-166419
-
-
-rmdir /q/s w3i3mv
-nmake /f w3i3mv.nmk VARIETY=we mps.lib mpsplan.lib mpsplcb.lib mpsdy.dll
-nmake /f w3i3mv.nmk VARIETY=hi mps.lib mpsplan.lib mpsplcb.lib mpsdy.dll
-nmake /f w3i3mv.nmk VARIETY=di mps.lib mpsplan.lib mpsplcb.lib mpsdy.dll
-nmake /f w3i3mv.nmk VARIETY=ci mps.lib mpsplan.lib mpsplcb.lib mpsdy.dll
-
-rmdir /q/s %mpsreleasename%
-mkdir %mpsreleasename%
-
-mkdir %mpsreleasename%\include
-copy mps.h %mpsreleasename%\include
-copy mpsavm.h %mpsreleasename%\include
-copy mpsacl.h %mpsreleasename%\include
-copy mpscamc.h %mpsreleasename%\include
-copy mpscams.h %mpsreleasename%\include
-copy mpscawl.h %mpsreleasename%\include
-copy mpsclo.h %mpsreleasename%\include
-copy mpscmv.h %mpsreleasename%\include
-copy mpscmvff.h %mpsreleasename%\include
-copy mpscsnc.h %mpsreleasename%\include
-copy mpsio.h %mpsreleasename%\include
-copy mpslib.h %mpsreleasename%\include
-copy mpslibcb.h %mpsreleasename%\include
-copy mpstd.h %mpsreleasename%\include
-copy mpsw3.h %mpsreleasename%\include
-copy mpswin.h %mpsreleasename%\include
-
-mkdir %mpsreleasename%\lib
-copy w3gen.def %mpsreleasename%\lib\mps-fns.def
-
-mkdir %mpsreleasename%\lib\w3i3
-
-mkdir %mpsreleasename%\lib\w3i3\we
-@echo we-%mpsreleasename% > %mpsreleasename%\lib\w3i3\we\we-%mpsreleasename%.txt
-copy w3i3mv\we\mps.lib %mpsreleasename%\lib\w3i3\we
-copy w3i3mv\we\mpsplan.lib %mpsreleasename%\lib\w3i3\we
-copy w3i3mv\we\mpsplcb.lib %mpsreleasename%\lib\w3i3\we
-copy w3i3mv\we\mpsdy.dll %mpsreleasename%\lib\w3i3\we
-copy w3i3mv\we\mpsdy.lib %mpsreleasename%\lib\w3i3\we
-
-mkdir %mpsreleasename%\lib\w3i3\hi
-@echo hi-%mpsreleasename% > %mpsreleasename%\lib\w3i3\hi\hi-%mpsreleasename%.txt
-copy w3i3mv\hi\mps.lib %mpsreleasename%\lib\w3i3\hi
-copy w3i3mv\hi\mpsplan.lib %mpsreleasename%\lib\w3i3\hi
-copy w3i3mv\hi\mpsplcb.lib %mpsreleasename%\lib\w3i3\hi
-copy w3i3mv\hi\mpsdy.dll %mpsreleasename%\lib\w3i3\hi
-copy w3i3mv\hi\mpsdy.lib %mpsreleasename%\lib\w3i3\hi
-
-mkdir %mpsreleasename%\lib\w3i3\di
-@echo di-%mpsreleasename% > %mpsreleasename%\lib\w3i3\di\di-%mpsreleasename%.txt
-copy w3i3mv\di\mps.lib %mpsreleasename%\lib\w3i3\di
-copy w3i3mv\di\mpsplan.lib %mpsreleasename%\lib\w3i3\di
-copy w3i3mv\di\mpsplcb.lib %mpsreleasename%\lib\w3i3\di
-copy w3i3mv\di\mpsdy.dll %mpsreleasename%\lib\w3i3\di
-copy w3i3mv\di\mpsdy.lib %mpsreleasename%\lib\w3i3\di
-
-mkdir %mpsreleasename%\lib\w3i3\ci
-@echo ci-%mpsreleasename% > %mpsreleasename%\lib\w3i3\ci\ci-%mpsreleasename%.txt
-copy w3i3mv\ci\mps.lib %mpsreleasename%\lib\w3i3\ci
-copy w3i3mv\ci\mpsplan.lib %mpsreleasename%\lib\w3i3\ci
-copy w3i3mv\ci\mpsplcb.lib %mpsreleasename%\lib\w3i3\ci
-copy w3i3mv\ci\mpsdy.dll %mpsreleasename%\lib\w3i3\ci
-copy w3i3mv\ci\mpsdy.lib %mpsreleasename%\lib\w3i3\ci
-
-mkdir %mpsreleasename%\src
-copy mpsliban.c %mpsreleasename%\src
-copy mpsioan.c %mpsreleasename%\src
+IF DEFINED mpsreleasename (
+@echo "Adding vc9 build into mpsreleasename=%mpsreleasename%"
+) ELSE (
+@echo "Error: mpsreleasename is not defined."
+@echo "You must run w3build.bat first, then run VC9's vcvars32.bat, then run this script."
+exit /b
+)
+
+rmdir /q/s w3i3m9
+nmake /f w3i3m9.nmk VARIETY=we mps.lib mpsplan.lib mpsplcb.lib mpsdy.dll
+nmake /f w3i3m9.nmk VARIETY=hi mps.lib mpsplan.lib mpsplcb.lib mpsdy.dll
+nmake /f w3i3m9.nmk VARIETY=di mps.lib mpsplan.lib mpsplcb.lib mpsdy.dll
+nmake /f w3i3m9.nmk VARIETY=ci mps.lib mpsplan.lib mpsplcb.lib mpsdy.dll
+
+mkdir %mpsreleasename%\lib\w3i3m9
+
+mkdir %mpsreleasename%\lib\w3i3m9\we
+@echo we-%mpsreleasename% > %mpsreleasename%\lib\w3i3m9\we\we-%mpsreleasename%.txt
+copy w3i3m9\we\mps.lib %mpsreleasename%\lib\w3i3m9\we
+copy w3i3m9\we\mpsplan.lib %mpsreleasename%\lib\w3i3m9\we
+copy w3i3m9\we\mpsplcb.lib %mpsreleasename%\lib\w3i3m9\we
+copy w3i3m9\we\mpsdy.dll %mpsreleasename%\lib\w3i3m9\we
+copy w3i3m9\we\mpsdy.lib %mpsreleasename%\lib\w3i3m9\we
+
+mkdir %mpsreleasename%\lib\w3i3m9\hi
+@echo hi-%mpsreleasename% > %mpsreleasename%\lib\w3i3m9\hi\hi-%mpsreleasename%.txt
+copy w3i3m9\hi\mps.lib %mpsreleasename%\lib\w3i3m9\hi
+copy w3i3m9\hi\mpsplan.lib %mpsreleasename%\lib\w3i3m9\hi
+copy w3i3m9\hi\mpsplcb.lib %mpsreleasename%\lib\w3i3m9\hi
+copy w3i3m9\hi\mpsdy.dll %mpsreleasename%\lib\w3i3m9\hi
+copy w3i3m9\hi\mpsdy.lib %mpsreleasename%\lib\w3i3m9\hi
+
+mkdir %mpsreleasename%\lib\w3i3m9\di
+@echo di-%mpsreleasename% > %mpsreleasename%\lib\w3i3m9\di\di-%mpsreleasename%.txt
+copy w3i3m9\di\mps.lib %mpsreleasename%\lib\w3i3m9\di
+copy w3i3m9\di\mpsplan.lib %mpsreleasename%\lib\w3i3m9\di
+copy w3i3m9\di\mpsplcb.lib %mpsreleasename%\lib\w3i3m9\di
+copy w3i3m9\di\mpsdy.dll %mpsreleasename%\lib\w3i3m9\di
+copy w3i3m9\di\mpsdy.lib %mpsreleasename%\lib\w3i3m9\di
+
+mkdir %mpsreleasename%\lib\w3i3m9\ci
+@echo ci-%mpsreleasename% > %mpsreleasename%\lib\w3i3m9\ci\ci-%mpsreleasename%.txt
+copy w3i3m9\ci\mps.lib %mpsreleasename%\lib\w3i3m9\ci
+copy w3i3m9\ci\mpsplan.lib %mpsreleasename%\lib\w3i3m9\ci
+copy w3i3m9\ci\mpsplcb.lib %mpsreleasename%\lib\w3i3m9\ci
+copy w3i3m9\ci\mpsdy.dll %mpsreleasename%\lib\w3i3m9\ci
+copy w3i3m9\ci\mpsdy.lib %mpsreleasename%\lib\w3i3m9\ci