Rely on our libevent, build all with CMake, general clean-up

.ci_support/win_64_.yaml

@@ -8,6 +8,8 @@ channel_targets:
 - conda-forge main
 cxx_compiler:
 - vs2019
+libevent:
+- 2.1.12
 openssl:
 - '3'
 pin_run_as_build:

recipe/bld.bat

@@ -1,35 +1,24 @@
-pushd thirdparty\src\libevent
-nmake -f Makefile.nmake
-mkdir lib
-move *.lib lib\
-move WIN32-Code\event2\* include\event2\
-move WIN32-Code\nmake\* include\event2\
-move WIN32-Code\nmake\event2\* include\event2\
-move *.h include\
-if errorlevel 1 exit 1
-
-popd
+@echo on
 
 set BOOST_ROOT=%PREFIX%
 set ZLIB_ROOT=%PREFIX%
 set OPENSSL_ROOT=%PREFIX%
 set OPENSSL_ROOT_DIR=%PREFIX%
 
-cd %SRC_DIR%\build
-
-:: make thrift/windows/config.h available for the compiler:
-SET CL=/I"%SRC_DIR%\lib\cpp\src"
+set "CXXFLAGS=%CXXFLAGS% -DNOMINMAX"
 
-:: WITH_SHARED_LIB must be off - the cmake config doesn't support shared libs yet
+:: folder "build" exists already
+mkdir cmake-build
+cd cmake-build
 
 cmake -GNinja ^
       -DCMAKE_BUILD_TYPE=Release ^
       -DCMAKE_POLICY_DEFAULT_CMP0074=NEW ^
+      -DBIN_INSTALL_DIR="%LIBRARY_BIN%" ^
+      -DLIB_INSTALL_DIR="%LIBRARY_LIB%" ^
       -DOpenSSL_ROOT="%LIBRARY_PREFIX%" ^
       -DOPENSSL_ROOT_DIR="%LIBRARY_PREFIX%" ^
-      -DLIBEVENT_ROOT="%SRC_DIR%\thirdparty\src\libevent" ^
-      -DFLEX_EXECUTABLE="%SRC_DIR%\thirdparty\dist\winflexbison\win_flex.exe" ^
-      -DBISON_EXECUTABLE="%SRC_DIR%\thirdparty\dist\winflexbison\win_bison.exe" ^
+      -DLIBEVENT_ROOT="%LIBRARY_PREFIX%" ^
       -DCMAKE_INSTALL_PREFIX="%LIBRARY_PREFIX%" ^
       -DBUILD_PYTHON=OFF ^
       -DBUILD_JAVA=OFF ^
@@ -40,13 +29,12 @@ cmake -GNinja ^
       -DBoost_ADDITIONAL_VERSIONS="1.70.0" ^
       -DBOOST_ROOT=%LIBRARY_PREFIX% ^
       -DBoost_INCLUDE_DIRS=%LIBRARY_PREFIX%\include ^
-      -DWITH_SHARED_LIB=OFF ^
       -DBoost_DEBUG=ON ^
       -DBoost_NO_BOOST_CMAKE=ON ^
       -DBUILD_TESTING=OFF ^
       -DBUILD_SHARED_LIBS=ON ^
       "%SRC_DIR%"
-if errorlevel 1 exit 1
+if %ERRORLEVEL% neq 0 exit 1
 
-ninja
-if errorlevel 1 exit 1
+cmake --build .
+if %ERRORLEVEL% neq 0 exit 1

recipe/build.sh

@@ -1,23 +1,19 @@
 #!/bin/env bash
-# Get an updated config.sub and config.guess
-cp $BUILD_PREFIX/share/libtool/build-aux/config.* .
+set -ex
 
-set -e
-set -x
+# folder "build" exists already
+mkdir cmake-build
+cd cmake-build
 
 BOOST_ROOT=$PREFIX
 ZLIB_ROOT=$PREFIX
 LIBEVENT_ROOT=$PREFIX
 
 export OPENSSL_ROOT=$PREFIX
 export OPENSSL_ROOT_DIR=$PREFIX
-export M4="$(which m4)"
-
-pushd "$SRC_DIR"
 
-mkdir cmake-build
-pushd cmake-build
-cmake ${CMAKE_ARGS} \
+cmake -G Ninja \
+    ${CMAKE_ARGS} \
     -DCMAKE_INSTALL_PREFIX=$PREFIX \
     -DBUILD_SHARED_LIBS=ON \
     -DBUILD_PYTHON=OFF \
@@ -26,21 +22,10 @@ cmake ${CMAKE_ARGS} \
     -DBUILD_JAVASCRIPT=OFF \
     -DBUILD_NODEJS=OFF \
     -DBUILD_C_GLIB=OFF \
-    -DBUILD_TUTORIALS=OFF \
+    -DBUILD_TUTORIALS=OFF \
     -DCMAKE_FIND_ROOT_PATH="$PREFIX" \
     -DBUILD_TESTING=OFF \
     -DBoost_INCLUDE_DIRS=${PREFIX}/include \
-    -GNinja \
     ..
 
-# Be explicit about tutorials being unwanted.
-# Somehow this gets overriden on first run.
-cmake -DBUILD_TUTORIALS=OFF .
-
-# Decrease parallelism a bit as we will otherwise get out-of-memory problems
-# This is only necessary on Travis
-if [ "$(uname -m)" = "ppc64le" ]; then
-    ninja -j1
-else
-    ninja
-fi
+cmake --build .

recipe/cmake_test/CMakeLists.txt

@@ -0,0 +1,4 @@
+project(cf_dummy LANGUAGES C CXX)
+cmake_minimum_required(VERSION 3.12)
+# make sure package is found
+find_package(Thrift REQUIRED)

recipe/install.bat

@@ -1,13 +1,16 @@
-cd %SRC_DIR%\build
-ninja install
-if errorlevel 1 exit 1
+@echo on
+
+cd cmake-build
+
+cmake --install .
+if %ERRORLEVEL% neq 0 exit 1
 
 if [%PKG_NAME%] == [libthrift] (
   del %PREFIX%\Library\bin\thrift.exe
-  if errorlevel 1 exit 1
+  if %ERRORLEVEL% neq 0 exit 1
   move %PREFIX%\Library\bin\thriftmd.lib %PREFIX%\Library\lib\thriftmd.lib
-  if errorlevel 1 exit 1
+  if %ERRORLEVEL% neq 0 exit 1
 ) else (
   del %PREFIX%\Library\bin\thriftmd.lib
-  if errorlevel 1 exit 1
+  if %ERRORLEVEL% neq 0 exit 1
 )

recipe/install.sh

@@ -1,9 +1,8 @@
 #!/bin/bash
+set -ex
 
-set -exo pipefail
-
-pushd cmake-build
-ninja install
+cd cmake-build
+cmake --install .
 
 if [[ "$PKG_NAME" == libthrift ]]; then
     rm $PREFIX/bin/thrift