@@ -157,6 +157,8 @@ c_driver_variables:
157
157
configure :
158
158
standard : &configure_flags_default
159
159
configure_flags : " --enable-experimental-features --enable-html-docs=no --enable-man-pages=no --enable-yelp=no --enable-examples=no --enable-optimizations --enable-maintainer-flags --disable-silent-rules --disable-automatic-init-and-cleanup --with-libbson=bundled"
160
+ no_experimental : &configure_flags_no_experimental
161
+ configure_flags : " --enable-html-docs=no --enable-man-pages=no --enable-yelp=no --enable-examples=no --enable-optimizations --enable-maintainer-flags --disable-silent-rules --disable-automatic-init-and-cleanup --with-libbson=bundled"
160
162
161
163
# # Extra $PATH entries
162
164
paths :
@@ -307,11 +309,11 @@ c_driver_variables:
307
309
git submodule update --init
308
310
cd src/libbson
309
311
echo "MSBUILD: $MSBUILD, GENERATOR: $GENERATOR, CMAKE_DEFS: $CMAKE_DEFS"
310
- "$cmake" -G "$GENERATOR" "-DENABLE_EXPERIMENTAL_FEATURES=ON" "- DCMAKE_INSTALL_PREFIX=C:/mongo-c-driver"
312
+ "$cmake" -G "$GENERATOR" "-DCMAKE_INSTALL_PREFIX=C:/mongo-c-driver"
311
313
"$MSBUILD" /m ALL_BUILD.vcxproj
312
314
"$MSBUILD" /m INSTALL.vcxproj
313
315
cd ../..
314
- "$cmake" -G "$GENERATOR" "-DENABLE_EXPERIMENTAL_FEATURES=ON" "- DCMAKE_INSTALL_PREFIX=C:/mongo-c-driver" "-DBSON_ROOT_DIR=C:/mongo-c-driver" $CMAKE_DEFS
316
+ "$cmake" -G "$GENERATOR" "-DCMAKE_INSTALL_PREFIX=C:/mongo-c-driver" "-DBSON_ROOT_DIR=C:/mongo-c-driver" $CMAKE_DEFS
315
317
"$MSBUILD" /m ALL_BUILD.vcxproj
316
318
"$MSBUILD" /m INSTALL.vcxproj
317
319
(cd src/libbson && ./Debug/test-libbson.exe --no-fork -d)
@@ -431,7 +433,7 @@ c_driver_variables:
431
433
msvc2010_32bit : &with_msvc2010_32bit
432
434
generator : Visual Studio 10 2010
433
435
# Evergreen builders only have 64-bit SSL and SASL available.
434
- cmake_defs : " -DENABLE_SSL:BOOL=OFF -DENABLE_SASL:BOOL=OFF"
436
+ cmake_defs : " -DENABLE_SSL:BOOL=OFF -DENABLE_SASL:BOOL=OFF -DENABLE_EXPERIMENTAL_FEATURES=ON "
435
437
msbuild : /cygdrive/c/Windows/Microsoft.NET/Framework/v4.0.30319/MSBuild.exe
436
438
msvc2010 : &with_msvc2010
437
439
generator : Visual Studio 10 2010 Win64
@@ -440,7 +442,7 @@ c_driver_variables:
440
442
msvc2013_32bit : &with_msvc2013_32bit
441
443
generator : Visual Studio 12 2013
442
444
# Evergreen builders only have 64-bit SSL and SASL available.
443
- cmake_defs : " -DENABLE_SSL:BOOL=OFF -DENABLE_SASL:BOOL=OFF"
445
+ cmake_defs : " -DENABLE_SSL:BOOL=OFF -DENABLE_SASL:BOOL=OFF -DENABLE_EXPERIMENTAL_FEATURES=ON "
444
446
msbuild : /cygdrive/c/Program Files (x86)/MSBuild/12.0/Bin/MSBuild.exe
445
447
msvc2013 : &with_msvc2013
446
448
generator : Visual Studio 12 2013 Win64
@@ -450,11 +452,11 @@ c_driver_variables:
450
452
generator : Visual Studio 12 2013 Win64
451
453
msbuild : /cygdrive/c/Program Files (x86)/MSBuild/12.0/Bin/MSBuild.exe
452
454
dllpath : " c:/openssl/bin,c:/sasl/bin"
453
- cmake_defs : " -DENABLE_SSL=WINDOWS"
455
+ cmake_defs : " -DENABLE_SSL=WINDOWS -DENABLE_EXPERIMENTAL_FEATURES=ON "
454
456
msvc2015_32bit : &with_msvc2015_32bit
455
457
generator : Visual Studio 14 2015
456
458
# Evergreen builders only have 64-bit SSL and SASL available.
457
- cmake_defs : " -DENABLE_SSL:BOOL=OFF -DENABLE_SASL:BOOL=OFF"
459
+ cmake_defs : " -DENABLE_SSL:BOOL=OFF -DENABLE_SASL:BOOL=OFF -DENABLE_EXPERIMENTAL_FEATURES=ON "
458
460
msbuild : /cygdrive/c/Program Files (x86)/MSBuild/14.0/Bin/MSBuild.exe
459
461
msvc2015 : &with_msvc2015
460
462
generator : Visual Studio 14 2015 Win64
@@ -464,12 +466,17 @@ c_driver_variables:
464
466
generator : Visual Studio 14 2015 Win64
465
467
msbuild : /cygdrive/c/Program Files (x86)/MSBuild/14.0/Bin/MSBuild.exe
466
468
dllpath : " c:/openssl/bin,c:/sasl/bin"
467
- cmake_defs : " -DENABLE_SSL=WINDOWS"
469
+ cmake_defs : " -DENABLE_SSL=WINDOWS -DENABLE_EXPERIMENTAL_FEATURES=ON "
468
470
msvc2015 : &with_msvc2015_openssl
469
471
generator : Visual Studio 14 2015 Win64
470
472
msbuild : /cygdrive/c/Program Files (x86)/MSBuild/14.0/Bin/MSBuild.exe
471
473
dllpath : " c:/openssl/bin,c:/sasl/bin"
472
- cmake_defs : " -DENABLE_SSL=OPENSSL"
474
+ cmake_defs : " -DENABLE_SSL=OPENSSL -DENABLE_EXPERIMENTAL_FEATURES=ON"
475
+ msvc2015 : &with_msvc2015_no_experimental
476
+ generator : Visual Studio 14 2015 Win64
477
+ msbuild : /cygdrive/c/Program Files (x86)/MSBuild/14.0/Bin/MSBuild.exe
478
+ dllpath : " c:/openssl/bin,c:/sasl/bin"
479
+ cmake_defs : " -DENABLE_SSL=OPENSSL" # Omit "ENABLE_EXPERIMENTAL_FEATURES"
473
480
474
481
# # all windows buildvariants have these attributes in common
475
482
windows_common : &windows_common
@@ -1627,6 +1634,17 @@ buildvariants:
1627
1634
- windows-64-vs2015-compile
1628
1635
tasks : *topology_tests
1629
1636
1637
+ - name : windows-64-vs2015-no-experimental
1638
+ display_name : " Win VS2015 64 No-Experimental"
1639
+ expansions :
1640
+ << : *msvc_common
1641
+ << : *mongo_url_windows64
1642
+ << : *with_msvc2015_no_experimental
1643
+ run_on :
1644
+ - windows-64-vs2015-compile
1645
+ tasks :
1646
+ - compile
1647
+
1630
1648
- name : windows-64-vs2015-nativessl
1631
1649
display_name : " Win VS2015 64 NativeSSL"
1632
1650
expansions :
@@ -1769,3 +1787,11 @@ buildvariants:
1769
1787
- ubuntu1404-build
1770
1788
tasks : *compile_unix_variants
1771
1789
1790
+ - name : compile-ubuntu1404-no-experimental
1791
+ display_name : " Ubuntu 14.04 No-Experimental"
1792
+ expansions :
1793
+ CFLAGS : " -m64 -march=x86-64 -Werror"
1794
+ << : *configure_flags_no_experimental
1795
+ run_on :
1796
+ - ubuntu1404-build
1797
+ tasks : *compile_most_unix_variants
0 commit comments