librdkafka is now built with msvcr140 (previously 120)

edenhill · edenhill · commit b67f23ca1ec8 · 2022-01-06T11:48:11.000+01:00
diff --git a/tools/wheels/build-wheels.bat b/tools/wheels/build-wheels.bat
@@ -19,7 +19,7 @@ set CIBW_TEST_REQUIRES=-r tests/requirements.txt
 set CIBW_TEST_COMMAND=pytest {project}\tests\test_Producer.py
 rem set CIBW_BUILD_VERBOSITY=3
 set include=%cd%\%DEST%\build\native\include
-set lib=%cd%\%DEST%\build\native\lib\win\%ARCH%\win-%ARCH%-Release\v120
+set lib=%cd%\%DEST%\build\native\lib\win\%ARCH%\win-%ARCH%-Release\v140
 set DLL_DIR=%cd%\%DEST%\runtimes\win-%ARCH%\native
 set CIBW_REPAIR_WHEEL_COMMAND=python -m delvewheel repair --add-path %DLL_DIR% -w {dest_dir} {wheel}
 
diff --git a/tools/windows-copy-librdkafka.bat b/tools/windows-copy-librdkafka.bat
@@ -32,12 +32,12 @@ if exist %pypath64% (
 
 rem Copy x86 libs and dlls
 if exist %pypath% (
-	echo A | xcopy /F dest\librdkafka.redist.%librdkafka_version%\build\native\lib\win\x86\win-x86-Release\v120\librdkafka.lib %pypath%\libs\* || exit /b 1
+	echo A | xcopy /F dest\librdkafka.redist.%librdkafka_version%\build\native\lib\win\x86\win-x86-Release\v140\librdkafka.lib %pypath%\libs\* || exit /b 1
 	echo A | xcopy /I /F /S dest\librdkafka.redist.%librdkafka_version%\runtimes\win-x86\native\* %pypath%\libs || exit /b 1
 )
 
 rem Copy x64 libs and dlls
 if exist %pypath64% (
-	echo A | xcopy /F dest\librdkafka.redist.%librdkafka_version%\build\native\lib\win\x64\win-x64-Release\v120\librdkafka.lib %pypath64%\libs\* || exit /b 1
+	echo A | xcopy /F dest\librdkafka.redist.%librdkafka_version%\build\native\lib\win\x64\win-x64-Release\v140\librdkafka.lib %pypath64%\libs\* || exit /b 1
 	echo A | xcopy /I /F /S dest\librdkafka.redist.%librdkafka_version%\runtimes\win-x64\native\* %pypath64%\libs || exit /b 1
 )

Original file line number	Diff line number	Diff line change
`@@ -32,12 +32,12 @@ if exist %pypath64% (`
`32`	`32`
`33`	`33`	`rem Copy x86 libs and dlls`
`34`	`34`	`if exist %pypath% (`
`35`		`- echo A \| xcopy /F dest\librdkafka.redist.%librdkafka_version%\build\native\lib\win\x86\win-x86-Release\v120\librdkafka.lib %pypath%\libs\* \|\| exit /b 1`
	`35`	`+ echo A \| xcopy /F dest\librdkafka.redist.%librdkafka_version%\build\native\lib\win\x86\win-x86-Release\v140\librdkafka.lib %pypath%\libs\* \|\| exit /b 1`
`36`	`36`	`echo A \| xcopy /I /F /S dest\librdkafka.redist.%librdkafka_version%\runtimes\win-x86\native\* %pypath%\libs \|\| exit /b 1`
`37`	`37`	`)`
`38`	`38`
`39`	`39`	`rem Copy x64 libs and dlls`
`40`	`40`	`if exist %pypath64% (`
`41`		`- echo A \| xcopy /F dest\librdkafka.redist.%librdkafka_version%\build\native\lib\win\x64\win-x64-Release\v120\librdkafka.lib %pypath64%\libs\* \|\| exit /b 1`
	`41`	`+ echo A \| xcopy /F dest\librdkafka.redist.%librdkafka_version%\build\native\lib\win\x64\win-x64-Release\v140\librdkafka.lib %pypath64%\libs\* \|\| exit /b 1`
`42`	`42`	`echo A \| xcopy /I /F /S dest\librdkafka.redist.%librdkafka_version%\runtimes\win-x64\native\* %pypath64%\libs \|\| exit /b 1`
`43`	`43`	`)`