CXX-803 Set a funny ABI since it isn't stable for 3.0.0

Author: acmorrow

src/bsoncxx/CMakeLists.txt

@@ -5,16 +5,15 @@ find_package(LibBSON 1.3.0 REQUIRED)
 
 # Update these as needed.
 # TODO: read from file
-set(BSONCXX_VERSION_MAJOR 0)
-set(BSONCXX_VERSION_MINOR 3)
+set(BSONCXX_VERSION_MAJOR 3)
+set(BSONCXX_VERSION_MINOR 0)
 set(BSONCXX_VERSION_PATCH 0)
-set(BSONCXX_VERSION_EXTRA "-pre")
-set(BSONCXX_ABI_VERSION 0)
+set(BSONCXX_VERSION_EXTRA "-rc0-pre")
+set(BSONCXX_ABI_VERSION _noabi)
 
-set(BSONCXX_VERSION ${BSONCXX_VERSION_MAJOR}.${BSONCXX_VERSION_MINOR}.${BSONCXX_VERSION_PATCH})
+set(BSONCXX_VERSION ${BSONCXX_VERSION_MAJOR}.${BSONCXX_VERSION_MINOR}.${BSONCXX_VERSION_PATCH}${BSONCXX_VERSION_EXTRA})
 set(BSONCXX_INLINE_NAMESPACE "v${BSONCXX_ABI_VERSION}")
-set(BSONCXX_DIRECTORY_PREFIX "v${BSONCXX_VERSION_MAJOR}.${BSONCXX_VERSION_MINOR}")
-set(BSONCXX_HEADER_INSTALL_DIR "include/bsoncxx/${BSONCXX_DIRECTORY_PREFIX}" CACHE INTERNAL "")
+set(BSONCXX_HEADER_INSTALL_DIR "include/bsoncxx/${BSONCXX_INLINE_NAMESPACE}" CACHE INTERNAL "")
 
 # TODO: Not all combinations of options are valid, and USE_STD is only valid
 # for C++14 compiles. Add logic to validate options and configure checks to validate

src/bsoncxx/config/libbsoncxx.pc.in

@@ -7,5 +7,5 @@ Description: The MongoDB C++11 BSON Library
 URL: http://github.com/mongodb/mongo-cxx-driver
 Version: @BSONCXX_VERSION@
 Requires.private: libbson-@LIBBSON_REQUIRED_ABI_VERSION@
-Cflags: -I${includedir}/bsoncxx/@BSONCXX_DIRECTORY_PREFIX@
+Cflags: -I${includedir}/bsoncxx/@BSONCXX_INLINE_NAMESPACE@
 Libs: -L${libdir} -lbsoncxx

src/mongocxx/CMakeLists.txt

@@ -8,16 +8,15 @@ find_package(LibMongoC 1.3.0 REQUIRED)
 
 # Update these as needed.
 # TODO: read from file
-set(MONGOCXX_VERSION_MAJOR 0)
-set(MONGOCXX_VERSION_MINOR 3)
+set(MONGOCXX_VERSION_MAJOR 3)
+set(MONGOCXX_VERSION_MINOR 0)
 set(MONGOCXX_VERSION_PATCH 0)
-set(MONGOCXX_VERSION_EXTRA "-pre")
-set(MONGOCXX_ABI_VERSION 0)
+set(MONGOCXX_VERSION_EXTRA "-rc0-pre")
+set(MONGOCXX_ABI_VERSION _noabi)
 
-set(MONGOCXX_VERSION ${MONGOCXX_VERSION_MAJOR}.${MONGOCXX_VERSION_MINOR}.${MONGOCXX_VERSION_PATCH})
+set(MONGOCXX_VERSION ${MONGOCXX_VERSION_MAJOR}.${MONGOCXX_VERSION_MINOR}.${MONGOCXX_VERSION_PATCH}${MONGOCXX_VERSION_EXTRA})
 set(MONGOCXX_INLINE_NAMESPACE "v${MONGOCXX_ABI_VERSION}")
-set(MONGOCXX_DIRECTORY_PREFIX "v${MONGOCXX_VERSION_MAJOR}.${MONGOCXX_VERSION_MINOR}")
-set(MONGOCXX_HEADER_INSTALL_DIR "include/mongocxx/${MONGOCXX_DIRECTORY_PREFIX}" CACHE INTERNAL "")
+set(MONGOCXX_HEADER_INSTALL_DIR "include/mongocxx/${MONGOCXX_INLINE_NAMESPACE}" CACHE INTERNAL "")
 
 add_subdirectory(config)
 

src/mongocxx/config/libmongocxx.pc.in

@@ -9,5 +9,5 @@ Version: @MONGOCXX_VERSION@
 Requires.private: libbson-@LIBBSON_REQUIRED_ABI_VERSION@
 Requires.private: libmongoc-@LIBMONGOC_REQUIRED_ABI_VERSION@
 Requires: libbsoncxx
-Cflags: -I${includedir}/mongocxx/@MONGOCXX_DIRECTORY_PREFIX@
+Cflags: -I${includedir}/mongocxx/@MONGOCXX_INLINE_NAMESPACE@
 Libs: -L${libdir} -lmongocxx