Skip to content

Commit e283c4f

Browse files
committed
CDRIVER-2505 combine version files
1 parent 9a34944 commit e283c4f

File tree

9 files changed

+14
-14
lines changed

9 files changed

+14
-14
lines changed

CMakeLists.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@ include (GNUInstallDirs)
6262

6363
# Set MONGOC_MAJOR_VERSION, MONGOC_MINOR_VERSION, etc.
6464
include (LoadVersion)
65-
LoadVersion (${PROJECT_SOURCE_DIR}/src/libmongoc/VERSION_CURRENT MONGOC)
66-
LoadVersion (${PROJECT_SOURCE_DIR}/src/libmongoc/VERSION_RELEASED MONGOC_RELEASED)
65+
LoadVersion (${PROJECT_SOURCE_DIR}/VERSION_CURRENT MONGOC)
66+
LoadVersion (${PROJECT_SOURCE_DIR}/VERSION_RELEASED MONGOC_RELEASED)
6767

6868
include (MaintainerFlags)
6969

@@ -259,6 +259,8 @@ set (top_DIST_local
259259
NEWS
260260
README.rst
261261
THIRD_PARTY_NOTICES
262+
VERSION_CURRENT
263+
VERSION_RELEASED
262264
)
263265

264266
set_local_dist (top_DIST ${top_DIST_local})
File renamed without changes.
File renamed without changes.

src/libbson/CMakeLists.txt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/build/cmake)
2020
# Set BSON_MAJOR_VERSION, BSON_MINOR_VERSION, etc.
2121
set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/../../build/cmake)
2222
include (LoadVersion)
23-
LoadVersion (${PROJECT_SOURCE_DIR}/VERSION_CURRENT BSON)
24-
LoadVersion (${PROJECT_SOURCE_DIR}/VERSION_RELEASED BSON_RELEASED)
23+
LoadVersion (${PROJECT_SOURCE_DIR}/../../VERSION_CURRENT BSON)
24+
LoadVersion (${PROJECT_SOURCE_DIR}/../../VERSION_RELEASED BSON_RELEASED)
2525

2626
message ("libbson version (from VERSION_CURRENT file): ${BSON_VERSION}")
2727
if (NOT ${BSON_VERSION} STREQUAL ${BSON_RELEASED_VERSION})
@@ -371,8 +371,6 @@ set_local_dist (src_libbson_DIST_local
371371
CMakeLists.txt
372372
NEWS
373373
THIRD_PARTY_NOTICES
374-
VERSION_CURRENT
375-
VERSION_RELEASED
376374
)
377375

378376
set (src_libbson_DIST

src/libbson/doc/conf.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,11 @@
1818
project = 'Libbson'
1919
copyright = '2017-present, MongoDB, Inc'
2020

21-
version_path = os.path.join(os.path.dirname(__file__), '..', 'VERSION_CURRENT')
21+
version_path = os.path.join(
22+
os.path.dirname(__file__), '../../..', 'VERSION_CURRENT')
2223
version = open(version_path).read().strip()
23-
release_path = os.path.join(os.path.dirname(__file__), '..', 'VERSION_RELEASED')
24+
release_path = os.path.join(
25+
os.path.dirname(__file__), '../../..', 'VERSION_RELEASED')
2426
release = open(release_path).read().strip()
2527
release_major, release_minor, release_patch = release.split('.')
2628
release_download = 'https://github.com/mongodb/libbson/releases/download/{0}/libbson-{0}.tar.gz'.format(release)

src/libmongoc/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -894,8 +894,6 @@ add_subdirectory (tests)
894894
set_local_dist (src_libmongoc_DIST_local
895895
CMakeLists.txt
896896
THIRD_PARTY_NOTICES
897-
VERSION_CURRENT
898-
VERSION_RELEASED
899897
)
900898

901899
set (src_libmongoc_DIST

src/libmongoc/VERSION_CURRENT

Lines changed: 0 additions & 1 deletion
This file was deleted.

src/libmongoc/VERSION_RELEASED

Lines changed: 0 additions & 1 deletion
This file was deleted.

src/libmongoc/doc/conf.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,11 @@
2121
copyright = '2017-present, MongoDB, Inc'
2222
author = 'MongoDB, Inc'
2323

24-
version_path = os.path.join(os.path.dirname(__file__), '..', 'VERSION_CURRENT')
24+
version_path = os.path.join(
25+
os.path.dirname(__file__), '../../..', 'VERSION_CURRENT')
2526
version = open(version_path).read().strip()
26-
release_path = os.path.join(os.path.dirname(__file__), '..', 'VERSION_RELEASED')
27+
release_path = os.path.join(
28+
os.path.dirname(__file__), '../../..', 'VERSION_RELEASED')
2729
release = open(release_path).read().strip()
2830
release_major, release_minor, release_patch = release.split('.')
2931
release_download = 'https://github.com/mongodb/mongo-c-driver/releases/download/{0}/mongo-c-driver-{0}.tar.gz'.format(release)

0 commit comments

Comments
 (0)