Merge pull request #178 from DOCGroup/elliottc/more_databasesACE+TAO-7_1_0Latest_ACE7TAO3_MinorLatest_ACE7TAO3_Micro

Support for more databases and utilities

13 files changed, 81 insertions, 9 deletions

diff --git a/config/bsoncxx.mpb b/config/bsoncxx.mpb
new file mode 100644
index 00000000..f56b811b
--- /dev/null
+++ b/config/bsoncxx.mpb
@@ -0,0 +1,6 @@
+// -*- MPC -*-
+project: boost_base {
+  includes += $(MONGODB_ROOT)/include/bsoncxx/v_noabi
+  libpaths += $(MONGODB_ROOT)/lib
+  lit_libs += bsoncxx bson-1.0
+}
diff --git a/config/fuerte.mpb b/config/fuerte.mpb
new file mode 100644
index 00000000..8d3d517f
--- /dev/null
+++ b/config/fuerte.mpb
@@ -0,0 +1,7 @@
+// -*- MPC -*-
+project: boost_date_time, openssl, velocypack {
+  macros   += NGHTTP2_STATICLIB
+  includes += $(FUERTE_ROOT)/include
+  libpaths += $(FUERTE_ROOT)/lib
+  lit_libs += fuerte llhttp nghttp2
+}
diff --git a/config/mongodb.mpb b/config/mongodb.mpb
index 104c72a6..74dbdbf8 100644
--- a/config/mongodb.mpb
+++ b/config/mongodb.mpb
@@ -1,7 +1,5 @@
 // -*- MPC -*-
-project: boost_base {
-  includes += $(MONGODB_ROOT)/include/mongocxx/v_noabi \
-              $(MONGODB_ROOT)/include/bsoncxx/v_noabi
-  libpaths += $(MONGODB_ROOT)/lib
-  lit_libs += mongocxx mongoc-1.0 bsoncxx bson-1.0
+project: bsoncxx {
+  includes += $(MONGODB_ROOT)/include/mongocxx/v_noabi
+  lit_libs += mongocxx mongoc-1.0
 }
diff --git a/config/msgpack.mpb b/config/msgpack.mpb
index d5bd71c8..79842f6f 100644
--- a/config/msgpack.mpb
+++ b/config/msgpack.mpb
@@ -1,3 +1,3 @@
-project {
+project: boost_base {
   includes += $(MSGPACK_ROOT)/include
 }
diff --git a/config/objectstore.mpb b/config/objectstore.mpb
new file mode 100644
index 00000000..0455f640
--- /dev/null
+++ b/config/objectstore.mpb
@@ -0,0 +1,22 @@
+// -*- MPC -*-
+project {
+  Define_Custom(Schema) {
+    automatic_in        = 1
+    automatic_out       = 1
+    command             = $(OS_ROOTDIR)/bin/ossg
+    commandflags        = -I $(OS_ROOTDIR)/include \
+                          -asdb <%input_noext%>.adb -asof <%input_noext%>.obj
+    inputext            = .imp
+    generic_outputext   = .obj, .adb
+    keyword schemaflags = commandflags
+  }
+
+  includes += $(OS_ROOTDIR)/include
+  libpaths += $(OS_ROOTDIR)/lib
+  libs     += ostore
+
+  specific(prop:microsoft) {
+    macros += _CRT_SECURE_NO_WARNINGS
+    exceptionhandling = Async
+  }
+}
diff --git a/config/odb_mysql.mpb b/config/odb_mysql.mpb
index 9da902bd..ae7c3721 100644
--- a/config/odb_mysql.mpb
+++ b/config/odb_mysql.mpb
@@ -17,7 +17,7 @@ project: mysql {
 
   macros   += DATABASE_MYSQL LIBODB_MYSQL_INCLUDE_SHORT
   includes += $(ODB_ROOT)
-  libpaths += $(ODB_ROOT)/lib
+  libpaths += $(ODB_ROOT)/lib64 $(ODB_ROOT)/lib
 
   specific(prop:windows) {
     macros += WIN32_LEAN_AND_MEAN
diff --git a/config/op_lite.mpb b/config/op_lite.mpb
new file mode 100644
index 00000000..9dfb607b
--- /dev/null
+++ b/config/op_lite.mpb
@@ -0,0 +1,6 @@
+// -*- MPC -*-
+project: boost_base, msgpack {
+  includes += $(OP_LITE_ROOT)
+  libpaths += $(OP_LITE_ROOT)/lib
+  libs += op_lite
+}
diff --git a/config/rdfox.mpb b/config/rdfox.mpb
new file mode 100644
index 00000000..a718b546
--- /dev/null
+++ b/config/rdfox.mpb
@@ -0,0 +1,10 @@
+// -*- MPC -*-
+project {
+  includes += $(RDFOX_ROOT)/include
+  libpaths += $(RDFOX_ROOT)/lib
+  lit_libs += libRDFox
+
+  specific(prop:microsoft) {
+    exceptionhandling = Async
+  }
+}
diff --git a/config/redisxx.mpb b/config/redisxx.mpb
new file mode 100644
index 00000000..c11c253e
--- /dev/null
+++ b/config/redisxx.mpb
@@ -0,0 +1,12 @@
+// -*- MPC -*-
+project {
+  includes += $(REDIS_ROOT)/include
+  libpaths += $(REDIS_ROOT)/lib
+  lit_libs += redis++
+  libs     += hiredis
+
+  specific(prop:microsoft) {
+    LanguageStandard = stdcpp17
+    DisableSpecificWarnings += 4200
+  }
+}
diff --git a/config/velocypack.mpb b/config/velocypack.mpb
new file mode 100644
index 00000000..31fc0d5d
--- /dev/null
+++ b/config/velocypack.mpb
@@ -0,0 +1,10 @@
+// -*- MPC -*-
+project {
+  includes += $(VELOCYPACK_ROOT)/include
+  libpaths += $(VELOCYPACK_ROOT)/lib
+  lit_libs += velocypack
+
+  specific(prop:microsoft) {
+    LanguageStandard = stdcpp20
+  }
+}
diff --git a/docs/templates/vc10.txt b/docs/templates/vc10.txt
index 861880a6..85a7535b 100644
--- a/docs/templates/vc10.txt
+++ b/docs/templates/vc10.txt
@@ -21,6 +21,7 @@ clrimagetype = Sets the type of a CLR image (ForceIJWImage, ForcePureILImage, Fo
 clrsupportlasterror = Preserve Last Error Code for PInvoke Calls (Enabled = default, Disabled, SystemDlls).
 clrthreadattribute = Explicitly specify the threading attribute for the entry point of your CLR program (MTAThreadingAttribute, STAThreadingAttribute).
 clrunmanagedcodecheck = Specifies whether the linker will apply SuppressUnmanagedCodeSecurityAttribute to linker-generated PInvoke calls from managed code into native DLLs.
+codeanalysisruleset = Specifies the code analysis ruleset file for the project.
 common_defines = Specifies macros that are common to all target types.
 compileas = Override default C or C++ selection (CompileAsC, CompileAsCpp).
 compileasmanaged = Use this only if you need to explicitly set the MSBuild XML CompileAsManaged tag.  Otherwise use MPC's built-in keyword for "managed".
diff --git a/modules/Version.pm b/modules/Version.pm
index 7de326a6..a038748d 100644
--- a/modules/Version.pm
+++ b/modules/Version.pm
@@ -18,7 +18,7 @@ use File::Spec;
 # ************************************************************
 
 ## This is the starting major and minor version
-my $version = '5.0';
+my $version = '5.1';
 my $once    = 1;
 my $cache   = 'modules/.version';
 
diff --git a/templates/vc10.mpd b/templates/vc10.mpd
index 7c4358c2..a5b4d17f 100644
--- a/templates/vc10.mpd
+++ b/templates/vc10.mpd
@@ -115,7 +115,7 @@
 <%endif%>
 <%endif%>
 <%endif%>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='<%configuration%>|<%platform%>'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='<%configuration%>|<%platform%>'"><%CodeAnalysisRuleSet("AllRules.ruleset")%></CodeAnalysisRuleSet>
     <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='<%configuration%>|<%platform%>'" />
     <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='<%configuration%>|<%platform%>'" />
 <%if(ReferencePath)%>