More build/install improvements:

1. Name the command-line tools with the "mps" prefix throughout, for consistency between build and installation.
2. Don't build "mpseventsql.exe" by default on Windows.
3. Instructions for building mpseventsql on the supported platforms.

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

3 files changed, 54 insertions, 54 deletions

diff --git a/mps/code/comm.gmk b/mps/code/comm.gmk
index f0610635ad7..bfdf9a20c7a 100644
--- a/mps/code/comm.gmk
+++ b/mps/code/comm.gmk
@@ -71,10 +71,10 @@ endif
 
 # EXTRA TARGETS
 #
-# Don't build eventsql by default (might not have sqlite3 installed),
-# but do build eventcnv and eventtxt.
+# Don't build mpseventsql by default (might not have sqlite3 installed),
+# but do build mpseventcnv and mpseventtxt.
 
-EXTRA_TARGETS ?= eventcnv eventtxt
+EXTRA_TARGETS ?= mpseventcnv mpseventtxt
 
 
 #
@@ -433,13 +433,13 @@ $(PFM)/$(VARIETY)/zcoll: $(PFM)/$(VARIETY)/zcoll.o \
 $(PFM)/$(VARIETY)/zmess: $(PFM)/$(VARIETY)/zmess.o \
         $(FMTDYTSTOBJ) $(TESTLIBOBJ) $(PFM)/$(VARIETY)/mps.a
 
-$(PFM)/$(VARIETY)/eventcnv: $(PFM)/$(VARIETY)/eventcnv.o \
+$(PFM)/$(VARIETY)/mpseventcnv: $(PFM)/$(VARIETY)/eventcnv.o \
   $(PFM)/$(VARIETY)/eventpro.o $(PFM)/$(VARIETY)/mps.a
 
-$(PFM)/$(VARIETY)/eventtxt: $(PFM)/$(VARIETY)/eventtxt.o \
+$(PFM)/$(VARIETY)/mpseventtxt: $(PFM)/$(VARIETY)/eventtxt.o \
   $(PFM)/$(VARIETY)/mps.a
 
-$(PFM)/$(VARIETY)/eventsql: $(PFM)/$(VARIETY)/eventsql.o \
+$(PFM)/$(VARIETY)/mpseventsql: $(PFM)/$(VARIETY)/eventsql.o \
   $(PFM)/$(VARIETY)/mps.a
 
 $(PFM)/$(VARIETY)/replay: $(PFM)/$(VARIETY)/replay.o \
@@ -542,7 +542,7 @@ $(PFM)/$(VARIETY)/%:
         $(ECHO) "$(PFM): $@"
         $(CC) $(CFLAGS) $(LINKFLAGS) -o $@ $^ $(LIBS)
 
-$(PFM)/$(VARIETY)/eventsql:
+$(PFM)/$(VARIETY)/mpseventsql:
         $(ECHO) "$(PFM): $@"
         $(CC) $(CFLAGS) $(LINKFLAGS) -o $@ $^ $(LIBS) -lsqlite3
 
diff --git a/mps/code/commpost.nmk b/mps/code/commpost.nmk
index 51170f6dc42..793ec8e6035 100644
--- a/mps/code/commpost.nmk
+++ b/mps/code/commpost.nmk
@@ -19,7 +19,7 @@ all: mpmss.exe amcss.exe amsss.exe amssshe.exe segsmss.exe awlut.exe awluthe.exe
      arenacv.exe bttest.exe teletest.exe \
      abqtest.exe cbstest.exe btcv.exe mv2test.exe messtest.exe steptest.exe \
      locbwcss.exe locusss.exe zcoll.exe zmess.exe \
-     eventcnv.exe eventtxt.exe eventsql.exe \
+     mpseventcnv.exe mpseventtxt.exe \
      mps.lib
 
 
@@ -37,7 +37,7 @@ mpmss.exe amcss.exe amcsshe.exe amsss.exe amssshe.exe segsmss.exe awlut.exe awlu
      abqtest.exe cbstest.exe btcv.exe mv2test.exe messtest.exe steptest.exe \
      walkt0.exe locbwcss.exe locusss.exe \
      exposet0.exe zcoll.exe zmess.exe \
-     replay.exe replaysw.exe eventcnv.exe eventtxt.exe eventsql.exe \
+     replay.exe replaysw.exe mpseventcnv.exe mpseventtxt.exe mpseventsql.exe \
      mps.lib:
 !IFDEF VARIETY
         $(MAKE) /nologo /f $(PFM).nmk TARGET=$@ variety
@@ -231,13 +231,13 @@ $(PFM)\$(VARIETY)\zmess.exe: $(PFM)\$(VARIETY)\zmess.obj \
         $(PFM)\$(VARIETY)\mps.lib $(FMTTESTOBJ) \
         $(TESTLIBOBJ)
 
-$(PFM)\$(VARIETY)\eventcnv.exe: $(PFM)\$(VARIETY)\eventcnv.obj \
+$(PFM)\$(VARIETY)\mpseventcnv.exe: $(PFM)\$(VARIETY)\eventcnv.obj \
         $(PFM)\$(VARIETY)\eventpro.obj $(PFM)\$(VARIETY)\mps.lib
 
-$(PFM)\$(VARIETY)\eventtxt.exe: $(PFM)\$(VARIETY)\eventtxt.obj \
+$(PFM)\$(VARIETY)\mpseventtxt.exe: $(PFM)\$(VARIETY)\eventtxt.obj \
         $(PFM)\$(VARIETY)\mps.lib
 
-$(PFM)\$(VARIETY)\eventsql.exe: $(PFM)\$(VARIETY)\eventsql.obj \
+$(PFM)\$(VARIETY)\mpseventsql.exe: $(PFM)\$(VARIETY)\eventsql.obj \
         $(PFM)\$(VARIETY)\sqlite3.obj $(PFM)\$(VARIETY)\mps.lib
 
 $(PFM)\$(VARIETY)\replay.exe: $(PFM)\$(VARIETY)\replay.obj \
diff --git a/mps/code/mps.xcodeproj/project.pbxproj b/mps/code/mps.xcodeproj/project.pbxproj
index 08b81eb2752..00ed384e6ee 100644
--- a/mps/code/mps.xcodeproj/project.pbxproj
+++ b/mps/code/mps.xcodeproj/project.pbxproj
@@ -207,14 +207,14 @@
                         containerPortal = 31EEABDA156AAE9E00714D05 /* Project object */;
                         proxyType = 1;
                         remoteGlobalIDString = 2D604B9B16514B1A003AAF46;
-                        remoteInfo = eventtxt;
+                        remoteInfo = mpseventtxt;
                 };
                 2D07B9781636FCBD00DB751B /* PBXContainerItemProxy */ = {
                         isa = PBXContainerItemProxy;
                         containerPortal = 31EEABDA156AAE9E00714D05 /* Project object */;
                         proxyType = 1;
                         remoteGlobalIDString = 2D07B9701636FC9900DB751B;
-                        remoteInfo = eventsql;
+                        remoteInfo = mpseventsql;
                 };
                 3104AFC0156D35AE000A585A /* PBXContainerItemProxy */ = {
                         isa = PBXContainerItemProxy;
@@ -529,7 +529,7 @@
                         containerPortal = 31EEABDA156AAE9E00714D05 /* Project object */;
                         proxyType = 1;
                         remoteGlobalIDString = 3114A6C5156E9815001E0AA3;
-                        remoteInfo = eventcnv;
+                        remoteInfo = mpseventcnv;
                 };
                 31A47BA9156C210D0039B1C2 /* PBXContainerItemProxy */ = {
                         isa = PBXContainerItemProxy;
@@ -938,9 +938,9 @@
 
 /* Begin PBXFileReference section */
                 2D07B96C1636FC7200DB751B /* eventsql.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = eventsql.c; sourceTree = "<group>"; };
-                2D07B9711636FC9900DB751B /* eventsql */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = eventsql; sourceTree = BUILT_PRODUCTS_DIR; };
+                2D07B9711636FC9900DB751B /* mpseventsql */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = mpseventsql; sourceTree = BUILT_PRODUCTS_DIR; };
                 2D07B97B163705E400DB751B /* libsqlite3.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libsqlite3.dylib; path = usr/lib/libsqlite3.dylib; sourceTree = SDKROOT; };
-                2D604B9C16514B1A003AAF46 /* eventtxt */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = eventtxt; sourceTree = BUILT_PRODUCTS_DIR; };
+                2D604B9C16514B1A003AAF46 /* mpseventtxt */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = mpseventtxt; sourceTree = BUILT_PRODUCTS_DIR; };
                 2D604BA416514C4F003AAF46 /* eventtxt.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = eventtxt.c; sourceTree = "<group>"; };
                 3104AFA5156D27E7000A585A /* ssixi6.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ssixi6.c; sourceTree = "<group>"; };
                 3104AFB3156D357B000A585A /* apss */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = apss; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -982,7 +982,7 @@
                 3114A69F156E9725001E0AA3 /* messtest.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = messtest.c; sourceTree = "<group>"; };
                 3114A6AC156E9759001E0AA3 /* walkt0 */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = walkt0; sourceTree = BUILT_PRODUCTS_DIR; };
                 3114A6BA156E9768001E0AA3 /* walkt0.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = walkt0.c; sourceTree = "<group>"; };
-                3114A6C6156E9815001E0AA3 /* eventcnv */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = eventcnv; sourceTree = BUILT_PRODUCTS_DIR; };
+                3114A6C6156E9815001E0AA3 /* mpseventcnv */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = mpseventcnv; sourceTree = BUILT_PRODUCTS_DIR; };
                 3114A6D0156E9829001E0AA3 /* eventcnv.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = eventcnv.c; sourceTree = "<group>"; };
                 3114A6D9156E9950001E0AA3 /* eventpro.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = eventpro.c; sourceTree = "<group>"; };
                 3124CAB8156BE3EC00753214 /* awlut */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = awlut; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -1335,20 +1335,20 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
-                2D07B96A1636FC4C00DB751B /* eventsql */ = {
+                2D07B96A1636FC4C00DB751B /* mpseventsql */ = {
                         isa = PBXGroup;
                         children = (
                                 2D07B96C1636FC7200DB751B /* eventsql.c */,
                         );
-                        name = eventsql;
+                        name = mpseventsql;
                         sourceTree = "<group>";
                 };
-                2D604B971651433C003AAF46 /* eventtxt */ = {
+                2D604B971651433C003AAF46 /* mpseventtxt */ = {
                         isa = PBXGroup;
                         children = (
                                 2D604BA416514C4F003AAF46 /* eventtxt.c */,
                         );
-                        name = eventtxt;
+                        name = mpseventtxt;
                         sourceTree = "<group>";
                 };
                 3114A647156E956C001E0AA3 /* Mysterious */ = {
@@ -1363,20 +1363,20 @@
                 3114A6D6156E9846001E0AA3 /* Tools */ = {
                         isa = PBXGroup;
                         children = (
-                                2D604B971651433C003AAF46 /* eventtxt */,
-                                2D07B96A1636FC4C00DB751B /* eventsql */,
-                                3114A6D8156E9942001E0AA3 /* eventcnv */,
+                                2D604B971651433C003AAF46 /* mpseventtxt */,
+                                2D07B96A1636FC4C00DB751B /* mpseventsql */,
+                                3114A6D8156E9942001E0AA3 /* mpseventcnv */,
                         );
                         name = Tools;
                         sourceTree = "<group>";
                 };
-                3114A6D8156E9942001E0AA3 /* eventcnv */ = {
+                3114A6D8156E9942001E0AA3 /* mpseventcnv */ = {
                         isa = PBXGroup;
                         children = (
                                 3114A6D9156E9950001E0AA3 /* eventpro.c */,
                                 3114A6D0156E9829001E0AA3 /* eventcnv.c */,
                         );
-                        name = eventcnv;
+                        name = mpseventcnv;
                         sourceTree = "<group>";
                 };
                 3124CAB3156BE1B700753214 /* Tests */ = {
@@ -1493,9 +1493,9 @@
                                 3114A67C156E9668001E0AA3 /* mv2test */,
                                 3114A695156E971B001E0AA3 /* messtest */,
                                 3114A6AC156E9759001E0AA3 /* walkt0 */,
-                                3114A6C6156E9815001E0AA3 /* eventcnv */,
-                                2D07B9711636FC9900DB751B /* eventsql */,
-                                2D604B9C16514B1A003AAF46 /* eventtxt */,
+                                3114A6C6156E9815001E0AA3 /* mpseventcnv */,
+                                2D07B9711636FC9900DB751B /* mpseventsql */,
+                                2D604B9C16514B1A003AAF46 /* mpseventtxt */,
                         );
                         name = Products;
                         sourceTree = "<group>";
@@ -1595,9 +1595,9 @@
 /* End PBXHeadersBuildPhase section */
 
 /* Begin PBXNativeTarget section */
-                2D07B9701636FC9900DB751B /* eventsql */ = {
+                2D07B9701636FC9900DB751B /* mpseventsql */ = {
                         isa = PBXNativeTarget;
-                        buildConfigurationList = 2D07B9741636FC9900DB751B /* Build configuration list for PBXNativeTarget "eventsql" */;
+                        buildConfigurationList = 2D07B9741636FC9900DB751B /* Build configuration list for PBXNativeTarget "mpseventsql" */;
                         buildPhases = (
                                 2D07B96D1636FC9900DB751B /* Sources */,
                                 2D07B96E1636FC9900DB751B /* Frameworks */,
@@ -1607,14 +1607,14 @@
                         );
                         dependencies = (
                         );
-                        name = eventsql;
-                        productName = eventsql;
-                        productReference = 2D07B9711636FC9900DB751B /* eventsql */;
+                        name = mpseventsql;
+                        productName = mpseventsql;
+                        productReference = 2D07B9711636FC9900DB751B /* mpseventsql */;
                         productType = "com.apple.product-type.tool";
                 };
-                2D604B9B16514B1A003AAF46 /* eventtxt */ = {
+                2D604B9B16514B1A003AAF46 /* mpseventtxt */ = {
                         isa = PBXNativeTarget;
-                        buildConfigurationList = 2D604BA216514B59003AAF46 /* Build configuration list for PBXNativeTarget "eventtxt" */;
+                        buildConfigurationList = 2D604BA216514B59003AAF46 /* Build configuration list for PBXNativeTarget "mpseventtxt" */;
                         buildPhases = (
                                 2D604B9816514B1A003AAF46 /* Sources */,
                                 2D604B9916514B1A003AAF46 /* Frameworks */,
@@ -1624,9 +1624,9 @@
                         );
                         dependencies = (
                         );
-                        name = eventtxt;
-                        productName = eventtxt;
-                        productReference = 2D604B9C16514B1A003AAF46 /* eventtxt */;
+                        name = mpseventtxt;
+                        productName = mpseventtxt;
+                        productReference = 2D604B9C16514B1A003AAF46 /* mpseventtxt */;
                         productType = "com.apple.product-type.tool";
                 };
                 3104AFB2156D357B000A585A /* apss */ = {
@@ -1971,9 +1971,9 @@
                         productReference = 3114A6AC156E9759001E0AA3 /* walkt0 */;
                         productType = "com.apple.product-type.tool";
                 };
-                3114A6C5156E9815001E0AA3 /* eventcnv */ = {
+                3114A6C5156E9815001E0AA3 /* mpseventcnv */ = {
                         isa = PBXNativeTarget;
-                        buildConfigurationList = 3114A6CD156E9815001E0AA3 /* Build configuration list for PBXNativeTarget "eventcnv" */;
+                        buildConfigurationList = 3114A6CD156E9815001E0AA3 /* Build configuration list for PBXNativeTarget "mpseventcnv" */;
                         buildPhases = (
                                 3114A6C2156E9815001E0AA3 /* Sources */,
                                 3114A6C3156E9815001E0AA3 /* Frameworks */,
@@ -1984,9 +1984,9 @@
                         dependencies = (
                                 3114A6D3156E9834001E0AA3 /* PBXTargetDependency */,
                         );
-                        name = eventcnv;
-                        productName = eventcnv;
-                        productReference = 3114A6C6156E9815001E0AA3 /* eventcnv */;
+                        name = mpseventcnv;
+                        productName = mpseventcnv;
+                        productReference = 3114A6C6156E9815001E0AA3 /* mpseventcnv */;
                         productType = "com.apple.product-type.tool";
                 };
                 3124CAB7156BE3EC00753214 /* awlut */ = {
@@ -2237,9 +2237,9 @@
                                 3114A67B156E9668001E0AA3 /* mv2test */,
                                 3114A694156E971B001E0AA3 /* messtest */,
                                 3114A6AB156E9759001E0AA3 /* walkt0 */,
-                                3114A6C5156E9815001E0AA3 /* eventcnv */,
-                                2D07B9701636FC9900DB751B /* eventsql */,
-                                2D604B9B16514B1A003AAF46 /* eventtxt */,
+                                3114A6C5156E9815001E0AA3 /* mpseventcnv */,
+                                2D07B9701636FC9900DB751B /* mpseventsql */,
+                                2D604B9B16514B1A003AAF46 /* mpseventtxt */,
                         );
                 };
 /* End PBXProject section */
@@ -2595,12 +2595,12 @@
 /* Begin PBXTargetDependency section */
                 22E16A8916C141020090AD9F /* PBXTargetDependency */ = {
                         isa = PBXTargetDependency;
-                        target = 2D604B9B16514B1A003AAF46 /* eventtxt */;
+                        target = 2D604B9B16514B1A003AAF46 /* mpseventtxt */;
                         targetProxy = 22E16A8816C141020090AD9F /* PBXContainerItemProxy */;
                 };
                 2D07B9791636FCBD00DB751B /* PBXTargetDependency */ = {
                         isa = PBXTargetDependency;
-                        target = 2D07B9701636FC9900DB751B /* eventsql */;
+                        target = 2D07B9701636FC9900DB751B /* mpseventsql */;
                         targetProxy = 2D07B9781636FCBD00DB751B /* PBXContainerItemProxy */;
                 };
                 3104AFC1156D35AE000A585A /* PBXTargetDependency */ = {
@@ -2825,7 +2825,7 @@
                 };
                 3114A6D5156E9839001E0AA3 /* PBXTargetDependency */ = {
                         isa = PBXTargetDependency;
-                        target = 3114A6C5156E9815001E0AA3 /* eventcnv */;
+                        target = 3114A6C5156E9815001E0AA3 /* mpseventcnv */;
                         targetProxy = 3114A6D4156E9839001E0AA3 /* PBXContainerItemProxy */;
                 };
                 31A47BAA156C210D0039B1C2 /* PBXTargetDependency */ = {
@@ -3809,7 +3809,7 @@
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
-                2D07B9741636FC9900DB751B /* Build configuration list for PBXNativeTarget "eventsql" */ = {
+                2D07B9741636FC9900DB751B /* Build configuration list for PBXNativeTarget "mpseventsql" */ = {
                         isa = XCConfigurationList;
                         buildConfigurations = (
                                 2D07B9751636FC9900DB751B /* Debug */,
@@ -3819,7 +3819,7 @@
                         defaultConfigurationIsVisible = 0;
                         defaultConfigurationName = Release;
                 };
-                2D604BA216514B59003AAF46 /* Build configuration list for PBXNativeTarget "eventtxt" */ = {
+                2D604BA216514B59003AAF46 /* Build configuration list for PBXNativeTarget "mpseventtxt" */ = {
                         isa = XCConfigurationList;
                         buildConfigurations = (
                                 2D604B9F16514B1A003AAF46 /* Debug */,
@@ -4029,7 +4029,7 @@
                         defaultConfigurationIsVisible = 0;
                         defaultConfigurationName = Release;
                 };
-                3114A6CD156E9815001E0AA3 /* Build configuration list for PBXNativeTarget "eventcnv" */ = {
+                3114A6CD156E9815001E0AA3 /* Build configuration list for PBXNativeTarget "mpseventcnv" */ = {
                         isa = XCConfigurationList;
                         buildConfigurations = (
                                 3114A6CE156E9815001E0AA3 /* Debug */,