Skip to content

Commit 721aec0

Browse files
committed
Releasing new version
1 parent 8a63000 commit 721aec0

5 files changed

Lines changed: 27 additions & 6 deletions

File tree

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
# Changelog
22
WITSML 2.1 to BSON parser changelogs
33

4+
## [0.1.2] - 2024-05-23
5+
- Fixing readTextFree bug ✔️
6+
- Add C Test: double free test in readTextFree ✔️
7+
- Update Mongo C library 1.24.3 -> 1.27.1 ✔️
8+
49
## [0.1.1] - 2023-09-23
510
- Add Python 3 module (>= 3.8) 🐍✔️
611
- Add Node JS (>= v16.20.2) addon ✔️
@@ -12,6 +17,7 @@ WITSML 2.1 to BSON parser changelogs
1217

1318
## [master] - current
1419

20+
[0.1.2]: https://github.com/devfabiosilva/witsml21parser/tree/v0.1.2
1521
[0.1.1]: https://github.com/devfabiosilva/witsml21parser/tree/v0.1.1
1622
[0.1.0]: https://github.com/devfabiosilva/witsml21parser/tree/v0.1.0
1723
[master]: https://github.com/devfabiosilva/witsml21parser/tree/master

Java/library/src/test/java/org/jwitsml21parser/JWitsml21Test.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,6 @@ public void TestIntegrity() {
176176
public void testVersion() throws JWitsmlException, Exception {
177177
JWitsmlParser jWitsmlParser = new JWitsmlParser();
178178
assertNotNull(jWitsmlParser.getBsonVersion());
179-
assertEquals("0.1.1", jWitsmlParser.getBsonVersion().get("version"));
179+
assertEquals("0.1.2", jWitsmlParser.getBsonVersion().get("version"));
180180
}
181181
}

Makefile

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ LIBANAME=cws
1616
LIBDIR=$(CURDIR)/lib
1717

1818
MONGO_C_GIT=https://github.com/mongodb/mongo-c-driver.git
19-
#MONGO_C_BRANCH=1.24.3
2019
MONGO_C_BRANCH=1.27.1
2120
MONGO_C_DIR=$(CURDIR)/third-party/mongo-c-driver
2221

@@ -414,12 +413,28 @@ else
414413
pwd; cd $(CURDIR)/third-party; pwd; git clone -b $(MONGO_C_BRANCH) $(MONGO_C_GIT); cd mongo-c-driver;mkdir compiled && cd compiled; cmake .. -DCMAKE_BUILD_TYPE=Release -DENABLE_MONGOC=OFF -DCMAKE_INSTALL_PREFIX=$(MONGO_C_DIR)/compiled/out; make -j12;make install; pwd; cp out/lib/libbson-static-1.0.a $(LIBDIR) -v;cp -frv out/include/libbson-1.0/bson $(INCLUDEDIR);cd src/libbson/CMakeFiles/bson_shared.dir; pwd; ar rcs $(LIBDIR)/libbson-shared-1.0.a src/bson/*.o src/jsonsl/*.o __/common/*.o
415414
endif
416415

416+
remove_bson:
417+
ifneq ("$(wildcard $(LIBDIR)/lib*.a)","")
418+
@echo "Removing BSON library"
419+
rm -v $(LIBDIR)/lib*.a
420+
@echo "Removed"
421+
else
422+
@echo "Nothing to do to remove BSON library"
423+
endif
424+
425+
ifneq ("$(wildcard $(MONGO_C_DIR))","")
426+
@echo "Removing Mongo C branch $(MONGO_C_BRANCH)"
427+
rm -rfv $(MONGO_C_DIR)
428+
@echo "Removed Mongo C $(MONGO_C_BRANCH)"
429+
else
430+
@echo "Nothing to do to remove Mongo C $(MONGO_C_BRANCH)"
431+
endif
432+
417433
#TESTS
418434
pointers_assert:
419435
@echo "Building C pointer assert (TEST)"
420436
@$(CC) -c -O2 $(TEST_C_DIR)/pointers_assert.c -I$(INCLUDEDIR) -I$(TEST_INCLUDE_DIR) -I$(CURDIR) -L$(LIBDIR) -lpthread -lbson-static-1.0 -o $(TEST_C_DIR)/pointers_assert.o -Wall $(DEBUG_FLAG)
421437

422-
.PHONY:
423438
test: lib$(LIBANAME)_debug.a pointers_assert
424439
@echo "Build C test (TEST) ..."
425440
@$(CC) -O2 $(TEST_C_DIR)/main.c $(CURDIR)/src/ctest/asserts.c $(TEST_C_DIR)/pointers_assert.o stdsoap2.c soapC_debug_sanitize.o soapServer.c -I$(TEST_INCLUDE_DIR) -I$(INCLUDEDIR) -I$(CURDIR) -L$(LIBDIR) -l$(LIBANAME)_debug -lpthread -lbson-static-1.0 -o $(TEST_C_DIR)/$(TEST_C_EXEC_NAME) -Wall $(DEBUG_FLAG)

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
def main():
44

55
setup(name="witsml21bson",
6-
version="0.1.0",
6+
version="0.1.2",
77
description="WITSML 2.1 BSON parser module for Python 3 using C library setup",
88
author="Fábio Pereira da Silva",
99
author_email="fabioegel@gmail.com",

version.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "0.1.1",
2+
"version": "0.1.2",
33
"witsmlVersion": "2.1",
44
"website": "https://github.com/devfabiosilva/witsml21parser",
55
"license": "MIT",
@@ -33,7 +33,7 @@
3333
"license": "See https://www.genivia.com/products.html"
3434
},
3535
"libbson": {
36-
"version": "1.24.3",
36+
"version": "1.27.1",
3737
"website": "https://github.com/mongodb/mongo-c-driver",
3838
"license": "Apache License 2.0"
3939
}

0 commit comments

Comments
 (0)