Skip to content

Commit

Permalink
Merge pull request #178 from DOCGroup/elliottc/more_databases
Browse files Browse the repository at this point in the history
Support for more databases and utilities
  • Loading branch information
ocielliottc authored Feb 17, 2023
2 parents 33c20e2 + 92be644 commit 2ba2603
Show file tree
Hide file tree
Showing 13 changed files with 81 additions and 9 deletions.
6 changes: 6 additions & 0 deletions config/bsoncxx.mpb
Original file line number Diff line number Diff line change
@@ -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
}
7 changes: 7 additions & 0 deletions config/fuerte.mpb
Original file line number Diff line number Diff line change
@@ -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
}
8 changes: 3 additions & 5 deletions config/mongodb.mpb
Original file line number Diff line number Diff line change
@@ -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
}
2 changes: 1 addition & 1 deletion config/msgpack.mpb
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
project {
project: boost_base {
includes += $(MSGPACK_ROOT)/include
}
22 changes: 22 additions & 0 deletions config/objectstore.mpb
Original file line number Diff line number Diff line change
@@ -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
}
}
2 changes: 1 addition & 1 deletion config/odb_mysql.mpb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 6 additions & 0 deletions config/op_lite.mpb
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
// -*- MPC -*-
project: boost_base, msgpack {
includes += $(OP_LITE_ROOT)
libpaths += $(OP_LITE_ROOT)/lib
libs += op_lite
}
10 changes: 10 additions & 0 deletions config/rdfox.mpb
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
// -*- MPC -*-
project {
includes += $(RDFOX_ROOT)/include
libpaths += $(RDFOX_ROOT)/lib
lit_libs += libRDFox

specific(prop:microsoft) {
exceptionhandling = Async
}
}
12 changes: 12 additions & 0 deletions config/redisxx.mpb
Original file line number Diff line number Diff line change
@@ -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
}
}
10 changes: 10 additions & 0 deletions config/velocypack.mpb
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
// -*- MPC -*-
project {
includes += $(VELOCYPACK_ROOT)/include
libpaths += $(VELOCYPACK_ROOT)/lib
lit_libs += velocypack

specific(prop:microsoft) {
LanguageStandard = stdcpp20
}
}
1 change: 1 addition & 0 deletions docs/templates/vc10.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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".
Expand Down
2 changes: 1 addition & 1 deletion modules/Version.pm
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
2 changes: 1 addition & 1 deletion templates/vc10.mpd
Original file line number Diff line number Diff line change
Expand Up @@ -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)%>
Expand Down

0 comments on commit 2ba2603

Please sign in to comment.