CDRIVER-2369 don't bundle snappy

Author: ajdavis

.evergreen/check-release-archive.sh

@@ -14,7 +14,7 @@ esac
 which sphinx-build
 sphinx-build --version
 
-./autogen.sh --enable-html-docs --enable-man-pages --with-snappy=bundled --with-zlib=bundled --with-libbson=bundled
+./autogen.sh --enable-html-docs --enable-man-pages --with-snappy=auto --with-zlib=bundled --with-libbson=bundled
 make distcheck
 
 # Check that docs were included, but sphinx temp files weren't.

.evergreen/compile-unix.sh

@@ -21,7 +21,7 @@ ANALYZE=${ANALYZE:-no}
 COVERAGE=${COVERAGE:-no}
 SASL=${SASL:-no}
 SSL=${SSL:-no}
-SNAPPY=${SNAPPY:-bundled}
+SNAPPY=${SNAPPY:-auto}
 ZLIB=${ZLIB:-bundled}
 INSTALL_DIR=$(pwd)/install-dir
 
@@ -129,7 +129,7 @@ case "$MARCH" in
    i386)
       CFLAGS="$CFLAGS -m32 -march=i386"
       CXXFLAGS="$CXXFLAGS -m32 -march=i386"
-      CONFIGURE_FLAGS="$CONFIGURE_FLAGS --with-snappy=bundled --with-zlib=bundled"
+      CONFIGURE_FLAGS="$CONFIGURE_FLAGS --with-snappy=auto --with-zlib=bundled"
    ;;
    s390x)
       CFLAGS="$CFLAGS -march=z196 -mtune=zEC12"

.evergreen/config.yml

@@ -513,7 +513,7 @@ tasks:
             script: |
               set -o errexit
               set -o xtrace
-              DEBUG=yes CC='${CC}' MARCH='${MARCH}' SNAPPY=bundled ZLIB=no sh .evergreen/compile.sh
+              DEBUG=yes CC='${CC}' MARCH='${MARCH}' SNAPPY=system ZLIB=no sh .evergreen/compile.sh
         - func: "upload build"
 
     - name: debug-compile-compression
@@ -526,7 +526,7 @@ tasks:
             script: |
               set -o errexit
               set -o xtrace
-              DEBUG=yes CC='${CC}' MARCH='${MARCH}' SNAPPY=bundled ZLIB=bundled sh .evergreen/compile.sh
+              DEBUG=yes CC='${CC}' MARCH='${MARCH}' SNAPPY=system ZLIB=bundled sh .evergreen/compile.sh
         - func: "upload build"
 
     - name: test-latest-server-compression-zlib
@@ -764,7 +764,7 @@ tasks:
           vars:
             BUILD_SAMPLE_WITH_CMAKE: "1"
 
-    - name: link-with-cmake-mac
+    - name: link-with-cmake-ssl
       depends_on:
         - name: "make-release-archive"
           variant: releng
@@ -775,19 +775,20 @@ tasks:
         - func: "link sample program"
           vars:
             BUILD_SAMPLE_WITH_CMAKE: "1"
+            ENABLE_SSL: "1"
 
-    - name: link-with-cmake-ssl
+    - name: link-with-cmake-snappy
       depends_on:
         - name: "make-release-archive"
           variant: releng
       commands:
         - func: "bootstrap mongo-orchestration"
           vars:
-            VERSION: "3.4"
+            VERSION: "latest"
         - func: "link sample program"
           vars:
             BUILD_SAMPLE_WITH_CMAKE: "1"
-            ENABLE_SSL: "1"
+            ENABLE_SNAPPY: "1"
 
     - name: link-with-cmake-windows
       depends_on:
@@ -803,9 +804,9 @@ tasks:
             working_dir: "mongoc"
             script: |
               set -o errexit
-              # Build libmongoc with CMake (not Autotools) and compile a program
-              # that links dynamically or statically to it, using variables from
-              # CMake's find_package command.
+              # Build libmongoc with CMake and compile a program that links
+              # dynamically or statically to it, using variables from CMake's
+              # find_package command.
               LINK_STATIC=  cmd.exe /c .\\.evergreen\\link-sample-program-msvc.cmd
               LINK_STATIC=1 cmd.exe /c .\\.evergreen\\link-sample-program-msvc.cmd
 
@@ -824,30 +825,43 @@ tasks:
             working_dir: "mongoc"
             script: |
               set -o errexit
-              # Build libmongoc with CMake (not Autotools) and compile a program
-              # that links dynamically or statically to it, using variables from
-              # CMake's find_package command.
+              # Build libmongoc with CMake and compile a program that links
+              # dynamically or statically to it, using variables from CMake's
+              # find_package command.
               export ENABLE_SSL=1
               LINK_STATIC=  cmd.exe /c .\\.evergreen\\link-sample-program-msvc.cmd
               LINK_STATIC=1 cmd.exe /c .\\.evergreen\\link-sample-program-msvc.cmd
 
-    - name: link-with-cmake-mingw
+    - name: link-with-cmake-windows-snappy
       depends_on:
         - name: "make-release-archive"
           variant: releng
       commands:
         - func: "bootstrap mongo-orchestration"
           vars:
-            VERSION: "3.4"
+            VERSION: "latest"
         - command: shell.exec
           type: test
           params:
             working_dir: "mongoc"
             script: |
-              # Build libmongoc with CMake (not Autotools) and compile a program
-              # that links dynamically or statically to it, using variables from
-              # pkg-config.exe.
-              cmd.exe /c .\\.evergreen\\link-sample-program-mingw.cmd
+              set -o errexit
+              # Build libmongoc with CMake and compile a program that links
+              # dynamically or statically to it, using variables from CMake's
+              # find_package command.
+              export ENABLE_SNAPPY=1
+              LINK_STATIC=  cmd.exe /c .\\.evergreen\\link-sample-program-msvc.cmd
+              LINK_STATIC=1 cmd.exe /c .\\.evergreen\\link-sample-program-msvc.cmd
+
+    - name: link-with-cmake-mingw
+      depends_on:
+        - name: "make-release-archive"
+          variant: releng
+      commands:
+        - func: "bootstrap mongo-orchestration"
+          vars:
+            VERSION: "3.4"
+        - func: "link sample program"
 
     - name: link-with-pkg-config
       depends_on:
@@ -6561,9 +6575,18 @@ buildvariants:
       - ubuntu1604-test
       - ubuntu1404-build
       - ubuntu1404-test
-    - name: "link-with-cmake-mac"
+    - name: "link-with-cmake-ssl"
       distros:
-      - macos-1012
+      - ubuntu1604-build
+      - ubuntu1604-test
+      - ubuntu1404-build
+      - ubuntu1404-test
+    - name: "link-with-cmake-snappy"
+      distros:
+      - ubuntu1604-build
+      - ubuntu1604-test
+      - ubuntu1404-build
+      - ubuntu1404-test
     - name: "link-with-cmake-windows"
       distros:
       - windows-64-vs2015-compile
@@ -6572,6 +6595,10 @@ buildvariants:
       distros:
       - windows-64-vs2015-compile
       - windows-64-vs2015-test
+    - name: "link-with-cmake-windows-snappy"
+      distros:
+      - windows-64-vs2015-compile
+      - windows-64-vs2015-test
     - name: "link-with-cmake-mingw"
       distros:
       - windows-64-vs2013-compile
@@ -6581,6 +6608,12 @@ buildvariants:
       - ubuntu1604-test
       - ubuntu1404-build
       - ubuntu1404-test
+    - name: "link-with-pkg-config-ssl"
+      distros:
+      - ubuntu1604-build
+      - ubuntu1604-test
+      - ubuntu1404-build
+      - ubuntu1404-test
     - name: "link-with-pkg-config-mac"
       distros:
       - macos-1012

.evergreen/link-sample-program-msvc.cmd

@@ -1,6 +1,7 @@
 REM Supported/used environment variables:
 REM   LINK_STATIC              Whether to statically link to libmongoc
 REM   ENABLE_SSL               Enable SSL with Microsoft Secure Channel
+REM   ENABLE_SNAPPY            Enable Snappy compression
 
 rem Ensure Cygwin executables like sh.exe are not in PATH
 rem set PATH=C:\Windows\system32;C:\Windows
@@ -32,13 +33,27 @@ cd src\libbson
 %CMAKE% -G "Visual Studio 14 2015 Win64" -DCMAKE_INSTALL_PREFIX=%INSTALL_DIR% .
 msbuild.exe /m ALL_BUILD.vcxproj
 msbuild.exe INSTALL.vcxproj
+cd %BUILD_DIR%
 
-cd ..\..
+if "%ENABLE_SNAPPY%"=="1" (
+  rem Enable Snappy
+  curl --silent --retry 5 -LO https://github.com/google/snappy/archive/1.1.7.tar.gz
+  %TAR% xzf 1.1.7.tar.gz
+  cd snappy-1.1.7
+  %CMAKE% -G "Visual Studio 14 2015 Win64" -DCMAKE_INSTALL_PREFIX=%INSTALL_DIR% .
+  msbuild.exe /m ALL_BUILD.vcxproj
+  msbuild.exe INSTALL.vcxproj
+  set SNAPPY_OPTION=-DENABLE_SNAPPY=ON
+) else (
+  set SNAPPY_OPTION=-DENABLE_SNAPPY=OFF
+)
+
+cd %BUILD_DIR%
 rem Build libmongoc
 if "%ENABLE_SSL%"=="1" (
   %CMAKE% -G "Visual Studio 14 2015 Win64" -DCMAKE_PREFIX_PATH=%INSTALL_DIR%\lib\cmake -DCMAKE_INSTALL_PREFIX=%INSTALL_DIR% -DENABLE_SSL=WINDOWS .
 ) else (
-  %CMAKE% -G "Visual Studio 14 2015 Win64" -DCMAKE_PREFIX_PATH=%INSTALL_DIR%\lib\cmake -DCMAKE_INSTALL_PREFIX=%INSTALL_DIR% -DENABLE_SSL=OFF .
+  %CMAKE% -G "Visual Studio 14 2015 Win64" -DCMAKE_PREFIX_PATH=%INSTALL_DIR%\lib\cmake -DCMAKE_INSTALL_PREFIX=%INSTALL_DIR% -DENABLE_SSL=OFF %ENABLE_SNAPPY_OPTION% .
 )
 
 msbuild.exe /m ALL_BUILD.vcxproj

.evergreen/link-sample-program.sh

@@ -7,6 +7,8 @@ set -o errexit  # Exit the script with error if any of the commands fail
 #   LINK_STATIC                Whether to statically link to libmongoc
 #   BUILD_SAMPLE_WITH_CMAKE    Link program w/ CMake. Default: use pkg-config.
 #   ENABLE_SSL                 Set -DENABLE_SSL or --enable-ssl.
+#   ENABLE_SNAPPY              Set -DENABLE_SNAPPY or --with-snappy.
+#   CMAKE                      Path to cmake executable.
 
 
 echo "BUILD_MONGOC_WITH_CMAKE=$BUILD_MONGOC_WITH_CMAKE LINK_STATIC=$LINK_STATIC BUILD_SAMPLE_WITH_CMAKE=$BUILD_SAMPLE_WITH_CMAKE"
@@ -18,7 +20,15 @@ else
 fi
 
 if [ $(uname) = "Darwin" ]; then
-  CMAKE=${CMAKE:-/Applications/Cmake.app/Contents/bin/cmake}
+  if [ ! "$CMAKE" ]; then
+    if [ -f ""/Applications/cmake-3.2.2-Darwin-x86_64/CMake.app/Contents/bin/cmake" ]; then
+      CMAKE="/Applications/cmake-3.2.2-Darwin-x86_64/CMake.app/Contents/bin/cmake"
+    elif [ -f ""/Applications/Cmake.app/Contents/bin/cmake" ]; then
+      CMAKE="/Applications/Cmake.app/Contents/bin/cmake"
+    else
+      CMAKE=cmake
+    fi
+  fi
   SO=dylib
   LIB_SO=libmongoc-1.0.0.dylib
   LDD="otool -L"
@@ -42,6 +52,14 @@ mkdir -p $INSTALL_DIR
 cd $BUILD_DIR
 $TAR xf ../../mongoc.tar.gz -C . --strip-components=1
 
+if [ "$ENABLE_SNAPPY" ]; then
+  SNAPPY_CONFIGURE_OPTION="--with-snappy=system"
+  SNAPPY_CMAKE_OPTION="-DENABLE_SNAPPY=ON"
+else
+  SNAPPY_CONFIGURE_OPTION="--with-snappy=no"
+  SNAPPY_CMAKE_OPTION="-DENABLE_SNAPPY=OFF"
+fi
+
 if [ "$ENABLE_SSL" ]; then
   SSL_CONFIGURE_OPTION="--enable-ssl"
   SSL_CMAKE_OPTION="-DENABLE_SSL:BOOL=ON"
@@ -67,11 +85,11 @@ if [ "$BUILD_MONGOC_WITH_CMAKE" ]; then
   make install
   cd ../..
 
-  $CMAKE -DCMAKE_INSTALL_PREFIX=$INSTALL_DIR -DCMAKE_PREFIX_PATH=$INSTALL_DIR/lib/cmake $SSL_CMAKE_OPTION $STATIC_CMAKE_OPTION .
+  $CMAKE -DCMAKE_INSTALL_PREFIX=$INSTALL_DIR -DCMAKE_PREFIX_PATH=$INSTALL_DIR/lib/cmake $SSL_CMAKE_OPTION $SNAPPY_CMAKE_OPTION $STATIC_CMAKE_OPTION .
   make
   make install
 else
-  ./configure --prefix=$INSTALL_DIR --disable-examples $SSL_CONFIGURE_OPTION $STATIC_CONFIGURE_OPTION --with-libbson=bundled
+  ./configure --prefix=$INSTALL_DIR --disable-examples $SSL_CONFIGURE_OPTION $SNAPPY_CONFIGURE_OPTION $STATIC_CONFIGURE_OPTION --with-libbson=bundled
   make
   make install
 fi

CMakeLists.txt

@@ -36,12 +36,7 @@ if (NOT WIN32)
     message(WARNING "CMake support is experimental and may not produce production quality artifacts")
 endif ()
 
-if (WIN32 AND ENABLE_SNAPPY STREQUAL "AUTO")
-   project (libmongoc C CXX)
-   set (ENABLE_SNAPPY "bundled")
-else ()
-   project (libmongoc C CXX)
-endif ()
+project (libmongoc C)
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/build/cmake)
 
@@ -350,10 +345,10 @@ endif ()
 
 set (MONGOC_INTERNAL_INCLUDE_DIRS "")
 
-if (ENABLE_SNAPPY STREQUAL "bundled")
-   set (MONGOC_ENABLE_COMPRESSION 1)
-   set (MONGOC_ENABLE_COMPRESSION_SNAPPY 1)
-   include(FindSnappy)
+# Sets SNAPPY_LIBS and SNAPPY_INCLUDE_DIRS.
+include (FindSnappy)
+if (SNAPPY_INCLUDE_DIRS)
+   include_directories ("${SNAPPY_INCLUDE_DIRS}")
 endif ()
 
 if (ENABLE_ZLIB STREQUAL "bundled")
@@ -624,7 +619,7 @@ if(CMAKE_USE_PTHREADS_INIT)
    set(THREAD_LIB ${CMAKE_THREAD_LIBS_INIT})
 endif()
 
-set (LIBS ${SASL_LIBS} ${SSL_LIBS} ${SHM_LIB} Threads::Threads)
+set (LIBS ${SASL_LIBS} ${SSL_LIBS} ${SHM_LIB} ${SNAPPY_LIBS} Threads::Threads)
 if(WIN32)
    set (LIBS ${LIBS} ws2_32)
 endif()
@@ -650,12 +645,6 @@ if (MONGOC_ENABLE_STATIC)
    set_target_properties(mongoc_static PROPERTIES OUTPUT_NAME "mongoc-static-${MONGOC_API_VERSION}")
 endif ()
 
-if (ENABLE_SNAPPY STREQUAL "bundled")
-   set_target_properties(mongoc_shared PROPERTIES LINKER_LANGUAGE CXX)
-   if (MONGOC_ENABLE_STATIC)
-      set_target_properties(mongoc_static PROPERTIES LINKER_LANGUAGE CXX)
-   endif ()
-endif ()
 function(mongoc_add_test test use_shared)
    if (ENABLE_TESTS)
       add_executable(${test} ${ARGN})

Makefile.am

@@ -38,7 +38,7 @@ endif
 include build/Makefile.am
 
 ACLOCAL_AMFLAGS = -I build/autotools/m4 ${ACLOCAL_FLAGS}
-DISTCHECK_CONFIGURE_FLAGS = --enable-silent-rules --enable-man-pages --enable-html-docs --enable-sasl --enable-ssl --enable-maintainer-flags --enable-debug --with-libbson=bundled --with-snappy=bundled --with-zlib=bundled
+DISTCHECK_CONFIGURE_FLAGS = --enable-silent-rules --enable-man-pages --enable-html-docs --enable-sasl --enable-ssl --enable-maintainer-flags --enable-debug --with-libbson=bundled --with-snappy=auto --with-zlib=bundled
 
 mongocdocdir = ${docdir}
 mongocdoc_DATA = \