mps master (integ from br/padding): job002148 -- correct w3gen.def:

Drop mps_lib_callback_register from w3gen.def, and put it in new file mpslibcb.def, used only when building the MPS DLL (rule in commpost.nmk) which contains the mpslibcb stuff.  Correct expgen.sh accordingly (even though it's not working).  So mps-fns.def (produced by w3build.bat by copying w3gen.def) is now correct for Configura to use to re-export MPS functions static linked into a larger executable, and mpsdy.dll still correctly exports the mps_lib_callback_register function.

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

mps/code/commpost.nmk

@@ -272,9 +272,11 @@ $(PFM)\$(VARIETY)\mps.lib: $(MPMOBJ) $(AMCOBJ) $(LOOBJ) $(SNCOBJ) \
 # about the repetition of the object list.
 $(PFM)\$(VARIETY)\mpsdy.dll: $(PFM)\$(VARIETY)\mpslibcb.obj \
 	$(MPMOBJ) $(AMCOBJ) $(LOOBJ) $(SNCOBJ) \
-	$(MVFFOBJ) $(AMSOBJ) $(AWLOBJ) w3gen.def 
+	$(MVFFOBJ) $(AMSOBJ) $(AWLOBJ) w3gen.def \
+	mpslibcb.def
 	$(ECHO) $@
-	$(LINKER) $(LINKFLAGS) /def:w3gen.def /dll /OUT:$@ \
+	$(LINKER) $(LINKFLAGS) /def:w3gen.def \
+	  /def:mpslibcb.def /dll /OUT:$@ \
 	  $(PFM)\$(VARIETY)\mpslibcb.obj \
 	  $(MPMOBJ) $(AMCOBJ) $(LOOBJ) $(SNCOBJ) \
 	  $(MVFFOBJ) $(AMSOBJ) $(AWLOBJ)

mps/code/expgen.sh

@@ -117,7 +117,8 @@ tu () {
 # followed by manual removal of mpsw3.h mpswin.h (which gcc on UNIX
 # cannot parse).  Also removed are mpsio.h mpslib.h as they defined
 # interfaces that mps _uses_ not defines.  Also removed is mpscmvff.h as
-# it does not get included in mps.lib
+# it does not get included in mps.lib.  Also removed is mpslibcb.h, 
+# which now has its own mpslibcb.def file (job002148).
 # The functions declared in mpsw3.h have to be added to the .def file by
 # hand later in this script.
 f='mps.h
@@ -129,7 +130,6 @@ mpscawl.h
 mpsclo.h
 mpscmv.h
 mpscsnc.h
-mpslibcb.h
 mpstd.h'
 
 tu $f

mps/code/mpslibcb.def

@@ -0,0 +1,10 @@
+; $Header$
+; --- EXTERNAL MPS FUNCTIONS ---
+; This file tells the linker to export the mpslibcb functions from 
+; the MPS DLL.
+; This list is for the w3i3mv platform.
+;
+; This file was extracted by hand from expgen.sh; see MPS job002148.
+EXPORTS
+; mpslibcb.h
+mps_lib_callback_register

mps/code/w3gen.def

@@ -149,8 +149,6 @@ mps_mv_free_size
 mps_class_mv
 ; mpscsnc.h
 mps_class_snc
-; mpslibcb.h
-mps_lib_callback_register
 ; mpstd.h
 ; mpsw3.h - by hand
 mps_SEH_filter