From 30d29a0bf76eb15dbb526af068a31efd912ab717 Mon Sep 17 00:00:00 2001 From: Hannes Magnusson Date: Fri, 4 Dec 2015 07:34:42 -0800 Subject: [PATCH 1/3] Revert "Unblock compile by copying VERSION_CURRENT and VERSION_RELEASED until CDRIVER-1027 is fixed." This reverts commit aeb55cce75d1c18a38acd52847f29de9dfa22da4. --- VERSION_CURRENT | 1 - VERSION_RELEASED | 1 - src/libmongoc | 2 +- 3 files changed, 1 insertion(+), 3 deletions(-) delete mode 100644 VERSION_CURRENT delete mode 100644 VERSION_RELEASED diff --git a/VERSION_CURRENT b/VERSION_CURRENT deleted file mode 100644 index b6bb93f7c..000000000 --- a/VERSION_CURRENT +++ /dev/null @@ -1 +0,0 @@ -1.3.0-dev diff --git a/VERSION_RELEASED b/VERSION_RELEASED deleted file mode 100644 index 23aa83906..000000000 --- a/VERSION_RELEASED +++ /dev/null @@ -1 +0,0 @@ -1.2.2 diff --git a/src/libmongoc b/src/libmongoc index 4839021d5..3473d5256 160000 --- a/src/libmongoc +++ b/src/libmongoc @@ -1 +1 @@ -Subproject commit 4839021d589f8948cbfac3a5bc795a79c980237d +Subproject commit 3473d5256db7fe23c11ceaa812378411f4a0314f From 423c4b92846a86ffceeda36bdac1cb24d417d46e Mon Sep 17 00:00:00 2001 From: Hannes Magnusson Date: Fri, 4 Dec 2015 07:46:27 -0800 Subject: [PATCH 2/3] Generate the mongoc and libbson version files correctly --- config.m4 | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/config.m4 b/config.m4 index 90d62c474..6b1237c19 100644 --- a/config.m4 +++ b/config.m4 @@ -510,12 +510,11 @@ dnl }}} AC_SUBST(BSON_HAVE_SNPRINTF) if test "$PHP_LIBMONGOC" == "no"; then + backup_srcdir=${srcdir} + srcdir=${srcdir}/src/libmongoc/ m4_include(src/libmongoc/build/autotools/Versions.m4) - MONGOC_MAJOR_VERSION=mongoc_major_version - MONGOC_MINOR_VERSION=mongoc_minor_version - MONGOC_MICRO_VERSION=mongoc_micro_version + srcdir=${backup_srcdir} MONGOC_API_VERSION=1.0 - MONGOC_VERSION=mongoc_version AC_SUBST(MONGOC_MAJOR_VERSION) AC_SUBST(MONGOC_MINOR_VERSION) AC_SUBST(MONGOC_MICRO_VERSION) @@ -525,12 +524,11 @@ dnl }}} AC_OUTPUT($srcdir/src/libmongoc/src/mongoc/mongoc-version.h) fi if test "$PHP_LIBBSON" == "no"; then + backup_srcdir=${srcdir} + srcdir=${srcdir}/src/libbson/ m4_include(src/libbson/build/autotools/Versions.m4) - BSON_MAJOR_VERSION=bson_major_version - BSON_MINOR_VERSION=bson_minor_version - BSON_MICRO_VERSION=bson_micro_version + srcdir=${backup_srcdir} BSON_API_VERSION=1.0 - BSON_VERSION=bson_version AC_SUBST(BSON_MAJOR_VERSION) AC_SUBST(BSON_MINOR_VERSION) AC_SUBST(BSON_MICRO_VERSION) From 1e335052eecf11b1052dfd7177bcca2b6508e5ef Mon Sep 17 00:00:00 2001 From: Hannes Magnusson Date: Fri, 4 Dec 2015 07:47:07 -0800 Subject: [PATCH 3/3] bump mongoc & libbson --- src/libbson | 2 +- src/libmongoc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libbson b/src/libbson index 96731f792..1e0bd44bb 160000 --- a/src/libbson +++ b/src/libbson @@ -1 +1 @@ -Subproject commit 96731f7926a8480d8f456ee163db6bdf4fecdf9e +Subproject commit 1e0bd44bb8298dba8b698c043ac40ba5f3f05692 diff --git a/src/libmongoc b/src/libmongoc index 3473d5256..de9547a6b 160000 --- a/src/libmongoc +++ b/src/libmongoc @@ -1 +1 @@ -Subproject commit 3473d5256db7fe23c11ceaa812378411f4a0314f +Subproject commit de9547a6bf22325815cf5ab403375efd2765d6e4