Skip to content

Commit 44fde75

Browse files
simonmcqueensimonmcqueen
committed
Merge branch 'master' of github.com:simonmcqueen/MPC into upstream_master
2 parents 6e56ef8 + 0a3d00b commit 44fde75

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+1550
-590
lines changed

‎.github/workflows/windows.yml

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -27,31 +27,31 @@ jobs:
2727
BuildConfiguration: Debug
2828
vcpkgarch: x64-windows
2929
vcpkglibdir: debug/lib
30-
vcpkgpackages: openssl xerces-c zlib
30+
vcpkgpackages: '"openssl", "xerces-c", "zlib"'
3131
- name: VS2019Release32
3232
vmimage: windows-2019
3333
mpctype: vs2019
3434
BuildPlatform: Win32
3535
BuildConfiguration: Release
3636
vcpkgarch: x86-windows
3737
vcpkglibdir: lib
38-
vcpkgpackages: openssl xerces-c zlib
38+
vcpkgpackages: '"openssl", "xerces-c", "zlib"'
3939
- name: VS2022Debug64
4040
vmimage: windows-2022
4141
mpctype: vs2022
4242
BuildPlatform: x64
4343
BuildConfiguration: Debug
4444
vcpkgarch: x64-windows
4545
vcpkglibdir: debug/lib
46-
vcpkgpackages: openssl xerces-c zlib
46+
vcpkgpackages: '"openssl", "xerces-c", "zlib"'
4747
- name: VS2022Release32
4848
vmimage: windows-2022
4949
mpctype: vs2022
5050
BuildPlatform: Win32
5151
BuildConfiguration: Release
5252
vcpkgarch: x86-windows
5353
vcpkglibdir: lib
54-
vcpkgpackages: openssl xerces-c zlib
54+
vcpkgpackages: '"openssl", "xerces-c", "zlib"'
5555
runs-on: ${{ matrix.vmimage }}
5656
name: ${{ matrix.name }}
5757
env:
@@ -60,12 +60,14 @@ jobs:
6060
TAO_ROOT: ${{ github.workspace }}/ACE_TAO/TAO
6161
MPC_ROOT: ${{ github.workspace }}/
6262
VCPKG_ROOT: ${{ github.workspace }}/vcpkg
63-
XERCESC_INCDIR: ${{ github.workspace }}/vcpkg/installed/${{ matrix.vcpkgarch }}/include
64-
XERCESC_LIBDIR: ${{ github.workspace }}/vcpkg/installed/${{ matrix.vcpkgarch }}/${{ matrix.vcpkglibdir }}
65-
SSL_INCDIR: ${{ github.workspace }}/vcpkg/installed/${{ matrix.vcpkgarch }}/include
66-
SSL_LIBDIR: ${{ github.workspace }}/vcpkg/installed/${{ matrix.vcpkgarch }}/${{ matrix.vcpkglibdir }}
67-
ZLIB_INCDIR: ${{ github.workspace }}/vcpkg/installed/${{ matrix.vcpkgarch }}/include
68-
ZLIB_LIBDIR: ${{ github.workspace }}/vcpkg/installed/${{ matrix.vcpkgarch }}/${{ matrix.vcpkglibdir }}
63+
XERCESC_INCDIR: ${{ github.workspace }}/vcpkg_installed/${{ matrix.vcpkgarch }}/include
64+
XERCESC_LIBDIR: ${{ github.workspace }}/vcpkg_installed/${{ matrix.vcpkgarch }}/${{ matrix.vcpkglibdir }}
65+
SSL_INCDIR: ${{ github.workspace }}/vcpkg_installed/${{ matrix.vcpkgarch }}/include
66+
SSL_LIBDIR: ${{ github.workspace }}/vcpkg_installed/${{ matrix.vcpkgarch }}/${{ matrix.vcpkglibdir }}
67+
ZLIB_INCDIR: ${{ github.workspace }}/vcpkg_installed/${{ matrix.vcpkgarch }}/include
68+
ZLIB_LIBDIR: ${{ github.workspace }}/vcpkg_installed/${{ matrix.vcpkgarch }}/${{ matrix.vcpkglibdir }}
69+
VCPKG_DEFAULT_TRIPLET: ${{ matrix.vcpkgarch }}
70+
VCPKG_INSTALLED_DIR: ${{ github.workspace }}/vcpkg_installed
6971
steps:
7072
- name: checkout MPC
7173
uses: actions/checkout@v3
@@ -74,13 +76,16 @@ jobs:
7476
with:
7577
repository: DOCGroup/ACE_TAO
7678
path: ${{ env.DOC_ROOT }}
79+
- name: create vcpkg.json
80+
run: |
81+
'{"name": "tao","version-string": "githubaction","dependencies": [ ${{ matrix.vcpkgpackages }} ]}' > vcpkg.json
82+
shell: pwsh
7783
- name: Install vcpkg
78-
uses: lukka/run-vcpkg@v7
84+
uses: lukka/run-vcpkg@v10
7985
with:
80-
vcpkgGitCommitId: b86c0c35b88e2bf3557ff49dc831689c2f085090
81-
vcpkgArguments: --recurse ${{ matrix.vcpkgpackages }}
82-
vcpkgTriplet: ${{ matrix.vcpkgarch }}
86+
vcpkgGitCommitId: 94ce0dab56f4d8ba6bd631ba59ed682b02d45c46
8387
appendedCacheKey: ${{ matrix.name }}
88+
runVcpkgInstall: true
8489
- name: create $ACE_ROOT/ace/config.h
8590
run: |
8691
'#include "ace/config-win32.h"' > ${env:ACE_ROOT}/ace/config.h

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
modules/.version

‎MPC.ico

0 Bytes
Binary file not shown.

‎PROBLEM-REPORT-FORM

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,6 @@ Documentation for MPC can be found at the following location.
44

55
Please consult the documentation to ensure that you are using MPC correctly.
66

7-
If you are still having a problem getting MPC to do what you want, please
8-
consult the FAQ before sending a support request.
9-
10-
http://www.ociweb.com/products/mpc/mpc-faq
11-
127
When requesting MPC support please provide the following items:
138

149
MPC version (using mwc.pl -version):
@@ -25,6 +20,7 @@ When requesting MPC support please provide the following items:
2520

2621
Problem description (please be as detailed as possible):
2722

28-
Finally, send support requests to [email protected]. You may send
29-
questions to the author ([email protected]), but a response is not
30-
guaranteed.
23+
Please go to
24+
https://objectcomputing.com/products/opendds/opendds-consulting-and-support
25+
for commercial support. Go to https://github.com/DOCGroup/MPC/issues for
26+
community support.

‎config/bsoncxx.mpb

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
// -*- MPC -*-
2+
project: boost_base {
3+
includes += $(MONGODB_ROOT)/include/bsoncxx/v_noabi
4+
libpaths += $(MONGODB_ROOT)/lib
5+
lit_libs += bsoncxx bson-1.0
6+
}

‎config/fuerte.mpb

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
// -*- MPC -*-
2+
project: boost_date_time, openssl, velocypack {
3+
macros += NGHTTP2_STATICLIB
4+
includes += $(FUERTE_ROOT)/include
5+
libpaths += $(FUERTE_ROOT)/lib
6+
lit_libs += fuerte llhttp nghttp2
7+
}

‎config/mongodb.mpb

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
// -*- MPC -*-
2+
project: bsoncxx {
3+
includes += $(MONGODB_ROOT)/include/mongocxx/v_noabi
4+
lit_libs += mongocxx mongoc-1.0
5+
}

‎config/msgpack.mpb

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
project: boost_base {
2+
includes += $(MSGPACK_ROOT)/include
3+
}

‎config/mysql.mpb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// -*- MPC -*-
22
project {
3-
includes += $(MYSQL_ROOT)/include/mysql
4-
libpaths += $(MYSQL_ROOT)/lib/mysql
3+
includes += $(MYSQL_ROOT)/include $(MYSQL_ROOT)/include/mysql
4+
libpaths += $(MYSQL_ROOT)/lib $(MYSQL_ROOT)/lib/mysql
55
lit_libs += mysqlclient
66
}

‎config/objectbox.mpb

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
// -*- MPC -*-
2+
project {
3+
Define_Custom(objectbox) {
4+
command = $(OBJECTBOX_ROOT)/bin/objectbox-generator
5+
commandflags = -cpp
6+
pch_postrule = 1
7+
inputext = .fbs
8+
pre_extension = .obx
9+
source_outputext = .cpp
10+
header_outputext = .hpp
11+
}
12+
13+
includes += $(OBJECTBOX_ROOT)/include
14+
libpaths += $(OBJECTBOX_ROOT)/lib
15+
lit_libs += objectbox
16+
}

0 commit comments

Comments
 (0)