Skip to content

Commit ceaa9d6

Browse files
vector-of-boolvector-of-bool
authored
[CDRIVER-3414] Remove deprecated legacy CMake package files (#1956)
This change removes the legacy CMake config-file packages that were deprecated in CDRIVER-3413. Only the new package names remain.
1 parent e760cd7 commit ceaa9d6

File tree

19 files changed

+8
-418
lines changed

19 files changed

+8
-418
lines changed

‎.evergreen/generated_configs/legacy-config.yml

+4-44
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@ functions:
9494
# Compile a program that links dynamically or statically to libmongoc,
9595
# using variables from pkg-config or CMake's find_package command.
9696
export BUILD_SAMPLE_WITH_CMAKE=${BUILD_SAMPLE_WITH_CMAKE}
97-
export BUILD_SAMPLE_WITH_CMAKE_DEPRECATED=${BUILD_SAMPLE_WITH_CMAKE_DEPRECATED}
9897
export ENABLE_SSL=${ENABLE_SSL}
9998
export ENABLE_SNAPPY=${ENABLE_SNAPPY}
10099
LINK_STATIC= .evergreen/scripts/link-sample-program.sh
@@ -111,12 +110,10 @@ functions:
111110
set -o errexit
112111
# Compile a program that links dynamically or statically to libbson,
113112
# using variables from pkg-config or from CMake's find_package command.
114-
BUILD_SAMPLE_WITH_CMAKE= BUILD_SAMPLE_WITH_CMAKE_DEPRECATED= LINK_STATIC= .evergreen/scripts/link-sample-program-bson.sh
115-
BUILD_SAMPLE_WITH_CMAKE= BUILD_SAMPLE_WITH_CMAKE_DEPRECATED= LINK_STATIC=1 .evergreen/scripts/link-sample-program-bson.sh
116-
BUILD_SAMPLE_WITH_CMAKE=1 BUILD_SAMPLE_WITH_CMAKE_DEPRECATED= LINK_STATIC= .evergreen/scripts/link-sample-program-bson.sh
117-
BUILD_SAMPLE_WITH_CMAKE=1 BUILD_SAMPLE_WITH_CMAKE_DEPRECATED= LINK_STATIC=1 .evergreen/scripts/link-sample-program-bson.sh
118-
BUILD_SAMPLE_WITH_CMAKE=1 BUILD_SAMPLE_WITH_CMAKE_DEPRECATED=1 LINK_STATIC= .evergreen/scripts/link-sample-program-bson.sh
119-
BUILD_SAMPLE_WITH_CMAKE=1 BUILD_SAMPLE_WITH_CMAKE_DEPRECATED=1 LINK_STATIC=1 .evergreen/scripts/link-sample-program-bson.sh
113+
BUILD_SAMPLE_WITH_CMAKE= LINK_STATIC= .evergreen/scripts/link-sample-program-bson.sh
114+
BUILD_SAMPLE_WITH_CMAKE= LINK_STATIC=1 .evergreen/scripts/link-sample-program-bson.sh
115+
BUILD_SAMPLE_WITH_CMAKE=1 LINK_STATIC= .evergreen/scripts/link-sample-program-bson.sh
116+
BUILD_SAMPLE_WITH_CMAKE=1 LINK_STATIC=1 .evergreen/scripts/link-sample-program-bson.sh
120117
link sample program MSVC:
121118
- command: shell.exec
122119
type: test
@@ -634,40 +631,6 @@ tasks:
634631
- func: link sample program
635632
vars:
636633
BUILD_SAMPLE_WITH_CMAKE: 1
637-
- name: link-with-cmake-deprecated
638-
commands:
639-
- func: fetch-det
640-
- func: bootstrap-mongo-orchestration
641-
- func: link sample program
642-
vars:
643-
BUILD_SAMPLE_WITH_CMAKE: 1
644-
BUILD_SAMPLE_WITH_CMAKE_DEPRECATED: 1
645-
- name: link-with-cmake-ssl-deprecated
646-
commands:
647-
- func: fetch-det
648-
- func: bootstrap-mongo-orchestration
649-
- func: link sample program
650-
vars:
651-
BUILD_SAMPLE_WITH_CMAKE: 1
652-
BUILD_SAMPLE_WITH_CMAKE_DEPRECATED: 1
653-
ENABLE_SSL: 1
654-
- name: link-with-cmake-snappy-deprecated
655-
commands:
656-
- func: fetch-det
657-
- func: bootstrap-mongo-orchestration
658-
- func: link sample program
659-
vars:
660-
BUILD_SAMPLE_WITH_CMAKE: 1
661-
BUILD_SAMPLE_WITH_CMAKE_DEPRECATED: 1
662-
ENABLE_SNAPPY: 'ON'
663-
- name: link-with-cmake-mac-deprecated
664-
commands:
665-
- func: fetch-det
666-
- func: bootstrap-mongo-orchestration
667-
- func: link sample program
668-
vars:
669-
BUILD_SAMPLE_WITH_CMAKE: 1
670-
BUILD_SAMPLE_WITH_CMAKE_DEPRECATED: 1
671634
- name: link-with-cmake-windows
672635
commands:
673636
- func: fetch-det
@@ -16276,11 +16239,8 @@ buildvariants:
1627616239
- debug-compile-no-counters
1627716240
- compile-tracing
1627816241
- link-with-cmake
16279-
- link-with-cmake-deprecated
1628016242
- link-with-cmake-ssl
16281-
- link-with-cmake-ssl-deprecated
1628216243
- link-with-cmake-snappy
16283-
- link-with-cmake-snappy-deprecated
1628416244
- name: link-with-cmake-mac
1628516245
distros:
1628616246
- macos-14-arm64

‎.evergreen/legacy_config_generator/evergreen_config_lib/functions.py

+4-7
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@
6767
# Compile a program that links dynamically or statically to libmongoc,
6868
# using variables from pkg-config or CMake's find_package command.
6969
export BUILD_SAMPLE_WITH_CMAKE=${BUILD_SAMPLE_WITH_CMAKE}
70-
export BUILD_SAMPLE_WITH_CMAKE_DEPRECATED=${BUILD_SAMPLE_WITH_CMAKE_DEPRECATED}
7170
export ENABLE_SSL=${ENABLE_SSL}
7271
export ENABLE_SNAPPY=${ENABLE_SNAPPY}
7372
LINK_STATIC= .evergreen/scripts/link-sample-program.sh
@@ -79,12 +78,10 @@
7978
shell_mongoc(r'''
8079
# Compile a program that links dynamically or statically to libbson,
8180
# using variables from pkg-config or from CMake's find_package command.
82-
BUILD_SAMPLE_WITH_CMAKE= BUILD_SAMPLE_WITH_CMAKE_DEPRECATED= LINK_STATIC= .evergreen/scripts/link-sample-program-bson.sh
83-
BUILD_SAMPLE_WITH_CMAKE= BUILD_SAMPLE_WITH_CMAKE_DEPRECATED= LINK_STATIC=1 .evergreen/scripts/link-sample-program-bson.sh
84-
BUILD_SAMPLE_WITH_CMAKE=1 BUILD_SAMPLE_WITH_CMAKE_DEPRECATED= LINK_STATIC= .evergreen/scripts/link-sample-program-bson.sh
85-
BUILD_SAMPLE_WITH_CMAKE=1 BUILD_SAMPLE_WITH_CMAKE_DEPRECATED= LINK_STATIC=1 .evergreen/scripts/link-sample-program-bson.sh
86-
BUILD_SAMPLE_WITH_CMAKE=1 BUILD_SAMPLE_WITH_CMAKE_DEPRECATED=1 LINK_STATIC= .evergreen/scripts/link-sample-program-bson.sh
87-
BUILD_SAMPLE_WITH_CMAKE=1 BUILD_SAMPLE_WITH_CMAKE_DEPRECATED=1 LINK_STATIC=1 .evergreen/scripts/link-sample-program-bson.sh
81+
BUILD_SAMPLE_WITH_CMAKE= LINK_STATIC= .evergreen/scripts/link-sample-program-bson.sh
82+
BUILD_SAMPLE_WITH_CMAKE= LINK_STATIC=1 .evergreen/scripts/link-sample-program-bson.sh
83+
BUILD_SAMPLE_WITH_CMAKE=1 LINK_STATIC= .evergreen/scripts/link-sample-program-bson.sh
84+
BUILD_SAMPLE_WITH_CMAKE=1 LINK_STATIC=1 .evergreen/scripts/link-sample-program-bson.sh
8885
''',
8986
include_expansions_in_env=['distro_id']),
9087
)),

‎.evergreen/legacy_config_generator/evergreen_config_lib/tasks.py

-30
Original file line numberDiff line numberDiff line change
@@ -219,36 +219,6 @@ def __init__(
219219
suffix_commands=[func("link sample program", BUILD_SAMPLE_WITH_CMAKE=1, ENABLE_SNAPPY="ON")],
220220
),
221221
LinkTask("link-with-cmake-mac", suffix_commands=[func("link sample program", BUILD_SAMPLE_WITH_CMAKE=1)]),
222-
LinkTask(
223-
"link-with-cmake-deprecated",
224-
suffix_commands=[func("link sample program", BUILD_SAMPLE_WITH_CMAKE=1, BUILD_SAMPLE_WITH_CMAKE_DEPRECATED=1)],
225-
),
226-
LinkTask(
227-
"link-with-cmake-ssl-deprecated",
228-
suffix_commands=[
229-
func(
230-
"link sample program",
231-
BUILD_SAMPLE_WITH_CMAKE=1,
232-
BUILD_SAMPLE_WITH_CMAKE_DEPRECATED=1,
233-
ENABLE_SSL=1,
234-
)
235-
],
236-
),
237-
LinkTask(
238-
"link-with-cmake-snappy-deprecated",
239-
suffix_commands=[
240-
func(
241-
"link sample program",
242-
BUILD_SAMPLE_WITH_CMAKE=1,
243-
BUILD_SAMPLE_WITH_CMAKE_DEPRECATED=1,
244-
ENABLE_SNAPPY="ON",
245-
)
246-
],
247-
),
248-
LinkTask(
249-
"link-with-cmake-mac-deprecated",
250-
suffix_commands=[func("link sample program", BUILD_SAMPLE_WITH_CMAKE=1, BUILD_SAMPLE_WITH_CMAKE_DEPRECATED=1)],
251-
),
252222
LinkTask("link-with-cmake-windows", suffix_commands=[func("link sample program MSVC")]),
253223
LinkTask(
254224
"link-with-cmake-windows-ssl",

‎.evergreen/legacy_config_generator/evergreen_config_lib/variants.py

-3
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,8 @@ def days(n: int) -> int:
4848
"debug-compile-no-counters",
4949
"compile-tracing",
5050
"link-with-cmake",
51-
"link-with-cmake-deprecated",
5251
"link-with-cmake-ssl",
53-
"link-with-cmake-ssl-deprecated",
5452
"link-with-cmake-snappy",
55-
"link-with-cmake-snappy-deprecated",
5653
OD([("name", "link-with-cmake-mac"), ("distros", ["macos-14-arm64"])]),
5754
OD([("name", "link-with-cmake-mac-deprecated"), ("distros", ["macos-14-arm64"])]),
5855
OD([("name", "link-with-cmake-windows"), ("distros", ["windows-vsCurrent-large"])]),

‎Earthfile

-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ test-example:
6464
# Add the example files
6565
COPY --dir \
6666
src/libmongoc/examples/cmake \
67-
src/libmongoc/examples/cmake-deprecated \
6867
src/libmongoc/examples/hello_mongoc.c \
6968
/opt/mongoc-test/
7069
# Configure and build it

‎build/cmake/.gitignore

-4
This file was deleted.

‎build/cmake/LegacyPackage.cmake

-31
This file was deleted.

‎build/cmake/libbson-1.0-config.cmake.in

-29
This file was deleted.

‎build/cmake/libbson-static-1.0-config.cmake.in

-29
This file was deleted.

‎build/cmake/libmongoc-1.0-config.cmake.in

-29
This file was deleted.

‎build/cmake/libmongoc-static-1.0-config.cmake.in

-29
This file was deleted.

‎src/libbson/CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -400,7 +400,6 @@ install (EXPORT bson-targets
400400
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/bson-${BSON_API_VERSION}
401401
)
402402

403-
include (LegacyPackage)
404403
include (CPack)
405404

406405
if (MONGO_FUZZ)

‎src/libbson/examples/cmake-deprecated/.gitignore

-6
This file was deleted.

‎src/libbson/examples/cmake-deprecated/find_package/CMakeLists.txt

-41
This file was deleted.

0 commit comments

Comments
 (0)