Skip to content

Commit 575d10a

Browse files
jmikolajmikola
committed
Merge pull request #841 
2 parents 3ba5f94 + 093fe13 commit 575d10a

File tree

4 files changed

+39
-29
lines changed

4 files changed

+39
-29
lines changed

‎config.m4‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ if test "$PHP_MONGODB" != "no"; then
300300
dnl Generated with: find src/libmongoc/src/libbson/src/jsonsl -name '*.c' -print0 | cut -sz -d / -f 7- | sort -z | tr '\000' ' '
301301
PHP_MONGODB_JSONSL_SOURCES="jsonsl.c"
302302

303-
dnl Generated with: find src/libmongoc/src/mongoc -name '*.c' -print0 | cut -sz -d / -f 5- | sort -z | tr '\000' ' '
303+
dnl Generated with: find src/libmongoc/src/libmongoc/src/mongoc -name '*.c' -print0 | cut -sz -d / -f 7- | sort -z | tr '\000' ' '
304304
PHP_MONGODB_MONGOC_SOURCES="mongoc-apm.c mongoc-array.c mongoc-async.c mongoc-async-cmd.c mongoc-buffer.c mongoc-bulk-operation.c mongoc-change-stream.c mongoc-client.c mongoc-client-pool.c mongoc-client-session.c mongoc-cluster.c mongoc-cluster-cyrus.c mongoc-cluster-gssapi.c mongoc-cluster-sasl.c mongoc-cluster-sspi.c mongoc-cmd.c mongoc-collection.c mongoc-compression.c mongoc-counters.c mongoc-crypto.c mongoc-crypto-cng.c mongoc-crypto-common-crypto.c mongoc-crypto-openssl.c mongoc-cursor-array.c mongoc-cursor.c mongoc-cursor-cmd.c mongoc-cursor-cmd-deprecated.c mongoc-cursor-find.c mongoc-cursor-find-cmd.c mongoc-cursor-find-opquery.c mongoc-cursor-legacy.c mongoc-cyrus.c mongoc-database.c mongoc-find-and-modify.c mongoc-gridfs.c mongoc-gridfs-file.c mongoc-gridfs-file-list.c mongoc-gridfs-file-page.c mongoc-gssapi.c mongoc-handshake.c mongoc-host-list.c mongoc-index.c mongoc-init.c mongoc-libressl.c mongoc-linux-distro-scanner.c mongoc-list.c mongoc-log.c mongoc-matcher.c mongoc-matcher-op.c mongoc-memcmp.c mongoc-openssl.c mongoc-opts.c mongoc-opts-helpers.c mongoc-queue.c mongoc-rand-cng.c mongoc-rand-common-crypto.c mongoc-rand-openssl.c mongoc-read-concern.c mongoc-read-prefs.c mongoc-rpc.c mongoc-sasl.c mongoc-scram.c mongoc-secure-channel.c mongoc-secure-transport.c mongoc-server-description.c mongoc-server-stream.c mongoc-set.c mongoc-socket.c mongoc-ssl.c mongoc-sspi.c mongoc-stream-buffered.c mongoc-stream.c mongoc-stream-file.c mongoc-stream-gridfs.c mongoc-stream-socket.c mongoc-stream-tls.c mongoc-stream-tls-libressl.c mongoc-stream-tls-openssl-bio.c mongoc-stream-tls-openssl.c mongoc-stream-tls-secure-channel.c mongoc-stream-tls-secure-transport.c mongoc-topology.c mongoc-topology-description-apm.c mongoc-topology-description.c mongoc-topology-scanner.c mongoc-uri.c mongoc-util.c mongoc-version-functions.c mongoc-write-command.c mongoc-write-command-legacy.c mongoc-write-concern.c"
305305

306306
dnl Generated with: find src/libmongoc/src/zlib-1.2.11 -maxdepth 1 -name '*.c' -print0 | cut -sz -d / -f 5- | sort -z | tr '\000' ' '
@@ -309,27 +309,27 @@ if test "$PHP_MONGODB" != "no"; then
309309
PHP_MONGODB_ADD_SOURCES([src/libmongoc/src/common/], $PHP_MONGODB_COMMON_SOURCES, $PHP_MONGODB_BUNDLED_CFLAGS)
310310
PHP_MONGODB_ADD_SOURCES([src/libmongoc/src/libbson/src/bson/], $PHP_MONGODB_BSON_SOURCES, $PHP_MONGODB_BUNDLED_CFLAGS)
311311
PHP_MONGODB_ADD_SOURCES([src/libmongoc/src/libbson/src/jsonsl/], $PHP_MONGODB_JSONSL_SOURCES, $PHP_MONGODB_BUNDLED_CFLAGS)
312-
PHP_MONGODB_ADD_SOURCES([src/libmongoc/src/mongoc/], $PHP_MONGODB_MONGOC_SOURCES, $PHP_MONGODB_BUNDLED_CFLAGS)
312+
PHP_MONGODB_ADD_SOURCES([src/libmongoc/src/libmongoc/src/mongoc/], $PHP_MONGODB_MONGOC_SOURCES, $PHP_MONGODB_BUNDLED_CFLAGS)
313313

314314
PHP_MONGODB_ADD_INCLUDE([src/libmongoc/src/common/])
315315
PHP_MONGODB_ADD_INCLUDE([src/libmongoc/src/libbson/src/])
316316
PHP_MONGODB_ADD_INCLUDE([src/libmongoc/src/libbson/src/bson/])
317317
PHP_MONGODB_ADD_INCLUDE([src/libmongoc/src/libbson/src/jsonsl/])
318-
PHP_MONGODB_ADD_INCLUDE([src/libmongoc/src/mongoc/])
318+
PHP_MONGODB_ADD_INCLUDE([src/libmongoc/src/libmongoc/src/mongoc/])
319319

320320
PHP_MONGODB_ADD_BUILD_DIR([src/libmongoc/src/common/])
321321
PHP_MONGODB_ADD_BUILD_DIR([src/libmongoc/src/libbson/src/bson/])
322322
PHP_MONGODB_ADD_BUILD_DIR([src/libmongoc/src/libbson/src/jsonsl/])
323-
PHP_MONGODB_ADD_BUILD_DIR([src/libmongoc/src/mongoc/])
323+
PHP_MONGODB_ADD_BUILD_DIR([src/libmongoc/src/libmongoc/src/mongoc/])
324324

325325
dnl TODO: Use $ext_srcdir if we can move this after PHP_NEW_EXTENSION
326326
ac_config_dir=PHP_EXT_SRCDIR(mongodb)
327327

328328
AC_CONFIG_FILES([
329329
${ac_config_dir}/src/libmongoc/src/libbson/src/bson/bson-config.h
330330
${ac_config_dir}/src/libmongoc/src/libbson/src/bson/bson-version.h
331-
${ac_config_dir}/src/libmongoc/src/mongoc/mongoc-config.h
332-
${ac_config_dir}/src/libmongoc/src/mongoc/mongoc-version.h
331+
${ac_config_dir}/src/libmongoc/src/libmongoc/src/mongoc/mongoc-config.h
332+
${ac_config_dir}/src/libmongoc/src/libmongoc/src/mongoc/mongoc-version.h
333333
])
334334

335335
if test "x$bundled_zlib" = "xyes"; then

‎config.w32‎

Lines changed: 31 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -58,44 +58,50 @@ if (PHP_MONGODB != "no") {
5858
ADD_EXTENSION_DEP("mongodb", "openssl", false);
5959

6060
var PHP_MONGODB_CFLAGS="\
61-
/D BSON_COMPILATION /D MONGOC_COMPILATION /D MONGOC_TRACE \
61+
/D BSON_COMPILATION /D MONGOC_COMPILATION \
6262
/I" + configure_module_dirname + " \
6363
/I" + configure_module_dirname + "/src/BSON \
6464
/I" + configure_module_dirname + "/src/MongoDB \
6565
/I" + configure_module_dirname + "/src/MongoDB/Exception \
6666
/I" + configure_module_dirname + "/src/contrib \
67-
/I" + configure_module_dirname + "/src/libbson/src \
68-
/I" + configure_module_dirname + "/src/libbson/src/bson \
69-
/I" + configure_module_dirname + "/src/libbson/src/yajl \
70-
/I" + configure_module_dirname + "/src/libmongoc/src/mongoc \
67+
/I" + configure_module_dirname + "/src/libmongoc/src/common \
68+
/I" + configure_module_dirname + "/src/libmongoc/src/libbson/src \
69+
/I" + configure_module_dirname + "/src/libmongoc/src/libbson/src/bson \
70+
/I" + configure_module_dirname + "/src/libmongoc/src/libbson/src/jsonsl \
71+
/I" + configure_module_dirname + "/src/libmongoc/src/libmongoc/src/mongoc \
7172
";
7273

7374
// Condense whitespace in CFLAGS
7475
PHP_MONGODB_CFLAGS = PHP_MONGODB_CFLAGS.replace(/\s+/g, ' ');
7576

76-
// Generated with: find src/libbson/src/bson -name '*.c' -print0 | cut -sz -d / -f 5- | sort -z | tr '\000' ' '
77+
// Generated with: find src/libmongoc/src/common -name '*.c' -print0 | cut -sz -d / -f 5- | sort -z | tr '\000' ' '
78+
var PHP_MONGODB_COMMON_SOURCES="common-b64.c"
79+
80+
// Generated with: find src/libmongoc/src/libbson/src/bson -name '*.c' -print0 | cut -sz -d / -f 7- | sort -z | tr '\000' ' '
7781
var PHP_MONGODB_BSON_SOURCES="bcon.c bson-atomic.c bson.c bson-clock.c bson-context.c bson-decimal128.c bson-error.c bson-iso8601.c bson-iter.c bson-json.c bson-keys.c bson-md5.c bson-memory.c bson-oid.c bson-reader.c bson-string.c bson-timegm.c bson-utf8.c bson-value.c bson-version-functions.c bson-writer.c";
7882

79-
// Generated with: find src/libbson/src/jsonsl -name '*.c' -print0 | cut -sz -d / -f 5- | sort -z | tr '\000' ' '
83+
// Generated with: find src/libmongoc/src/libbson/src/jsonsl -name '*.c' -print0 | cut -sz -d / -f 7- | sort -z | tr '\000' ' '
8084
var PHP_MONGODB_JSONSL_SOURCES="jsonsl.c";
8185

82-
// Generated with: find src/libmongoc/src/mongoc -name '*.c' -print0 | cut -sz -d / -f 4- | sort -z | tr '\000' ' '
83-
var PHP_MONGODB_MONGOC_SOURCES="mongoc-apm.c mongoc-array.c mongoc-async.c mongoc-async-cmd.c mongoc-b64.c mongoc-buffer.c mongoc-bulk-operation.c mongoc-change-stream.c mongoc-client.c mongoc-client-pool.c mongoc-client-session.c mongoc-cluster.c mongoc-cluster-cyrus.c mongoc-cluster-gssapi.c mongoc-cluster-sasl.c mongoc-cluster-sspi.c mongoc-cmd.c mongoc-collection.c mongoc-compression.c mongoc-counters.c mongoc-crypto.c mongoc-crypto-cng.c mongoc-crypto-common-crypto.c mongoc-crypto-openssl.c mongoc-cursor-array.c mongoc-cursor.c mongoc-cursor-cursorid.c mongoc-cursor-transform.c mongoc-cyrus.c mongoc-database.c mongoc-find-and-modify.c mongoc-gridfs.c mongoc-gridfs-file.c mongoc-gridfs-file-list.c mongoc-gridfs-file-page.c mongoc-gssapi.c mongoc-handshake.c mongoc-host-list.c mongoc-index.c mongoc-init.c mongoc-libressl.c mongoc-linux-distro-scanner.c mongoc-list.c mongoc-log.c mongoc-matcher.c mongoc-matcher-op.c mongoc-memcmp.c mongoc-openssl.c mongoc-queue.c mongoc-rand-cng.c mongoc-rand-common-crypto.c mongoc-rand-openssl.c mongoc-read-concern.c mongoc-read-prefs.c mongoc-rpc.c mongoc-sasl.c mongoc-scram.c mongoc-secure-channel.c mongoc-secure-transport.c mongoc-server-description.c mongoc-server-stream.c mongoc-set.c mongoc-socket.c mongoc-ssl.c mongoc-sspi.c mongoc-stream-buffered.c mongoc-stream.c mongoc-stream-file.c mongoc-stream-gridfs.c mongoc-stream-socket.c mongoc-stream-tls.c mongoc-stream-tls-libressl.c mongoc-stream-tls-openssl-bio.c mongoc-stream-tls-openssl.c mongoc-stream-tls-secure-channel.c mongoc-stream-tls-secure-transport.c mongoc-topology.c mongoc-topology-description-apm.c mongoc-topology-description.c mongoc-topology-scanner.c mongoc-uri.c mongoc-util.c mongoc-version-functions.c mongoc-write-command.c mongoc-write-command-legacy.c mongoc-write-concern.c";
86+
// Generated with: find src/libmongoc/src/libmongoc/src/mongoc -name '*.c' -print0 | cut -sz -d / -f 7- | sort -z | tr '\000' ' '
87+
var PHP_MONGODB_MONGOC_SOURCES="mongoc-apm.c mongoc-array.c mongoc-async.c mongoc-async-cmd.c mongoc-buffer.c mongoc-bulk-operation.c mongoc-change-stream.c mongoc-client.c mongoc-client-pool.c mongoc-client-session.c mongoc-cluster.c mongoc-cluster-cyrus.c mongoc-cluster-gssapi.c mongoc-cluster-sasl.c mongoc-cluster-sspi.c mongoc-cmd.c mongoc-collection.c mongoc-compression.c mongoc-counters.c mongoc-crypto.c mongoc-crypto-cng.c mongoc-crypto-common-crypto.c mongoc-crypto-openssl.c mongoc-cursor-array.c mongoc-cursor.c mongoc-cursor-cmd.c mongoc-cursor-cmd-deprecated.c mongoc-cursor-find.c mongoc-cursor-find-cmd.c mongoc-cursor-find-opquery.c mongoc-cursor-legacy.c mongoc-cyrus.c mongoc-database.c mongoc-find-and-modify.c mongoc-gridfs.c mongoc-gridfs-file.c mongoc-gridfs-file-list.c mongoc-gridfs-file-page.c mongoc-gssapi.c mongoc-handshake.c mongoc-host-list.c mongoc-index.c mongoc-init.c mongoc-libressl.c mongoc-linux-distro-scanner.c mongoc-list.c mongoc-log.c mongoc-matcher.c mongoc-matcher-op.c mongoc-memcmp.c mongoc-openssl.c mongoc-opts.c mongoc-opts-helpers.c mongoc-queue.c mongoc-rand-cng.c mongoc-rand-common-crypto.c mongoc-rand-openssl.c mongoc-read-concern.c mongoc-read-prefs.c mongoc-rpc.c mongoc-sasl.c mongoc-scram.c mongoc-secure-channel.c mongoc-secure-transport.c mongoc-server-description.c mongoc-server-stream.c mongoc-set.c mongoc-socket.c mongoc-ssl.c mongoc-sspi.c mongoc-stream-buffered.c mongoc-stream.c mongoc-stream-file.c mongoc-stream-gridfs.c mongoc-stream-socket.c mongoc-stream-tls.c mongoc-stream-tls-libressl.c mongoc-stream-tls-openssl-bio.c mongoc-stream-tls-openssl.c mongoc-stream-tls-secure-channel.c mongoc-stream-tls-secure-transport.c mongoc-topology.c mongoc-topology-description-apm.c mongoc-topology-description.c mongoc-topology-scanner.c mongoc-uri.c mongoc-util.c mongoc-version-functions.c mongoc-write-command.c mongoc-write-command-legacy.c mongoc-write-concern.c";
8488

8589
EXTENSION("mongodb", "php_phongo.c phongo_compat.c", null, PHP_MONGODB_CFLAGS);
8690
ADD_SOURCES(configure_module_dirname + "/src", "bson.c bson-encode.c", "mongodb");
8791
ADD_SOURCES(configure_module_dirname + "/src/BSON", "Binary.c BinaryInterface.c DBPointer.c Decimal128.c Decimal128Interface.c Javascript.c JavascriptInterface.c MaxKey.c MaxKeyInterface.c MinKey.c MinKeyInterface.c ObjectId.c ObjectIdInterface.c Persistable.c Regex.c RegexInterface.c Serializable.c Symbol.c Timestamp.c TimestampInterface.c Type.c Undefined.c Unserializable.c UTCDateTime.c UTCDateTimeInterface.c functions.c", "mongodb");
8892
ADD_SOURCES(configure_module_dirname + "/src/MongoDB", "BulkWrite.c Command.c Cursor.c CursorId.c Manager.c Query.c ReadConcern.c ReadPreference.c Server.c Session.c WriteConcern.c WriteConcernError.c WriteError.c WriteResult.c", "mongodb");
8993
ADD_SOURCES(configure_module_dirname + "/src/MongoDB/Exception", "AuthenticationException.c BulkWriteException.c CommandException.c ConnectionException.c ConnectionTimeoutException.c Exception.c ExecutionTimeoutException.c InvalidArgumentException.c LogicException.c RuntimeException.c ServerException.c SSLConnectionException.c UnexpectedValueException.c WriteException.c", "mongodb");
9094
ADD_SOURCES(configure_module_dirname + "/src/MongoDB/Monitoring", "CommandFailedEvent.c CommandStartedEvent.c CommandSubscriber.c CommandSucceededEvent.c Subscriber.c functions.c", "mongodb");
91-
ADD_SOURCES(configure_module_dirname + "/src/libbson/src/bson", PHP_MONGODB_BSON_SOURCES, "mongodb");
92-
ADD_SOURCES(configure_module_dirname + "/src/libbson/src/jsonsl", PHP_MONGODB_JSONSL_SOURCES, "mongodb");
93-
ADD_SOURCES(configure_module_dirname + "/src/libmongoc/src/mongoc", PHP_MONGODB_MONGOC_SOURCES, "mongodb");
95+
ADD_SOURCES(configure_module_dirname + "/src/libmongoc/src/common", PHP_MONGODB_COMMON_SOURCES, "mongodb");
96+
ADD_SOURCES(configure_module_dirname + "/src/libmongoc/src/libbson/src/bson", PHP_MONGODB_BSON_SOURCES, "mongodb");
97+
ADD_SOURCES(configure_module_dirname + "/src/libmongoc/src/libbson/src/jsonsl", PHP_MONGODB_JSONSL_SOURCES, "mongodb");
98+
ADD_SOURCES(configure_module_dirname + "/src/libmongoc/src/libmongoc/src/mongoc", PHP_MONGODB_MONGOC_SOURCES, "mongodb");
9499

95100
var bson_opts = {
96101
BSON_BYTE_ORDER: 1234,
97102
BSON_OS: 2,
98103
BSON_HAVE_STDBOOL_H: 0,
104+
BSON_HAVE_STRINGS_H: 0,
99105
BSON_HAVE_ATOMIC_32_ADD_AND_FETCH: 0,
100106
BSON_HAVE_ATOMIC_64_ADD_AND_FETCH: 0,
101107
BSON_PTHREAD_ONCE_INIT_NEEDS_BRACES: 0,
@@ -117,15 +123,15 @@ if (PHP_MONGODB != "no") {
117123
}
118124

119125
mongodb_generate_header(
120-
configure_module_dirname + "/src/libbson/src/bson/bson-config.h.in",
121-
configure_module_dirname + "/src/libbson/src/bson/bson-config.h",
126+
configure_module_dirname + "/src/libmongoc/src/libbson/src/bson/bson-config.h.in",
127+
configure_module_dirname + "/src/libmongoc/src/libbson/src/bson/bson-config.h",
122128
bson_opts
123129
);
124130

125131
mongodb_generate_header(
126-
configure_module_dirname + "/src/libbson/src/bson/bson-version.h.in",
127-
configure_module_dirname + "/src/libbson/src/bson/bson-version.h",
128-
mongodb_parse_version_file(configure_module_dirname + "/src/libbson/VERSION_CURRENT", "BSON_")
132+
configure_module_dirname + "/src/libmongoc/src/libbson/src/bson/bson-version.h.in",
133+
configure_module_dirname + "/src/libmongoc/src/libbson/src/bson/bson-version.h",
134+
mongodb_parse_version_file(configure_module_dirname + "/src/libmongoc/VERSION_CURRENT", "BSON_")
129135
);
130136

131137
var mongoc_opts = {
@@ -148,13 +154,17 @@ if (PHP_MONGODB != "no") {
148154
MONGOC_ENABLE_SASL_CYRUS: 0,
149155
MONGOC_ENABLE_SASL_GSSAPI: 0,
150156
MONGOC_ENABLE_SASL_SSPI: 0,
157+
MONGOC_ENABLE_RDTSCP: 0,
158+
MONGOC_ENABLE_SHM_COUNTERS: 0,
151159
MONGOC_HAVE_ASN1_STRING_GET0_DATA: 0,
152160
MONGOC_HAVE_SASL_CLIENT_DONE: 0,
161+
MONGOC_HAVE_SCHED_GETCPU: 0,
153162
MONGOC_HAVE_SOCKLEN: 1,
154163
MONGOC_HAVE_WEAK_SYMBOLS: 0,
155164
MONGOC_NO_AUTOMATIC_GLOBALS: 1,
156165
MONGOC_SOCKET_ARG2: "struct sockaddr",
157166
MONGOC_SOCKET_ARG3: "socklen_t",
167+
MONGOC_TRACE: 1,
158168
MONGOC_HAVE_DNSAPI: 0,
159169
MONGOC_HAVE_RES_NSEARCH: 0,
160170
MONGOC_HAVE_RES_NDESTROY: 0,
@@ -225,14 +235,14 @@ if (PHP_MONGODB != "no") {
225235
* do not expect CFLAGS or LDFLAGS to be customized at build time. */
226236

227237
mongodb_generate_header(
228-
configure_module_dirname + "/src/libmongoc/src/mongoc/mongoc-config.h.in",
229-
configure_module_dirname + "/src/libmongoc/src/mongoc/mongoc-config.h",
238+
configure_module_dirname + "/src/libmongoc/src/libmongoc/src/mongoc/mongoc-config.h.in",
239+
configure_module_dirname + "/src/libmongoc/src/libmongoc/src/mongoc/mongoc-config.h",
230240
mongoc_opts
231241
);
232242

233243
mongodb_generate_header(
234-
configure_module_dirname + "/src/libmongoc/src/mongoc/mongoc-version.h.in",
235-
configure_module_dirname + "/src/libmongoc/src/mongoc/mongoc-version.h",
244+
configure_module_dirname + "/src/libmongoc/src/libmongoc/src/mongoc/mongoc-version.h.in",
245+
configure_module_dirname + "/src/libmongoc/src/libmongoc/src/mongoc/mongoc-version.h",
236246
mongodb_parse_version_file(configure_module_dirname + "/src/libmongoc/VERSION_CURRENT", "MONGOC_")
237247
);
238248
}

‎scripts/autotools/libbson/Versions.m4‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
BSON_CURRENT_FILE=[]PHP_EXT_SRCDIR(mongodb)[/src/libmongoc/src/libbson/VERSION_CURRENT]
1+
BSON_CURRENT_FILE=[]PHP_EXT_SRCDIR(mongodb)[/src/libmongoc/VERSION_CURRENT]
22
BSON_VERSION=$(cat $BSON_CURRENT_FILE)
33

44
dnl Ensure newline for "cut" implementations that need it, e.g. HP-UX.

‎src/libmongoc‎

Submodule libmongoc updated 1247 files

0 commit comments

Comments
 (0)