From f45de61afc1e7d48638e73f0982431b7cf1ebf0e Mon Sep 17 00:00:00 2001 From: Shane Harvey Date: Thu, 25 Jan 2024 16:50:02 -0800 Subject: [PATCH] PYTHON-4163 Rename src/ to bsonjs/ to avoid setuptools bug that shadows bson package (#53) --- MANIFEST.in | 6 ++--- {src => bsonjs}/bson/bcon.c | 0 {src => bsonjs}/bson/bcon.h | 0 {src => bsonjs}/bson/bson-atomic.c | 0 {src => bsonjs}/bson/bson-atomic.h | 0 {src => bsonjs}/bson/bson-clock.c | 0 {src => bsonjs}/bson/bson-clock.h | 0 {src => bsonjs}/bson/bson-cmp.h | 0 {src => bsonjs}/bson/bson-compat.h | 0 {src => bsonjs}/bson/bson-config.h | 0 {src => bsonjs}/bson/bson-context-private.h | 0 {src => bsonjs}/bson/bson-context.c | 0 {src => bsonjs}/bson/bson-context.h | 0 {src => bsonjs}/bson/bson-decimal128.c | 0 {src => bsonjs}/bson/bson-decimal128.h | 0 {src => bsonjs}/bson/bson-dsl.h | 0 {src => bsonjs}/bson/bson-endian.h | 0 {src => bsonjs}/bson/bson-error.c | 0 {src => bsonjs}/bson/bson-error.h | 0 {src => bsonjs}/bson/bson-iso8601-private.h | 0 {src => bsonjs}/bson/bson-iso8601.c | 0 {src => bsonjs}/bson/bson-iter.c | 0 {src => bsonjs}/bson/bson-iter.h | 0 {src => bsonjs}/bson/bson-json-private.h | 0 {src => bsonjs}/bson/bson-json.c | 0 {src => bsonjs}/bson/bson-json.h | 0 {src => bsonjs}/bson/bson-keys.c | 0 {src => bsonjs}/bson/bson-keys.h | 0 {src => bsonjs}/bson/bson-macros.h | 0 {src => bsonjs}/bson/bson-md5.c | 0 {src => bsonjs}/bson/bson-md5.h | 0 {src => bsonjs}/bson/bson-memory.c | 0 {src => bsonjs}/bson/bson-memory.h | 0 {src => bsonjs}/bson/bson-oid.c | 0 {src => bsonjs}/bson/bson-oid.h | 0 {src => bsonjs}/bson/bson-prelude.h | 0 {src => bsonjs}/bson/bson-private.h | 0 {src => bsonjs}/bson/bson-reader.c | 0 {src => bsonjs}/bson/bson-reader.h | 0 {src => bsonjs}/bson/bson-string.c | 0 {src => bsonjs}/bson/bson-string.h | 0 {src => bsonjs}/bson/bson-timegm-private.h | 0 {src => bsonjs}/bson/bson-timegm.c | 0 {src => bsonjs}/bson/bson-types.h | 0 {src => bsonjs}/bson/bson-utf8.c | 0 {src => bsonjs}/bson/bson-utf8.h | 0 {src => bsonjs}/bson/bson-value.c | 0 {src => bsonjs}/bson/bson-value.h | 0 {src => bsonjs}/bson/bson-version-functions.c | 0 {src => bsonjs}/bson/bson-version-functions.h | 0 {src => bsonjs}/bson/bson-version.h | 0 {src => bsonjs}/bson/bson-writer.c | 0 {src => bsonjs}/bson/bson-writer.h | 0 {src => bsonjs}/bson/bson.c | 0 {src => bsonjs}/bson/bson.h | 0 {src => bsonjs}/bsonjs.c | 0 {src => bsonjs}/bsonjs.h | 0 {src => bsonjs}/common/common-b64-private.h | 0 {src => bsonjs}/common/common-b64.c | 0 {src => bsonjs}/common/common-config.h | 0 .../common/common-macros-private.h | 0 {src => bsonjs}/common/common-md5-private.h | 0 {src => bsonjs}/common/common-md5.c | 0 {src => bsonjs}/common/common-prelude.h | 0 .../common/common-thread-private.h | 0 {src => bsonjs}/common/common-thread.c | 0 {src => bsonjs}/jsonsl/LICENSE | 0 {src => bsonjs}/jsonsl/jsonsl.c | 0 {src => bsonjs}/jsonsl/jsonsl.h | 0 pyproject.toml | 3 +++ setup.py | 10 ++++----- vendor.sh | 22 +++++++++---------- 72 files changed, 22 insertions(+), 19 deletions(-) rename {src => bsonjs}/bson/bcon.c (100%) rename {src => bsonjs}/bson/bcon.h (100%) rename {src => bsonjs}/bson/bson-atomic.c (100%) rename {src => bsonjs}/bson/bson-atomic.h (100%) rename {src => bsonjs}/bson/bson-clock.c (100%) rename {src => bsonjs}/bson/bson-clock.h (100%) rename {src => bsonjs}/bson/bson-cmp.h (100%) rename {src => bsonjs}/bson/bson-compat.h (100%) rename {src => bsonjs}/bson/bson-config.h (100%) rename {src => bsonjs}/bson/bson-context-private.h (100%) rename {src => bsonjs}/bson/bson-context.c (100%) rename {src => bsonjs}/bson/bson-context.h (100%) rename {src => bsonjs}/bson/bson-decimal128.c (100%) rename {src => bsonjs}/bson/bson-decimal128.h (100%) rename {src => bsonjs}/bson/bson-dsl.h (100%) rename {src => bsonjs}/bson/bson-endian.h (100%) rename {src => bsonjs}/bson/bson-error.c (100%) rename {src => bsonjs}/bson/bson-error.h (100%) rename {src => bsonjs}/bson/bson-iso8601-private.h (100%) rename {src => bsonjs}/bson/bson-iso8601.c (100%) rename {src => bsonjs}/bson/bson-iter.c (100%) rename {src => bsonjs}/bson/bson-iter.h (100%) rename {src => bsonjs}/bson/bson-json-private.h (100%) rename {src => bsonjs}/bson/bson-json.c (100%) rename {src => bsonjs}/bson/bson-json.h (100%) rename {src => bsonjs}/bson/bson-keys.c (100%) rename {src => bsonjs}/bson/bson-keys.h (100%) rename {src => bsonjs}/bson/bson-macros.h (100%) rename {src => bsonjs}/bson/bson-md5.c (100%) rename {src => bsonjs}/bson/bson-md5.h (100%) rename {src => bsonjs}/bson/bson-memory.c (100%) rename {src => bsonjs}/bson/bson-memory.h (100%) rename {src => bsonjs}/bson/bson-oid.c (100%) rename {src => bsonjs}/bson/bson-oid.h (100%) rename {src => bsonjs}/bson/bson-prelude.h (100%) rename {src => bsonjs}/bson/bson-private.h (100%) rename {src => bsonjs}/bson/bson-reader.c (100%) rename {src => bsonjs}/bson/bson-reader.h (100%) rename {src => bsonjs}/bson/bson-string.c (100%) rename {src => bsonjs}/bson/bson-string.h (100%) rename {src => bsonjs}/bson/bson-timegm-private.h (100%) rename {src => bsonjs}/bson/bson-timegm.c (100%) rename {src => bsonjs}/bson/bson-types.h (100%) rename {src => bsonjs}/bson/bson-utf8.c (100%) rename {src => bsonjs}/bson/bson-utf8.h (100%) rename {src => bsonjs}/bson/bson-value.c (100%) rename {src => bsonjs}/bson/bson-value.h (100%) rename {src => bsonjs}/bson/bson-version-functions.c (100%) rename {src => bsonjs}/bson/bson-version-functions.h (100%) rename {src => bsonjs}/bson/bson-version.h (100%) rename {src => bsonjs}/bson/bson-writer.c (100%) rename {src => bsonjs}/bson/bson-writer.h (100%) rename {src => bsonjs}/bson/bson.c (100%) rename {src => bsonjs}/bson/bson.h (100%) rename {src => bsonjs}/bsonjs.c (100%) rename {src => bsonjs}/bsonjs.h (100%) rename {src => bsonjs}/common/common-b64-private.h (100%) rename {src => bsonjs}/common/common-b64.c (100%) rename {src => bsonjs}/common/common-config.h (100%) rename {src => bsonjs}/common/common-macros-private.h (100%) rename {src => bsonjs}/common/common-md5-private.h (100%) rename {src => bsonjs}/common/common-md5.c (100%) rename {src => bsonjs}/common/common-prelude.h (100%) rename {src => bsonjs}/common/common-thread-private.h (100%) rename {src => bsonjs}/common/common-thread.c (100%) rename {src => bsonjs}/jsonsl/LICENSE (100%) rename {src => bsonjs}/jsonsl/jsonsl.c (100%) rename {src => bsonjs}/jsonsl/jsonsl.h (100%) diff --git a/MANIFEST.in b/MANIFEST.in index 143e780..5531919 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,9 +1,9 @@ include README.rst include CHANGELOG.rst include LICENSE -recursive-include src LICENSE -recursive-include src *.h -recursive-include test *.py +recursive-include bsonjs LICENSE +recursive-include bsonjs *.h +recursive-include bsonjs *.py exclude benchmark.py exclude build-wheels.sh exclude docker-build.sh diff --git a/src/bson/bcon.c b/bsonjs/bson/bcon.c similarity index 100% rename from src/bson/bcon.c rename to bsonjs/bson/bcon.c diff --git a/src/bson/bcon.h b/bsonjs/bson/bcon.h similarity index 100% rename from src/bson/bcon.h rename to bsonjs/bson/bcon.h diff --git a/src/bson/bson-atomic.c b/bsonjs/bson/bson-atomic.c similarity index 100% rename from src/bson/bson-atomic.c rename to bsonjs/bson/bson-atomic.c diff --git a/src/bson/bson-atomic.h b/bsonjs/bson/bson-atomic.h similarity index 100% rename from src/bson/bson-atomic.h rename to bsonjs/bson/bson-atomic.h diff --git a/src/bson/bson-clock.c b/bsonjs/bson/bson-clock.c similarity index 100% rename from src/bson/bson-clock.c rename to bsonjs/bson/bson-clock.c diff --git a/src/bson/bson-clock.h b/bsonjs/bson/bson-clock.h similarity index 100% rename from src/bson/bson-clock.h rename to bsonjs/bson/bson-clock.h diff --git a/src/bson/bson-cmp.h b/bsonjs/bson/bson-cmp.h similarity index 100% rename from src/bson/bson-cmp.h rename to bsonjs/bson/bson-cmp.h diff --git a/src/bson/bson-compat.h b/bsonjs/bson/bson-compat.h similarity index 100% rename from src/bson/bson-compat.h rename to bsonjs/bson/bson-compat.h diff --git a/src/bson/bson-config.h b/bsonjs/bson/bson-config.h similarity index 100% rename from src/bson/bson-config.h rename to bsonjs/bson/bson-config.h diff --git a/src/bson/bson-context-private.h b/bsonjs/bson/bson-context-private.h similarity index 100% rename from src/bson/bson-context-private.h rename to bsonjs/bson/bson-context-private.h diff --git a/src/bson/bson-context.c b/bsonjs/bson/bson-context.c similarity index 100% rename from src/bson/bson-context.c rename to bsonjs/bson/bson-context.c diff --git a/src/bson/bson-context.h b/bsonjs/bson/bson-context.h similarity index 100% rename from src/bson/bson-context.h rename to bsonjs/bson/bson-context.h diff --git a/src/bson/bson-decimal128.c b/bsonjs/bson/bson-decimal128.c similarity index 100% rename from src/bson/bson-decimal128.c rename to bsonjs/bson/bson-decimal128.c diff --git a/src/bson/bson-decimal128.h b/bsonjs/bson/bson-decimal128.h similarity index 100% rename from src/bson/bson-decimal128.h rename to bsonjs/bson/bson-decimal128.h diff --git a/src/bson/bson-dsl.h b/bsonjs/bson/bson-dsl.h similarity index 100% rename from src/bson/bson-dsl.h rename to bsonjs/bson/bson-dsl.h diff --git a/src/bson/bson-endian.h b/bsonjs/bson/bson-endian.h similarity index 100% rename from src/bson/bson-endian.h rename to bsonjs/bson/bson-endian.h diff --git a/src/bson/bson-error.c b/bsonjs/bson/bson-error.c similarity index 100% rename from src/bson/bson-error.c rename to bsonjs/bson/bson-error.c diff --git a/src/bson/bson-error.h b/bsonjs/bson/bson-error.h similarity index 100% rename from src/bson/bson-error.h rename to bsonjs/bson/bson-error.h diff --git a/src/bson/bson-iso8601-private.h b/bsonjs/bson/bson-iso8601-private.h similarity index 100% rename from src/bson/bson-iso8601-private.h rename to bsonjs/bson/bson-iso8601-private.h diff --git a/src/bson/bson-iso8601.c b/bsonjs/bson/bson-iso8601.c similarity index 100% rename from src/bson/bson-iso8601.c rename to bsonjs/bson/bson-iso8601.c diff --git a/src/bson/bson-iter.c b/bsonjs/bson/bson-iter.c similarity index 100% rename from src/bson/bson-iter.c rename to bsonjs/bson/bson-iter.c diff --git a/src/bson/bson-iter.h b/bsonjs/bson/bson-iter.h similarity index 100% rename from src/bson/bson-iter.h rename to bsonjs/bson/bson-iter.h diff --git a/src/bson/bson-json-private.h b/bsonjs/bson/bson-json-private.h similarity index 100% rename from src/bson/bson-json-private.h rename to bsonjs/bson/bson-json-private.h diff --git a/src/bson/bson-json.c b/bsonjs/bson/bson-json.c similarity index 100% rename from src/bson/bson-json.c rename to bsonjs/bson/bson-json.c diff --git a/src/bson/bson-json.h b/bsonjs/bson/bson-json.h similarity index 100% rename from src/bson/bson-json.h rename to bsonjs/bson/bson-json.h diff --git a/src/bson/bson-keys.c b/bsonjs/bson/bson-keys.c similarity index 100% rename from src/bson/bson-keys.c rename to bsonjs/bson/bson-keys.c diff --git a/src/bson/bson-keys.h b/bsonjs/bson/bson-keys.h similarity index 100% rename from src/bson/bson-keys.h rename to bsonjs/bson/bson-keys.h diff --git a/src/bson/bson-macros.h b/bsonjs/bson/bson-macros.h similarity index 100% rename from src/bson/bson-macros.h rename to bsonjs/bson/bson-macros.h diff --git a/src/bson/bson-md5.c b/bsonjs/bson/bson-md5.c similarity index 100% rename from src/bson/bson-md5.c rename to bsonjs/bson/bson-md5.c diff --git a/src/bson/bson-md5.h b/bsonjs/bson/bson-md5.h similarity index 100% rename from src/bson/bson-md5.h rename to bsonjs/bson/bson-md5.h diff --git a/src/bson/bson-memory.c b/bsonjs/bson/bson-memory.c similarity index 100% rename from src/bson/bson-memory.c rename to bsonjs/bson/bson-memory.c diff --git a/src/bson/bson-memory.h b/bsonjs/bson/bson-memory.h similarity index 100% rename from src/bson/bson-memory.h rename to bsonjs/bson/bson-memory.h diff --git a/src/bson/bson-oid.c b/bsonjs/bson/bson-oid.c similarity index 100% rename from src/bson/bson-oid.c rename to bsonjs/bson/bson-oid.c diff --git a/src/bson/bson-oid.h b/bsonjs/bson/bson-oid.h similarity index 100% rename from src/bson/bson-oid.h rename to bsonjs/bson/bson-oid.h diff --git a/src/bson/bson-prelude.h b/bsonjs/bson/bson-prelude.h similarity index 100% rename from src/bson/bson-prelude.h rename to bsonjs/bson/bson-prelude.h diff --git a/src/bson/bson-private.h b/bsonjs/bson/bson-private.h similarity index 100% rename from src/bson/bson-private.h rename to bsonjs/bson/bson-private.h diff --git a/src/bson/bson-reader.c b/bsonjs/bson/bson-reader.c similarity index 100% rename from src/bson/bson-reader.c rename to bsonjs/bson/bson-reader.c diff --git a/src/bson/bson-reader.h b/bsonjs/bson/bson-reader.h similarity index 100% rename from src/bson/bson-reader.h rename to bsonjs/bson/bson-reader.h diff --git a/src/bson/bson-string.c b/bsonjs/bson/bson-string.c similarity index 100% rename from src/bson/bson-string.c rename to bsonjs/bson/bson-string.c diff --git a/src/bson/bson-string.h b/bsonjs/bson/bson-string.h similarity index 100% rename from src/bson/bson-string.h rename to bsonjs/bson/bson-string.h diff --git a/src/bson/bson-timegm-private.h b/bsonjs/bson/bson-timegm-private.h similarity index 100% rename from src/bson/bson-timegm-private.h rename to bsonjs/bson/bson-timegm-private.h diff --git a/src/bson/bson-timegm.c b/bsonjs/bson/bson-timegm.c similarity index 100% rename from src/bson/bson-timegm.c rename to bsonjs/bson/bson-timegm.c diff --git a/src/bson/bson-types.h b/bsonjs/bson/bson-types.h similarity index 100% rename from src/bson/bson-types.h rename to bsonjs/bson/bson-types.h diff --git a/src/bson/bson-utf8.c b/bsonjs/bson/bson-utf8.c similarity index 100% rename from src/bson/bson-utf8.c rename to bsonjs/bson/bson-utf8.c diff --git a/src/bson/bson-utf8.h b/bsonjs/bson/bson-utf8.h similarity index 100% rename from src/bson/bson-utf8.h rename to bsonjs/bson/bson-utf8.h diff --git a/src/bson/bson-value.c b/bsonjs/bson/bson-value.c similarity index 100% rename from src/bson/bson-value.c rename to bsonjs/bson/bson-value.c diff --git a/src/bson/bson-value.h b/bsonjs/bson/bson-value.h similarity index 100% rename from src/bson/bson-value.h rename to bsonjs/bson/bson-value.h diff --git a/src/bson/bson-version-functions.c b/bsonjs/bson/bson-version-functions.c similarity index 100% rename from src/bson/bson-version-functions.c rename to bsonjs/bson/bson-version-functions.c diff --git a/src/bson/bson-version-functions.h b/bsonjs/bson/bson-version-functions.h similarity index 100% rename from src/bson/bson-version-functions.h rename to bsonjs/bson/bson-version-functions.h diff --git a/src/bson/bson-version.h b/bsonjs/bson/bson-version.h similarity index 100% rename from src/bson/bson-version.h rename to bsonjs/bson/bson-version.h diff --git a/src/bson/bson-writer.c b/bsonjs/bson/bson-writer.c similarity index 100% rename from src/bson/bson-writer.c rename to bsonjs/bson/bson-writer.c diff --git a/src/bson/bson-writer.h b/bsonjs/bson/bson-writer.h similarity index 100% rename from src/bson/bson-writer.h rename to bsonjs/bson/bson-writer.h diff --git a/src/bson/bson.c b/bsonjs/bson/bson.c similarity index 100% rename from src/bson/bson.c rename to bsonjs/bson/bson.c diff --git a/src/bson/bson.h b/bsonjs/bson/bson.h similarity index 100% rename from src/bson/bson.h rename to bsonjs/bson/bson.h diff --git a/src/bsonjs.c b/bsonjs/bsonjs.c similarity index 100% rename from src/bsonjs.c rename to bsonjs/bsonjs.c diff --git a/src/bsonjs.h b/bsonjs/bsonjs.h similarity index 100% rename from src/bsonjs.h rename to bsonjs/bsonjs.h diff --git a/src/common/common-b64-private.h b/bsonjs/common/common-b64-private.h similarity index 100% rename from src/common/common-b64-private.h rename to bsonjs/common/common-b64-private.h diff --git a/src/common/common-b64.c b/bsonjs/common/common-b64.c similarity index 100% rename from src/common/common-b64.c rename to bsonjs/common/common-b64.c diff --git a/src/common/common-config.h b/bsonjs/common/common-config.h similarity index 100% rename from src/common/common-config.h rename to bsonjs/common/common-config.h diff --git a/src/common/common-macros-private.h b/bsonjs/common/common-macros-private.h similarity index 100% rename from src/common/common-macros-private.h rename to bsonjs/common/common-macros-private.h diff --git a/src/common/common-md5-private.h b/bsonjs/common/common-md5-private.h similarity index 100% rename from src/common/common-md5-private.h rename to bsonjs/common/common-md5-private.h diff --git a/src/common/common-md5.c b/bsonjs/common/common-md5.c similarity index 100% rename from src/common/common-md5.c rename to bsonjs/common/common-md5.c diff --git a/src/common/common-prelude.h b/bsonjs/common/common-prelude.h similarity index 100% rename from src/common/common-prelude.h rename to bsonjs/common/common-prelude.h diff --git a/src/common/common-thread-private.h b/bsonjs/common/common-thread-private.h similarity index 100% rename from src/common/common-thread-private.h rename to bsonjs/common/common-thread-private.h diff --git a/src/common/common-thread.c b/bsonjs/common/common-thread.c similarity index 100% rename from src/common/common-thread.c rename to bsonjs/common/common-thread.c diff --git a/src/jsonsl/LICENSE b/bsonjs/jsonsl/LICENSE similarity index 100% rename from src/jsonsl/LICENSE rename to bsonjs/jsonsl/LICENSE diff --git a/src/jsonsl/jsonsl.c b/bsonjs/jsonsl/jsonsl.c similarity index 100% rename from src/jsonsl/jsonsl.c rename to bsonjs/jsonsl/jsonsl.c diff --git a/src/jsonsl/jsonsl.h b/bsonjs/jsonsl/jsonsl.h similarity index 100% rename from src/jsonsl/jsonsl.h rename to bsonjs/jsonsl/jsonsl.h diff --git a/pyproject.toml b/pyproject.toml index 8c523c5..67fb76f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -2,6 +2,9 @@ requires = ["setuptools>=62.0"] build-backend = "setuptools.build_meta" +[tool.setuptools] +packages = ["bsonjs"] + [project] name = "python-bsonjs" version = "0.3.0" diff --git a/setup.py b/setup.py index ca0da48..2e94df5 100644 --- a/setup.py +++ b/setup.py @@ -28,11 +28,11 @@ ext_modules=[ Extension( "bsonjs", - sources=["src/bsonjs.c"] + glob.glob("src/*/*.c"), - include_dirs=["src", - "src/bson", - "src/jsonsl", - "src/common"], + sources=["bsonjs/bsonjs.c"] + glob.glob("bsonjs/*/*.c"), + include_dirs=["bsonjs", + "bsonjs/bson", + "bsonjs/jsonsl", + "bsonjs/common"], py_limited_api=True, define_macros=[("BSON_COMPILATION", 1), ("Py_LIMITED_API", "0x03060000")], diff --git a/vendor.sh b/vendor.sh index c87032d..2f765f5 100644 --- a/vendor.sh +++ b/vendor.sh @@ -8,20 +8,20 @@ python build/calc_release_version.py > VERSION_CURRENT mkdir cmake-build && cd cmake-build cmake -DENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF -DENABLE_MONGOC=OFF .. cd ../../ -rm -r python-bsonjs/src/bson -rm -r python-bsonjs/src/jsonsl -rm -r python-bsonjs/src/common -rsync -r mongo-c-driver/src/libbson/src/bson/*.[hc] python-bsonjs/src/bson/ -rsync -r mongo-c-driver/src/libbson/src/jsonsl/*.[hc] python-bsonjs/src/jsonsl/ -rsync -r mongo-c-driver/src/libbson/src/jsonsl/LICENSE python-bsonjs/src/jsonsl/ +rm -r python-bsonjs/bsonjs/bson +rm -r python-bsonjs/bsonjs/jsonsl +rm -r python-bsonjs/bsonjs/common +rsync -r mongo-c-driver/src/libbson/src/bson/*.[hc] python-bsonjs/bsonjs/bson/ +rsync -r mongo-c-driver/src/libbson/src/jsonsl/*.[hc] python-bsonjs/bsonjs/jsonsl/ +rsync -r mongo-c-driver/src/libbson/src/jsonsl/LICENSE python-bsonjs/bsonjs/jsonsl/ -rsync -r mongo-c-driver/src/common/*.[hc] python-bsonjs/src/common/ -rsync -r mongo-c-driver/cmake-build/src/common/*.[hc] python-bsonjs/src/common/ +rsync -r mongo-c-driver/src/common/*.[hc] python-bsonjs/bsonjs/common/ +rsync -r mongo-c-driver/cmake-build/src/common/*.[hc] python-bsonjs/bsonjs/common/ -rsync -r mongo-c-driver/cmake-build/src/libbson/src/bson/*.[hc] python-bsonjs/src/bson/ +rsync -r mongo-c-driver/cmake-build/src/libbson/src/bson/*.[hc] python-bsonjs/bsonjs/bson/ # Ignore autogenerated bson-config.h cd python-bsonjs/ -git diff -- src/bson/bson-config.h | tee +git diff -- bsonjs/bson/bson-config.h | tee echo "**** Review libbson's autogenerated src/bson/bson-config.h (above) for newly added (or removed) macros ****" -git checkout -- src/bson/bson-config.h +git checkout -- bsonjs/bson/bson-config.h